Merged PR 7119985: Merge external github 202012 branch to internal-20…

…2012 Merge external github 202012 branch to internal-202012. Includes conflict resolved for caclmgrd during merge Related work items: sonic-net#152, sonic-net#155, sonic-net#12577, sonic-net#12581, sonic-net#12600, sonic-net#12604, sonic-net#12617, sonic-net#12631, sonic-net#12641, sonic-net#12655, sonic-net#12666
richardyu-ms · Nov 11, 2022 · a96b06e · a96b06e
2 parents 969dd19 + d01a763
commit a96b06e
Show file tree

Hide file tree

Showing 51 changed files with 637 additions and 116 deletions.
diff --git a/...estica/x86_64-cel_seastone-r0/Celestica-DX010-C32/th-seastone-dx010-32x100G-t0.config.bcm b/...estica/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/...estica/x86_64-cel_seastone-r0/Celestica-DX010-C32/th-seastone-dx010-32x100G-t1.config.bcm b/...estica/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/...a/x86_64-cel_seastone-r0/Celestica-DX010-D48C8/th-seastone-dx010-48x50G+8x100G.config.bcm b/...a/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
 
 

diff --git 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==d02746dec5d6216ee550fd0850743e86305bca64
+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
@@ -1,17 +1,17 @@
 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
 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
-websocket-client==1.4.1
+websocket-client==1.4.2
 xmltodict==0.12.0
 zipp==1.2.0
diff --git 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==1adbbff2c0a0df872cce7adb9e86bbaa68444028
+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==d02746dec5d6216ee550fd0850743e86305bca64
+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/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-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
+vim-common==2:8.1.0875-5+deb10u3
+vim-tiny==2:8.1.0875-5+deb10u3
+xxd==2:8.1.0875-5+deb10u3
diff --git 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
+vim==2:8.1.0875-5+deb10u3
+vim-runtime==2:8.1.0875-5+deb10u3
diff --git 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
+vim==2:8.1.0875-5+deb10u3
+vim-runtime==2:8.1.0875-5+deb10u3
diff --git 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
+vim==2:8.1.0875-5+deb10u3
+vim-runtime==2:8.1.0875-5+deb10u3
diff --git 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
+vim==2:8.1.0875-5+deb10u3
+vim-runtime==2:8.1.0875-5+deb10u3
diff --git 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
+vim==2:8.1.0875-5+deb10u3
+vim-runtime==2:8.1.0875-5+deb10u3
diff --git 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
+vim==2:8.1.0875-5+deb10u3
+vim-runtime==2:8.1.0875-5+deb10u3
diff --git 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
+vim==2:8.1.0875-5+deb10u3
+vim-runtime==2:8.1.0875-5+deb10u3
diff --git 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
+vim==2:8.1.0875-5+deb10u3
+vim-runtime==2:8.1.0875-5+deb10u3
diff --git 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
+vim==2:8.1.0875-5+deb10u3
+vim-runtime==2:8.1.0875-5+deb10u3
diff --git 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
+zope.interface==5.5.1
diff --git 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
+vim==2:8.1.0875-5+deb10u3
+vim-runtime==2:8.1.0875-5+deb10u3
diff --git 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
+vim==2:8.1.0875-5+deb10u3
+vim-runtime==2:8.1.0875-5+deb10u3
diff --git 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
+vim==2:8.1.0875-5+deb10u3
+vim-runtime==2:8.1.0875-5+deb10u3
diff --git 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
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
@@ -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
+vim==2:8.1.0875-5+deb10u3
+vim-runtime==2:8.1.0875-5+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
@@ -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/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
+vim==2:8.1.0875-5+deb10u3
+vim-runtime==2:8.1.0875-5+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
@@ -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
diff --git 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
+vim==2:8.1.0875-5+deb10u3
+vim-runtime==2:8.1.0875-5+deb10u3
diff --git 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
+vim==2:8.1.0875-5+deb10u3
+vim-runtime==2:8.1.0875-5+deb10u3
diff --git 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
diff --git 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
+vim==2:8.1.0875-5+deb10u3
+vim-runtime==2:8.1.0875-5+deb10u3
diff --git 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
+vim==2:8.1.0875-5+deb10u3
+vim-runtime==2:8.1.0875-5+deb10u3