From 1cf4c84c43dfbe63269e1859f32f980f185f59c4 Mon Sep 17 00:00:00 2001 From: andywongarista <78833093+andywongarista@users.noreply.github.com> Date: Thu, 30 Mar 2023 11:53:37 -0700 Subject: [PATCH 001/193] [Arista] Update platform library submodules (#14452) implement chassis platform API reboot fix rpc powercycle on linecard fix psu/fan LED logic in arista daemon remove psu LED for PikeZ --- 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 99378f0b5b0f..c9888bb086c4 160000 --- a/platform/barefoot/sonic-platform-modules-arista +++ b/platform/barefoot/sonic-platform-modules-arista @@ -1 +1 @@ -Subproject commit 99378f0b5b0f28790d91bc317a0fe21e3a2cf6c9 +Subproject commit c9888bb086c4c528b8ae41a0e2089c57204742b6 diff --git a/platform/broadcom/sonic-platform-modules-arista b/platform/broadcom/sonic-platform-modules-arista index 99378f0b5b0f..c9888bb086c4 160000 --- a/platform/broadcom/sonic-platform-modules-arista +++ b/platform/broadcom/sonic-platform-modules-arista @@ -1 +1 @@ -Subproject commit 99378f0b5b0f28790d91bc317a0fe21e3a2cf6c9 +Subproject commit c9888bb086c4c528b8ae41a0e2089c57204742b6 From 0200b2b675403d249a58955bdcaea0d089c3cfeb Mon Sep 17 00:00:00 2001 From: Ye Jianquan Date: Sat, 1 Apr 2023 08:13:52 +0800 Subject: [PATCH 002/193] Refine testbedv2 template output (#14461) --- .../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 f604fcaed491..4021541e01d0 100644 --- a/.azure-pipelines/run-test-scheduler-template.yml +++ b/.azure-pipelines/run-test-scheduler-template.yml @@ -48,14 +48,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://github.com/raw/sonic-net/sonic-mgmt/master/.azure-pipelines/test_plan.py wget -O ./.azure-pipelines/pr_test_scripts.yaml https://github.com/raw/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 }} \ @@ -75,10 +75,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: @@ -86,12 +86,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: @@ -99,10 +99,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: @@ -110,10 +110,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() @@ -122,7 +122,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 b6774b3775462758743bd8a9d56e7f3e20c4bdf0 Mon Sep 17 00:00:00 2001 From: mssonicbld <79238446+mssonicbld@users.noreply.github.com> Date: Sat, 1 Apr 2023 11:56:03 +0800 Subject: [PATCH 003/193] [marvell-armhf][uboot-setting] Fix the print menu for marvell-armhf print menu on Nokia-7215 (#13933) (#14481) --- platform/marvell-armhf/platform.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platform/marvell-armhf/platform.conf b/platform/marvell-armhf/platform.conf index 9e221992c502..0113c6a05ac0 100644 --- a/platform/marvell-armhf/platform.conf +++ b/platform/marvell-armhf/platform.conf @@ -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 ${extra_cmdline_linux}" > /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 2b3bea61de6b3a3fe1ae7ab74ab6809034fac5f8 Mon Sep 17 00:00:00 2001 From: mssonicbld <79238446+mssonicbld@users.noreply.github.com> Date: Sun, 2 Apr 2023 20:39:29 +0800 Subject: [PATCH 004/193] [ci/build]: Upgrade SONiC package versions (#14489) --- files/build/versions/default/versions-git | 10 ++++---- files/build/versions/default/versions-mirror | 24 +++++++++---------- .../dockers/docker-ptf/versions-deb-buster | 12 ++++++---- .../docker-sonic-vs/versions-deb-buster | 3 ++- .../versions-deb-bullseye | 2 +- .../dockers/sonic-slave-bullseye/versions-py3 | 4 ++-- .../sonic-slave-buster/versions-deb-buster | 18 +++++++------- .../dockers/sonic-slave-buster/versions-py3 | 4 ++-- 8 files changed, 41 insertions(+), 36 deletions(-) diff --git a/files/build/versions/default/versions-git b/files/build/versions/default/versions-git index 0582a289e8a6..df541cd40e78 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==df528a9d7a40d52f0cf0b61cf21e1e298f67860a +https://chromium.googlesource.com/chromium/tools/depot_tools.git==401f0f6e433c9143bef1ac901f230f82e5f7c180 https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f https://github.com/CESNET/libyang.git==9a4e5b2ce30b9696116d6e654ee55caab5aafed8 https://github.com/daveolson53/audisp-tacplus.git==559c9f22edd4f2dea0ecedffb3ad9502b12a75b6 https://github.com/daveolson53/libnss-tacplus.git==19008ab68d9d504aa58eb34d5f564755a1613b8b https://github.com/dyninc/OpenBFDD.git==e35f43ad8d2b3f084e96a84c392528a90d05a287 -https://github.com/flashrom/flashrom.git==73e47091103891f2e3c12c5c51840faf9b57e436 -https://github.com/FreeRADIUS/freeradius-server.git==6d96643424545295e8b654926f2b8fad0c96645c +https://github.com/flashrom/flashrom.git==3ed016f08faa011736443f3b39bf68187d974781 +https://github.com/FreeRADIUS/freeradius-server.git==85681dcb9ce45021fab6ac5a092e36f26821c3e4 https://github.com/FreeRADIUS/pam_radius.git==8d373539bb9f13b0abfe8bcae0095a930a00fad0 https://github.com/jeroennijhof/pam_tacplus.git==4284d9016e64def2bb81d5f50f96dc3b59bfdc39 https://github.com/jpirko/libteam.git==61e27812c1074a865d7e1a778c0ce442837c28d7 @@ -14,8 +14,8 @@ https://github.com/Marvell-switching/mrvl-prestera.git==9dbae444204a2c27b33be698 https://github.com/Mellanox/libpsample.git==62bb27d9a49424e45191eee81df7ce0d8c74e774 https://github.com/opencomputeproject/SAI.git==3ff228a7e5619a56e3c169966cb1a8631705768a https://github.com/p4lang/scapy-vxlan.git==85ffe83da156568ee47a0750f638227e6e1d7479 -https://github.com/sflow/host-sflow==a6b576455714e250c40ee7925f76e6e717e6c9c0 -https://github.com/sflow/sflowtool==7299efd21c8a0b09ae48616bd53e9e38c99a5ed2 +https://github.com/sflow/host-sflow==65be65ce6ac1d00441c4d08fceb0ba3681c8b59b +https://github.com/sflow/sflowtool==4ce1223bb4c2cd0cbb1dd688dc0914561fcbb6c4 https://github.com/thom311/libnl==cbafad9ddf24caef5230fef715d34f0539603be0 https://salsa.debian.org/debian/libteam.git==48142125234a665ad5367b724af36a58fb484d3d https://salsa.debian.org/kernel-team/ethtool/==68409b09a969b49a07fbf3930409f155b953434b diff --git a/files/build/versions/default/versions-mirror b/files/build/versions/default/versions-mirror index 80e8b8f46e05..c17f2ec5cbad 100644 --- a/files/build/versions/default/versions-mirror +++ b/files/build/versions/default/versions-mirror @@ -1,15 +1,15 @@ deb.nodesource.com_node%5f14.x_dists_bullseye==2023-02-17T00:35:28Z deb.nodesource.com_node%5f14.x_dists_buster==2023-02-17T00:35:28Z -debian==20230328T000218Z -debian-security==20230328T000222Z -download.docker.com_linux_debian_dists_bullseye==2023-03-23T17:41:42Z -download.docker.com_linux_debian_dists_buster==2023-03-23T17:41:43Z +debian==20230402T000158Z +debian-security==20230402T000159Z +download.docker.com_linux_debian_dists_bullseye==2023-03-31T22:52:46Z +download.docker.com_linux_debian_dists_buster==2023-03-31T22:52:46Z packages.microsoft.com_repos_sonic-dev_dists_jessie==2022-10-31T19:34:29Z -packages.trafficmanager.net_snapshot_debian-security_20230328T000222Z_dists_bullseye-security==2023-03-27T22:32:27Z -packages.trafficmanager.net_snapshot_debian-security_20230328T000222Z_dists_buster_updates==2023-03-27T22:32:27Z -packages.trafficmanager.net_snapshot_debian_20230328T000218Z_dists_bullseye==2022-12-17T10:14:37Z -packages.trafficmanager.net_snapshot_debian_20230328T000218Z_dists_bullseye-backports==2023-03-27T20:21:20Z -packages.trafficmanager.net_snapshot_debian_20230328T000218Z_dists_bullseye-updates==2023-03-27T20:21:20Z -packages.trafficmanager.net_snapshot_debian_20230328T000218Z_dists_buster==2022-09-10T11:30:54Z -packages.trafficmanager.net_snapshot_debian_20230328T000218Z_dists_buster-backports==2023-03-27T20:21:20Z -packages.trafficmanager.net_snapshot_debian_20230328T000218Z_dists_buster-updates==2023-03-27T20:21:20Z \ No newline at end of file +packages.trafficmanager.net_snapshot_debian-security_20230402T000159Z_dists_bullseye-security==2023-04-01T15:23:02Z +packages.trafficmanager.net_snapshot_debian-security_20230402T000159Z_dists_buster_updates==2023-04-01T15:23:02Z +packages.trafficmanager.net_snapshot_debian_20230402T000158Z_dists_bullseye==2022-12-17T10:14:37Z +packages.trafficmanager.net_snapshot_debian_20230402T000158Z_dists_bullseye-backports==2023-04-01T20:14:08Z +packages.trafficmanager.net_snapshot_debian_20230402T000158Z_dists_bullseye-updates==2023-04-01T20:14:08Z +packages.trafficmanager.net_snapshot_debian_20230402T000158Z_dists_buster==2022-09-10T11:30:54Z +packages.trafficmanager.net_snapshot_debian_20230402T000158Z_dists_buster-backports==2023-04-01T20:14:08Z +packages.trafficmanager.net_snapshot_debian_20230402T000158Z_dists_buster-updates==2023-04-01T20:14:08Z \ No newline at end of file diff --git a/files/build/versions/dockers/docker-ptf/versions-deb-buster b/files/build/versions/dockers/docker-ptf/versions-deb-buster index 2a27da7c3a02..d341784cb324 100644 --- a/files/build/versions/dockers/docker-ptf/versions-deb-buster +++ b/files/build/versions/dockers/docker-ptf/versions-deb-buster @@ -231,10 +231,10 @@ libnl-genl-3-200==3.4.0-1 libnl-nf-3-200==3.4.0-1 libnl-route-3-200==3.4.0-1 libnpth0==1.6-1 -libnss-systemd==241-7~deb10u8 +libnss-systemd==241-7~deb10u9 libopenjp2-7==2.3.0-2+deb10u2 libopts25==1:5.18.12-4 -libpam-systemd==241-7~deb10u8 +libpam-systemd==241-7~deb10u9 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 @@ -289,6 +289,7 @@ libssl-dev==1.1.1n-0+deb10u4 libssl1.1==1.1.1n-0+deb10u4 libstdc++-8-dev==8.3.0-6 libsynctex2==2018.20181218.49446-1 +libsystemd0==241-7~deb10u9 libtacacs+1==4.0.4.27a-3 libtasn1-6==4.13-3+deb10u1 libtcl8.6==8.6.9+dfsg-2 @@ -311,7 +312,8 @@ libtk8.6==8.6.9-2 libtry-tiny-perl==0.30-1 libtsan0==8.3.0-6 libubsan1==8.3.0-6 -libunbound8==1.9.0-2+deb10u2 +libudev1==241-7~deb10u9 +libunbound8==1.9.0-2+deb10u3 liburi-perl==1.76-1 libutempter0==1.1.6-3 libuv1==1.24.1-1+deb10u1 @@ -468,8 +470,8 @@ rsyslog==8.1901.0-1+deb10u2 sensible-utils==0.0.12 shared-mime-info==1.10-1 sntp==1:4.2.8p12+dfsg-4 -systemd==241-7~deb10u8 -systemd-sysv==241-7~deb10u8 +systemd==241-7~deb10u9 +systemd-sysv==241-7~deb10u9 t1utils==1.41-3 tacacs+==4.0.4.27a-3 tcpdump==4.9.3-1~deb10u2 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 7fb6ff23f3d9..93475b460da8 100644 --- a/files/build/versions/dockers/docker-sonic-vs/versions-deb-buster +++ b/files/build/versions/dockers/docker-sonic-vs/versions-deb-buster @@ -140,7 +140,8 @@ libsm-dev==2:1.2.3-1 libsm6==2:1.2.3-1 libssl-dev==1.1.1n-0+deb10u4 libstdc++-8-dev==8.3.0-6 -libsystemd-dev==241-7~deb10u8 +libsystemd-dev==241-7~deb10u9 +libsystemd0==241-7~deb10u9 libteam-utils==1.30-1 libteam5==1.30-1 libteamdctl0==1.30-1 diff --git a/files/build/versions/dockers/sonic-slave-bullseye/versions-deb-bullseye b/files/build/versions/dockers/sonic-slave-bullseye/versions-deb-bullseye index b0cbba27635e..531bda04b58b 100644 --- a/files/build/versions/dockers/sonic-slave-bullseye/versions-deb-bullseye +++ b/files/build/versions/dockers/sonic-slave-bullseye/versions-deb-bullseye @@ -95,7 +95,7 @@ docbook-utils==0.6.14-3.4 docbook-xml==4.5-9 docker-ce==5:20.10.14~3-0~debian-bullseye docker-ce-cli==5:20.10.14~3-0~debian-bullseye -docker-ce-rootless-extras==5:23.0.1-1~debian.11~bullseye +docker-ce-rootless-extras==5:23.0.2-1~debian.11~bullseye docker-scan-plugin==0.23.0~debian-bullseye docutils-common==0.16+dfsg-4 dosfstools==4.2-1 diff --git a/files/build/versions/dockers/sonic-slave-bullseye/versions-py3 b/files/build/versions/dockers/sonic-slave-bullseye/versions-py3 index 8e1e32f5cad3..f081870935cc 100644 --- a/files/build/versions/dockers/sonic-slave-bullseye/versions-py3 +++ b/files/build/versions/dockers/sonic-slave-bullseye/versions-py3 @@ -67,7 +67,7 @@ pyangbind==0.8.1 pyasn1==0.4.8 pyasn1-modules==0.2.1 pycurl==7.43.0.6 -pyfakefs==5.1.0 +pyfakefs==5.2.0 pygments==2.7.1 pygobject==3.38.0 pyhamcrest==1.9.0 @@ -85,7 +85,7 @@ python-magic==0.4.20 pytz==2021.1 pyxdg==0.27 pyyaml==5.4.1 -redis==4.5.3 +redis==4.5.4 regex==2023.3.23 requests==2.25.1 roman==2.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 f3ca5841dfa2..901c625efe2b 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.19-1 +containerd.io==1.6.20-1 cowbuilder==0.88 cowdancer==0.88 cpio==2.12+dfsg-9 @@ -840,7 +840,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 @@ -877,7 +877,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 @@ -1113,7 +1113,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 @@ -1154,8 +1155,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 @@ -1706,8 +1708,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-py3 b/files/build/versions/dockers/sonic-slave-buster/versions-py3 index 9eb4a6395b64..57293995cfc4 100644 --- a/files/build/versions/dockers/sonic-slave-buster/versions-py3 +++ b/files/build/versions/dockers/sonic-slave-buster/versions-py3 @@ -48,7 +48,7 @@ pyang==2.4.0 pyangbind==0.8.1 pycrypto==2.6.1 pycurl==7.43.0.2 -pyfakefs==5.1.0 +pyfakefs==5.2.0 pygments==2.3.1 pygobject==3.30.4 pympler==0.8 @@ -63,7 +63,7 @@ python-magic==0.4.16 pytz==2019.1 pyxdg==0.25 pyyaml==5.4.1 -redis==4.5.3 +redis==4.5.4 regex==2022.10.31 requests==2.21.0 roman==2.0.0 From a245e7a3296b78d2b93ece4577610b84503ef059 Mon Sep 17 00:00:00 2001 From: Liu Shilong Date: Thu, 30 Mar 2023 23:10:34 +0800 Subject: [PATCH 005/193] 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 92176e6e1e45..b117f1e2969e 100644 --- a/sonic-slave-stretch/Dockerfile.j2 +++ b/sonic-slave-stretch/Dockerfile.j2 @@ -354,7 +354,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 a2e244d3bd0777706cdadf7bbb6effbc8c67b1fa Mon Sep 17 00:00:00 2001 From: Ikki Zhu <79439153+qnos@users.noreply.github.com> Date: Tue, 28 Mar 2023 01:17:21 +0800 Subject: [PATCH 006/193] [Seastone] DX010 platform switch to sfp-refactor based sfp impl (#13972) Why I did it sonic-sfp based sfp impl would be deprecated in future, change to sfp-refactor based implementation. How I did it Use the new sfp-refactor based sfp implementation for seastone. How to verify it Manual test sfp platform api or run sfp platform test cases. --- .../sonic_platform/chassis.py | 4 +- .../sonic_platform/sfp_optoe.py | 270 ++++++++++++++++++ 2 files changed, 272 insertions(+), 2 deletions(-) create mode 100644 device/celestica/x86_64-cel_seastone-r0/sonic_platform/sfp_optoe.py 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 51da9c2353fb..359972dfbd64 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 @@ -51,9 +51,9 @@ def __initialize_sfp(self): 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 sonic_platform.sfp_optoe import SfpOptoe for index in range(0, NUM_SFP): - sfp = Sfp(index, sfputil_helper.logical[index]) + sfp = SfpOptoe(index, sfputil_helper.physical_to_logical[index + 1]) self._sfp_list.append(sfp) self.sfp_module_initialized = True diff --git a/device/celestica/x86_64-cel_seastone-r0/sonic_platform/sfp_optoe.py b/device/celestica/x86_64-cel_seastone-r0/sonic_platform/sfp_optoe.py new file mode 100644 index 000000000000..4c6c9ee39326 --- /dev/null +++ b/device/celestica/x86_64-cel_seastone-r0/sonic_platform/sfp_optoe.py @@ -0,0 +1,270 @@ +#!/usr/bin/env python + +############################################################################# +# Celestica +# +# Module contains an implementation of SONiC Platform Base API and +# provides the sfp status which are available in the platform +# +############################################################################# + +import time + +try: + from sonic_platform_base.sonic_xcvr.sfp_optoe_base import SfpOptoeBase + from .helper import APIHelper +except ImportError as e: + raise ImportError(str(e) + "- required module not found") + + +SFP_I2C_START = 26 +I2C_EEPROM_PATH = '/sys/bus/i2c/devices/i2c-{0}/{0}-0050/eeprom' + + +class SfpOptoe(SfpOptoeBase): + """Platform-specific SfpOptoe class""" + + 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=0, sfp_name=None): + SfpOptoeBase.__init__(self) + + self._index = sfp_index + self._port_num = self._index + 1 + self._api_helper = APIHelper() + self._name = sfp_name + self._sfp_type = None + + def _detect_sfp_type(self): + sfp_type = 'N/A' + info = self.get_transceiver_info() + if info: + sfp_type = info.get("type_abbrv_name") + # XXX: Need this hack until xcvrd is refactored + if sfp_type in ["OSFP-8X", "QSFP-DD"]: + sfp_type = "QSFP_DD" + return sfp_type + + @property + def sfp_type(self): + if self._sfp_type is None: + self._sfp_type = self._detect_sfp_type() + return self._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 get_name(self): + """ + Retrieves the name of the device + Returns: + string: The name of the device + """ + return self._name + + 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 not self.get_presence(): + return False + reset = self.get_reset_status() + if reset: + status = False + else: + status = True + return status + + def get_reset_status(self): + """ + Retrieves the reset status of SFP + Returns: + A Boolean, True if reset enabled, False if disabled + """ + 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' + + def get_presence(self): + """ + Retrieves the presence of the PSU + Returns: + bool: True if PSU is present, False if not + """ + presence_status_raw = self._api_helper.read_txt_file( + self.PRS_PATH).rstrip() + if not presence_status_raw: + return False + + content = presence_status_raw.rstrip() + reg_value = int(content, 16) + + # Determind if port_num start from 1 or 0 + bit_index = self._index + + # Mask off the bit corresponding to our port + mask = (1 << bit_index) + + # ModPrsL is active low + if reg_value & mask == 0: + return True + + return False + + 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 + """ + try: + reg_file = open(self.LP_PATH, "r") + content = reg_file.readline().rstrip() + except IOError as e: + print("Error: unable to open file: %s" % str(e)) + return False + + # content is a string containing the hex representation of the register + reg_value = int(content, 16) + + # Determind if port_num start from 1 or 0 + bit_index = self._index + + # Mask off the bit corresponding to our port + mask = (1 << bit_index) + + # LPMode is active high + if reg_value & mask == 0: + return False + + return True + + 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 + + try: + reg_file = open(self.RESET_PATH, "r+") + except IOError as e: + print("Error: unable to open file: %s" % str(e)) + return False + + content = reg_file.readline().rstrip() + + # File content is a string containing the hex representation of the + # register + reg_value = int(content, 16) + + # Determind if port_num start from 1 or 0 + bit_index = self._index + + # Mask off the bit corresponding to our port + mask = (1 << bit_index) + + # ResetL is active low + reg_value = reg_value & ~mask + + # Convert our register value back to a hex string and write back + reg_file.seek(0) + reg_file.write(hex(reg_value).rstrip('L')) + reg_file.close() + + # Sleep 1 second to allow it to settle + time.sleep(1) + + # Flip the bit back high and write back to the register + # to take port out of reset + try: + reg_file = open(self.RESET_PATH, "w") + except IOError as e: + print("Error: unable to open file: %s" % str(e)) + return False + + reg_value = reg_value | mask + reg_file.seek(0) + reg_file.write(hex(reg_value).rstrip('L')) + reg_file.close() + + 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 + """ + try: + reg_file = open(self.LP_PATH, "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) + + # Determind if port_num start from 1 or 0 + bit_index = self._index + + # Mask off the bit corresponding to our port + mask = (1 << bit_index) + # LPMode is active high; set or clear the bit accordingly + reg_value = reg_value | mask if lpmode else reg_value & ~mask + + # Convert our register value back to a hex string and write back + content = hex(reg_value).strip('L') + + reg_file.seek(0) + reg_file.write(content) + reg_file.close() + + 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 self.sfp_type == "QSFP_DD": + return super().get_error_description() + + if not self.get_presence(): + return self.SFP_STATUS_UNPLUGGED + return self.SFP_STATUS_OK + + def get_position_in_parent(self): + return self._index + + def get_index(self): + """ + Retrieves current sfp index + Returns: + A int value, sfp index + """ + return self._index + + def is_replaceable(self): + return True From a6d597a81193296a862f1de65650390376507386 Mon Sep 17 00:00:00 2001 From: anamehra <54692434+anamehra@users.noreply.github.com> Date: Wed, 29 Mar 2023 09:53:32 -0700 Subject: [PATCH 007/193] chassis-packet: resolve the missing static routes (#14230) arp_update should resolve the missing arp/ndp static route entries. Added code to check for missing entries and try ping to resolve the missing entry. Why I did it Fixes #14179 chassis-packet: missing arp entries for static routes causing high orchagent cpu usage It is observed that some sonic-mgmt test case calls sonic-clear arp, which clears the static arp entries as well. Orchagent or arp_update process does not try to resolve the missing arp entries after clear. How I did it arp_update should resolve the missing arp/ndp static route entries. Added code to check for missing entries and try ping if any found to resolve it. How to verify it After boot or config reload, check ipv4 and ipv4 neigh entries to make sure all static route entries are present manual validation: Use sonic-clear arp and sonic-clear ndp to clear all neighbor entries run arp_update Check for neigh entries. All entries should be present. Signed-off-by: anamehra --- files/build_templates/arp_update_vars.j2 | 3 ++- files/scripts/arp_update | 27 +++++++++++++++++------- 2 files changed, 21 insertions(+), 9 deletions(-) diff --git a/files/build_templates/arp_update_vars.j2 b/files/build_templates/arp_update_vars.j2 index 91992e781ac0..9f4ba4a42050 100644 --- a/files/build_templates/arp_update_vars.j2 +++ b/files/build_templates/arp_update_vars.j2 @@ -4,5 +4,6 @@ "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 %}", - "static_route_nexthops": "{% if STATIC_ROUTE %}{% for static_route_prefix, static_route_attr in STATIC_ROUTE.items() %}{%- if static_route_prefix -%}{{ static_route_attr['nexthop'].split(',') | join(' ') | lower + " " }}{%- endif -%}{% endfor %}{% endif %}" + "static_route_nexthops": "{% if STATIC_ROUTE %}{% for static_route_prefix, static_route_attr in STATIC_ROUTE.items() %}{%- if static_route_prefix -%}{{ static_route_attr['nexthop'].split(',') | join(' ') | lower + " " }}{%- endif -%}{% endfor %}{% endif %}", + "static_route_ifnames": "{% if STATIC_ROUTE %}{% for static_route_prefix, static_route_attr in STATIC_ROUTE.items() %}{%- if static_route_prefix -%}{{ static_route_attr['ifname'].split(',') | join(' ') + " " }}{%- endif -%}{% endfor %}{% endif %}" } diff --git a/files/scripts/arp_update b/files/scripts/arp_update index b686e1a93e24..2725f034668b 100755 --- a/files/scripts/arp_update +++ b/files/scripts/arp_update @@ -14,13 +14,16 @@ while /bin/true; do ARP_UPDATE_VARS=$(sonic-cfggen -d -t ${ARP_UPDATE_VARS_FILE}) SWITCH_TYPE=$(echo $ARP_UPDATE_VARS | jq -r '.switch_type') if [[ "$SWITCH_TYPE" == "chassis-packet" ]]; then - STATIC_ROUTE_NEXTHOPS=$(echo $ARP_UPDATE_VARS | jq -r '.static_route_nexthops') + # Get array of Nexthops and ifnames. Nexthops and ifnames are mapped one to one + STATIC_ROUTE_NEXTHOPS=($(echo $ARP_UPDATE_VARS | jq -r '.static_route_nexthops')) + STATIC_ROUTE_IFNAMES=($(echo $ARP_UPDATE_VARS | jq -r '.static_route_ifnames')) # on supervisor/rp exit the script gracefully - if [[ -z "$STATIC_ROUTE_NEXTHOPS" ]]; then + if [[ -z "$STATIC_ROUTE_NEXTHOPS" ]] || [[ -z "$STATIC_ROUTE_IFNAMES" ]]; then logger "arp_update: exiting as no static route in packet based chassis" exit 0 fi - for nexthop in $STATIC_ROUTE_NEXTHOPS; do + for i in ${!STATIC_ROUTE_NEXTHOPS[@]}; do + nexthop="${STATIC_ROUTE_NEXTHOPS[i]}" if [[ $nexthop == *"."* ]]; then neigh_state=( $(ip -4 neigh show | grep -w $nexthop | tr -s ' ' | cut -d ' ' -f 3,4) ) ping_prefix=ping @@ -28,11 +31,19 @@ while /bin/true; do neigh_state=( $(ip -6 neigh show | grep -w $nexthop | tr -s ' ' | cut -d ' ' -f 3,4) ) ping_prefix=ping6 fi - - if [[ "${neigh_state[1]}" == "INCOMPLETE" ]] || [[ "${neigh_state[1]}" == "FAILED" ]]; then - pingcmd="timeout 0.2 $ping_prefix -I ${neigh_state[0]} -n -q -i 0 -c 1 -W 1 $nexthop >/dev/null" - eval $pingcmd - logger "arp_update: sttaic route nexthop not resolved, pinging $nexthop on ${neigh_state[0]}" + if [[ -z "${neigh_state}" ]] || [[ "${neigh_state[1]}" == "INCOMPLETE" ]] || [[ "${neigh_state[1]}" == "FAILED" ]]; then + interface="${STATIC_ROUTE_IFNAMES[i]}" + if [[ -z "$interface" ]]; then + # should never be here, handling just in case + logger "ERR: arp_update: missing interface entry for static route $nexthop" + interface=${neigh_state[0]} + fi + intf_up=$(ip link show $interface | grep "state UP") + if [[ -n "$intf_up" ]]; then + pingcmd="timeout 0.2 $ping_prefix -I ${interface} -n -q -i 0 -c 1 -W 1 $nexthop >/dev/null" + eval $pingcmd + logger "arp_update: static route nexthop not resolved, pinging $nexthop on ${neigh_state[0]}" + fi fi done From 5a77cc4b58f3f6b7d62bf35a13f17b05edb43546 Mon Sep 17 00:00:00 2001 From: lixiaoyuner <35456895+lixiaoyuner@users.noreply.github.com> Date: Fri, 31 Mar 2023 02:41:02 +0800 Subject: [PATCH 008/193] Refactor the logic of tagging kube container as local latest (#14367) Why I did it We found a bug when pilot, the tag function doesn't remove the ACR domain when do tag, it makes the latest tag not work. And in the original tag function, it calls os.system and os.popen which are not recommend, need to refactor. How I did it Do a split("/") when get image_rep to fix the acr domain bug Refactor the tag function code and add test cases How to verify it Check whether container images are tagged as latest when in kube mode. --- src/sonic-ctrmgrd/ctrmgr/ctrmgrd.py | 93 ++++++--------- src/sonic-ctrmgrd/ctrmgr/kube_commands.py | 69 +++++++++++ .../ctrmgr/remote_ctr.config.json | 1 + src/sonic-ctrmgrd/tests/common_test.py | 11 +- src/sonic-ctrmgrd/tests/ctrmgrd_test.py | 9 -- src/sonic-ctrmgrd/tests/kube_commands_test.py | 107 ++++++++++++++++++ 6 files changed, 220 insertions(+), 70 deletions(-) diff --git a/src/sonic-ctrmgrd/ctrmgr/ctrmgrd.py b/src/sonic-ctrmgrd/ctrmgr/ctrmgrd.py index 9017c1eb0ec1..b6b3d0bba283 100755 --- a/src/sonic-ctrmgrd/ctrmgr/ctrmgrd.py +++ b/src/sonic-ctrmgrd/ctrmgr/ctrmgrd.py @@ -54,6 +54,16 @@ KUBE_LABEL_TABLE = "KUBE_LABELS" KUBE_LABEL_SET_KEY = "SET" +MODE_KUBE = "kube" +MODE_LOCAL = "local" +OWNER_KUBE = "kube" +OWNER_LOCAL = "local" +OWNER_NONE = "none" +REMOTE_READY = "ready" +REMOTE_PENDING = "pending" +REMOTE_STOPPED = "stopped" +REMOTE_NONE = "none" + remote_connected = False dflt_cfg_ser = { @@ -89,6 +99,7 @@ JOIN_RETRY = "retry_join_interval_seconds" LABEL_RETRY = "retry_labels_update_seconds" TAG_IMAGE_LATEST = "tag_latest_image_on_wait_seconds" +TAG_RETRY = "retry_tag_latest_seconds" USE_K8S_PROXY = "use_k8s_as_http_proxy" remote_ctr_config = { @@ -96,6 +107,7 @@ JOIN_RETRY: 10, LABEL_RETRY: 2, TAG_IMAGE_LATEST: 30, + TAG_RETRY: 5, USE_K8S_PROXY: "" } @@ -151,9 +163,6 @@ 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: """ Implements main io-loop of the application @@ -437,55 +446,6 @@ def do_join(self, ip, port, insecure): log_debug("kube_join_master failed retry after {} seconds @{}". 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 # @@ -512,7 +472,9 @@ def handle_update(self, feat, set_owner, ct_owner, remote_state): # There after only called upon changes in either that requires action # if not is_systemd_active(feat): - # Nothing todo, if system state is down + # Restart the service manually when kube upgrade happens to decrease the down time + if set_owner == MODE_KUBE and ct_owner == OWNER_NONE and remote_state == REMOTE_STOPPED: + restart_systemd_service(self.server, feat, OWNER_KUBE) return label_add = set_owner == "kube" @@ -587,8 +549,7 @@ def on_state_update(self, key, op, data): # 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, + self.server.register_timer(start_time, self.do_tag_latest, ( key, self.st_data[key][ST_FEAT_CTR_ID], self.st_data[key][ST_FEAT_CTR_VER])) @@ -596,10 +557,13 @@ def on_state_update(self, key, op, data): 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. - return + if (not init): + if (old_remote_state == remote_state): + # if no remote state change, do nothing. + return + if (remote_state not in (REMOTE_PENDING, REMOTE_STOPPED)): + # if remote state not in pending or stopped, do nothing. + return if key in self.cfg_data: log_debug("{} init={} old_remote_state={} remote_state={}".format(key, init, old_remote_state, remote_state)) @@ -607,7 +571,18 @@ def on_state_update(self, key, op, data): self.st_data[key][ST_FEAT_OWNER], remote_state) return + + def do_tag_latest(self, feat, docker_id, image_ver): + ret = kube_commands.tag_latest(feat, docker_id, image_ver) + if ret != 0: + # Tag latest failed. Retry after an interval + self.start_time = datetime.datetime.now() + self.start_time += datetime.timedelta( + seconds=remote_ctr_config[TAG_RETRY]) + self.server.register_timer(self.start_time, self.do_tag_latest, (feat, docker_id, image_ver)) + log_debug("Tag latest as local failed retry after {} seconds @{}". + format(remote_ctr_config[TAG_RETRY], self.start_time)) # # Label re-sync diff --git a/src/sonic-ctrmgrd/ctrmgr/kube_commands.py b/src/sonic-ctrmgrd/ctrmgr/kube_commands.py index 783f122ec914..6576f2580079 100755 --- a/src/sonic-ctrmgrd/ctrmgr/kube_commands.py +++ b/src/sonic-ctrmgrd/ctrmgr/kube_commands.py @@ -412,7 +412,76 @@ def kube_reset_master(force): return (ret, err) +def _do_tag(docker_id, image_ver): + err = "" + out = "" + ret = 1 + status, _, err = _run_command("docker ps |grep {}".format(docker_id)) + if status == 0: + _, image_item, err = _run_command("docker inspect {} |jq -r .[].Image".format(docker_id)) + if image_item: + image_id = image_item.split(":")[1][:12] + _, image_info, err = _run_command("docker images |grep {}".format(image_id)) + if image_info: + # Only need the docker repo name without acr domain + image_rep = image_info.split()[0].split("/")[-1] + tag_res, _, err = _run_command("docker tag {} {}:latest".format(image_id, image_rep)) + if tag_res == 0: + out = "docker tag {} {}:latest successfully".format(image_id, image_rep) + ret = 0 + else: + err = "Failed to tag {}:{} to latest. Err: {}".format(image_rep, image_ver, err) + else: + err = "Failed to docker images |grep {} to get image repo. Err: {}".format(image_id, err) + else: + err = "Failed to inspect container:{} to get image id. Err: {}".format(docker_id, err) + elif err: + err = "Error happens when execute docker ps |grep {}. Err: {}".format(docker_id, err) + else: + out = "New version {} is not running.".format(image_ver) + ret = -1 + + return (ret, out, err) + +def _remove_container(feat): + err = "" + out = "" + ret = 0 + _, feat_status, err = _run_command("docker inspect {} |jq -r .[].State.Running".format(feat)) + if feat_status: + if feat_status == 'true': + err = "Feature {} container is running, it's unexpected".format(feat) + ret = 1 + else: + rm_res, _, err = _run_command("docker rm {}".format(feat)) + if rm_res == 0: + out = "Remove origin local {} container successfully".format(feat) + else: + err = "Failed to docker rm {}. Err: {}".format(feat, err) + ret = 1 + elif err.startswith("Error: No such object"): + out = "Origin local {} container has been removed before".format(feat) + err = "" + else: + err = "Failed to docker inspect {} |jq -r .[].State.Running. Err: {}".format(feat, err) + ret = 1 + + return (ret, out, err) +def tag_latest(feat, docker_id, image_ver): + ret, out, err = _do_tag(docker_id, image_ver) + if ret == 0: + log_debug(out) + ret, out, err = _remove_container(feat) + if ret == 0: + log_debug(out) + else: + log_error(err) + elif ret == -1: + ret = 0 + else: + log_error(err) + return ret def main(): syslog.openlog("kube_commands") diff --git a/src/sonic-ctrmgrd/ctrmgr/remote_ctr.config.json b/src/sonic-ctrmgrd/ctrmgr/remote_ctr.config.json index 0b91fde36473..b6d26334865b 100644 --- a/src/sonic-ctrmgrd/ctrmgr/remote_ctr.config.json +++ b/src/sonic-ctrmgrd/ctrmgr/remote_ctr.config.json @@ -4,6 +4,7 @@ "retry_labels_update_seconds": 5, "revert_to_local_on_wait_seconds": 60, "tag_latest_image_on_wait_seconds": 600, + "retry_tag_latest_seconds": 30, "use_k8s_as_http_proxy": "n" } diff --git a/src/sonic-ctrmgrd/tests/common_test.py b/src/sonic-ctrmgrd/tests/common_test.py index 9283e3ad258e..59f774596a4e 100755 --- a/src/sonic-ctrmgrd/tests/common_test.py +++ b/src/sonic-ctrmgrd/tests/common_test.py @@ -58,6 +58,7 @@ PROC_THROW = "proc_throw" PROC_OUT = "subproc_output" PROC_ERR = "subproc_error" +PROC_CODE = "subproc_code" PROC_KILLED = "procs_killed" # container_start test cases @@ -605,6 +606,7 @@ def communicate(self, timeout): out_lst = current_test_data.get(PROC_OUT, None) err_lst = current_test_data.get(PROC_ERR, None) + code_lst = current_test_data.get(PROC_CODE, None) if out_lst: assert (len(out_lst) > self.index) out = out_lst[self.index] @@ -615,7 +617,11 @@ def communicate(self, timeout): err = err_lst[self.index] else: err = "" - self.returncode = 0 if not err else -1 + if code_lst: + assert (len(code_lst) > self.index) + self.returncode = code_lst[self.index] + else: + self.returncode = 0 if not err else -1 return (out, err) def kill(self): @@ -673,7 +679,8 @@ def create_remote_ctr_config_json(): "join_latency_on_boot_seconds": 2,\n\ "retry_join_interval_seconds": 0,\n\ "retry_labels_update_seconds": 0,\n\ - "revert_to_local_on_wait_seconds": 5\n\ + "revert_to_local_on_wait_seconds": 5,\n\ + "tag_latest_image_on_wait_seconds": 0\n\ }\n' fname = "/tmp/remote_ctr.config.json" diff --git a/src/sonic-ctrmgrd/tests/ctrmgrd_test.py b/src/sonic-ctrmgrd/tests/ctrmgrd_test.py index 842b935396d1..0a298dd60308 100755 --- a/src/sonic-ctrmgrd/tests/ctrmgrd_test.py +++ b/src/sonic-ctrmgrd/tests/ctrmgrd_test.py @@ -311,15 +311,6 @@ } } } - }, - 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 60da7fd2c073..9b4dd6842bb8 100755 --- a/src/sonic-ctrmgrd/tests/kube_commands_test.py +++ b/src/sonic-ctrmgrd/tests/kube_commands_test.py @@ -213,6 +213,102 @@ } } +tag_latest_test_data = { + 0: { + common_test.DESCR: "Tag latest successfuly and remove origin local container", + common_test.RETVAL: 0, + common_test.ARGS: ["snmp", "123456", "v1"], + common_test.PROC_CMD: [ + "docker ps |grep 123456", + "docker inspect 123456 |jq -r .[].Image", + "docker images |grep 5425bcbd23c5", + "docker tag 5425bcbd23c5 snmp:latest", + "docker inspect snmp |jq -r .[].State.Running", + "docker rm snmp" + ], + common_test.PROC_OUT: [ + "", + "sha256:5425bcbd23c54270d9de028c09634f8e9a014e9351387160c133ccf3a53ab3dc", + "acr.io/snmp v1 5425bcbd23c5", + "", + "false", + "" + ] + }, + 1: { + common_test.DESCR: "Tag latest successfuly and origin local container has been removed before", + common_test.RETVAL: 0, + common_test.ARGS: ["snmp", "123456", "v1"], + common_test.PROC_CMD: [ + "docker ps |grep 123456", + "docker inspect 123456 |jq -r .[].Image", + "docker images |grep 5425bcbd23c5", + "docker tag 5425bcbd23c5 snmp:latest", + "docker inspect snmp |jq -r .[].State.Running", + "docker rm snmp" + ], + common_test.PROC_OUT: [ + "", + "sha256:5425bcbd23c54270d9de028c09634f8e9a014e9351387160c133ccf3a53ab3dc", + "acr.io/snmp v1 5425bcbd23c5", + "", + "", + "" + ], + common_test.PROC_ERR: [ + "", + "", + "", + "", + "Error: No such object", + "" + ] + }, + 2: { + common_test.DESCR: "Tag a unstable container", + common_test.RETVAL: 0, + common_test.ARGS: ["snmp", "123456", "v1"], + common_test.PROC_CMD: [ + "docker ps |grep 123456" + ], + common_test.PROC_CODE: [ + 1 + ] + }, + 3: { + common_test.DESCR: "Docker error", + common_test.RETVAL: 1, + common_test.ARGS: ["snmp", "123456", "v1"], + common_test.PROC_CMD: [ + "docker ps |grep 123456" + ], + common_test.PROC_ERR: [ + "err" + ] + }, + 4: { + common_test.DESCR: "Find local container is still running", + common_test.RETVAL: 1, + common_test.ARGS: ["snmp", "123456", "v1"], + common_test.PROC_CMD: [ + "docker ps |grep 123456", + "docker inspect 123456 |jq -r .[].Image", + "docker images |grep 5425bcbd23c5", + "docker tag 5425bcbd23c5 snmp:latest", + "docker inspect snmp |jq -r .[].State.Running", + "docker rm snmp" + ], + common_test.PROC_OUT: [ + "", + "sha256:5425bcbd23c54270d9de028c09634f8e9a014e9351387160c133ccf3a53ab3dc", + "acr.io/snmp v1 5425bcbd23c5", + "", + "true", + "" + ] + } +} + class TestKubeCommands(object): def init(self): @@ -360,3 +456,14 @@ def test_reset(self, mock_subproc): ct_data[common_test.ARGS][0]) if common_test.RETVAL in ct_data: assert ret == ct_data[common_test.RETVAL] + + @patch("kube_commands.subprocess.Popen") + def test_tag_latest(self, mock_subproc): + common_test.set_kube_mock(mock_subproc) + + for (i, ct_data) in tag_latest_test_data.items(): + common_test.do_start_test("tag:latest", i, ct_data) + + ret = kube_commands.tag_latest(*ct_data[common_test.ARGS]) + if common_test.RETVAL in ct_data: + assert ret == ct_data[common_test.RETVAL] From f3054124edeb8c84c32c8c0f20d0d7e1a0c1725f Mon Sep 17 00:00:00 2001 From: bingwang-ms <66248323+bingwang-ms@users.noreply.github.com> Date: Wed, 29 Mar 2023 18:24:31 -0700 Subject: [PATCH 009/193] Update check of IP_TYPE from ACL Yang model (#13810) Why I did it This PR is to update the check of IP_TYPE from sonic-acl.yang. It's because if the ACL rule is added by loading a json file with acl-loader, there is no IP_TYPE for ACL rule. If such rule exists in ACL_RULE table, the GCU (generic config updater) refuses to update any ACL rules because the existing one is invalid. This PR updates the yang model for ACL. If the IP_TYPE leaf doesn't exist, then we don't check the field. How I did it Accept the rule if IP_TYPE is absent. How to verify it The change is verified by UT. --- .../tests/yang_model_tests/tests/acl.json | 3 ++ .../yang_model_tests/tests_config/acl.json | 53 +++++++++++++++++++ .../yang-templates/sonic-acl.yang.j2 | 8 +-- 3 files changed, 60 insertions(+), 4 deletions(-) diff --git a/src/sonic-yang-models/tests/yang_model_tests/tests/acl.json b/src/sonic-yang-models/tests/yang_model_tests/tests/acl.json index 3bfb0611fb2e..a3d21104794e 100644 --- a/src/sonic-yang-models/tests/yang_model_tests/tests/acl.json +++ b/src/sonic-yang-models/tests/yang_model_tests/tests/acl.json @@ -31,6 +31,9 @@ "eStrKey" : "When", "eStr": ["IP_TYPE"] }, + "ACL_RULE_WITHOUT_IP_TYPE": { + "desc": "Configure ACL_RULE without IP_TYPE." + }, "ACL_RULE_ARP_TYPE_DST_IPV6_MISMATCH": { "desc": "Configure IP_TYPE as ARP and DST_IPV6 in ACL_RULE.", "eStrKey" : "When", diff --git a/src/sonic-yang-models/tests/yang_model_tests/tests_config/acl.json b/src/sonic-yang-models/tests/yang_model_tests/tests_config/acl.json index 6c3d3ad3ec64..ce5a9839d0d9 100644 --- a/src/sonic-yang-models/tests/yang_model_tests/tests_config/acl.json +++ b/src/sonic-yang-models/tests/yang_model_tests/tests_config/acl.json @@ -158,6 +158,59 @@ } } }, + "ACL_RULE_WITHOUT_IP_TYPE": { + "sonic-acl:sonic-acl": { + "sonic-acl:ACL_RULE": { + "ACL_RULE_LIST": [ + { + "ACL_TABLE_NAME": "NO-NSW-PACL-V4", + "PACKET_ACTION": "FORWARD", + "PRIORITY": 999980, + "RULE_NAME": "Rule_20", + "SRC_IPV6": "2001::1/64" + } + ] + }, + "sonic-acl:ACL_TABLE": { + "ACL_TABLE_LIST": [ + { + "ACL_TABLE_NAME": "NO-NSW-PACL-V4", + "policy_desc": "Filter IPv4", + "ports": [ + "Ethernet0", + "Ethernet1" + ], + "stage": "EGRESS", + "type": "L3" + } + ] + } + }, + "sonic-port:sonic-port": { + "sonic-port:PORT": { + "PORT_LIST": [ + { + "admin_status": "up", + "alias": "eth0", + "description": "Ethernet0", + "lanes": "0,1,2,3", + "mtu": 9000, + "name": "Ethernet0", + "speed": 25000 + }, + { + "admin_status": "up", + "alias": "eth1", + "description": "Ethernet1", + "lanes": "4,5,6,7", + "mtu": 9000, + "name": "Ethernet1", + "speed": 25000 + } + ] + } + } + }, "ACL_RULE_UNDEFINED_PACKET_ACTION": { "sonic-acl:sonic-acl": { "sonic-acl:ACL_RULE": { diff --git a/src/sonic-yang-models/yang-templates/sonic-acl.yang.j2 b/src/sonic-yang-models/yang-templates/sonic-acl.yang.j2 index e9461be2ceed..ccbb1639303e 100644 --- a/src/sonic-yang-models/yang-templates/sonic-acl.yang.j2 +++ b/src/sonic-yang-models/yang-templates/sonic-acl.yang.j2 @@ -106,7 +106,7 @@ module sonic-acl { } } case ip4_prefix { - when "boolean(IP_TYPE[.='ANY' or .='IP' or .='IPV4' or .='IPv4ANY' or .='ARP'])"; + when "not(IP_TYPE) or boolean(IP_TYPE[.='ANY' or .='IP' or .='IPV4' or .='IPv4ANY' or .='ARP'])"; leaf SRC_IP { type inet:ipv4-prefix; } @@ -117,7 +117,7 @@ module sonic-acl { } case ip6_prefix { - when "boolean(IP_TYPE[.='ANY' or .='IP' or .='IPV6' or .='IPv6ANY'])"; + when "not(IP_TYPE) or boolean(IP_TYPE[.='ANY' or .='IP' or .='IPV6' or .='IPv6ANY'])"; leaf SRC_IPV6 { type inet:ipv6-prefix; } @@ -199,7 +199,7 @@ module sonic-acl { choice icmp { case icmp4 { - when "boolean(IP_TYPE[.='ANY' or .='IP' or .='IPV4' or .='IPv4ANY' or .='ARP'])"; + when "not(IP_TYPE) or boolean(IP_TYPE[.='ANY' or .='IP' or .='IPV4' or .='IPv4ANY' or .='ARP'])"; leaf ICMP_TYPE { type uint8 { range 1..44; @@ -214,7 +214,7 @@ module sonic-acl { } case icmp6 { - when "boolean(IP_TYPE[.='ANY' or .='IP' or .='IPV6' or .='IPv6ANY'])"; + when "not(IP_TYPE) or boolean(IP_TYPE[.='ANY' or .='IP' or .='IPV6' or .='IPv6ANY'])"; leaf ICMPV6_TYPE { type uint8 { range 1..44; From 0a58f4f68bad2a8efb872840c4ed628a46efcbd6 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 010/193] 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 d07d0dcfbcc8..bc4c92446ed8 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 8ca2d47aa9bbdd815b0bb1374affbdf017d01eff Mon Sep 17 00:00:00 2001 From: mssonicbld Date: Tue, 4 Apr 2023 08:30:31 +0000 Subject: [PATCH 011/193] [ci/build]: Upgrade SONiC package versions --- files/build/versions/default/versions-git | 6 +++--- files/build/versions/default/versions-mirror | 20 +++++++++---------- .../dockers/docker-sonic-vs/versions-py2 | 2 +- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/files/build/versions/default/versions-git b/files/build/versions/default/versions-git index df541cd40e78..0c2de0e8a8e3 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==401f0f6e433c9143bef1ac901f230f82e5f7c180 +https://chromium.googlesource.com/chromium/tools/depot_tools.git==ef6c30622146c4f273157eb40927fa669717a1f9 https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f https://github.com/CESNET/libyang.git==9a4e5b2ce30b9696116d6e654ee55caab5aafed8 https://github.com/daveolson53/audisp-tacplus.git==559c9f22edd4f2dea0ecedffb3ad9502b12a75b6 https://github.com/daveolson53/libnss-tacplus.git==19008ab68d9d504aa58eb34d5f564755a1613b8b https://github.com/dyninc/OpenBFDD.git==e35f43ad8d2b3f084e96a84c392528a90d05a287 https://github.com/flashrom/flashrom.git==3ed016f08faa011736443f3b39bf68187d974781 -https://github.com/FreeRADIUS/freeradius-server.git==85681dcb9ce45021fab6ac5a092e36f26821c3e4 +https://github.com/FreeRADIUS/freeradius-server.git==adc2b27f351490d933977dda86c48f8ca5ec6bf2 https://github.com/FreeRADIUS/pam_radius.git==8d373539bb9f13b0abfe8bcae0095a930a00fad0 https://github.com/jeroennijhof/pam_tacplus.git==4284d9016e64def2bb81d5f50f96dc3b59bfdc39 https://github.com/jpirko/libteam.git==61e27812c1074a865d7e1a778c0ce442837c28d7 @@ -14,7 +14,7 @@ https://github.com/Marvell-switching/mrvl-prestera.git==9dbae444204a2c27b33be698 https://github.com/Mellanox/libpsample.git==62bb27d9a49424e45191eee81df7ce0d8c74e774 https://github.com/opencomputeproject/SAI.git==3ff228a7e5619a56e3c169966cb1a8631705768a https://github.com/p4lang/scapy-vxlan.git==85ffe83da156568ee47a0750f638227e6e1d7479 -https://github.com/sflow/host-sflow==65be65ce6ac1d00441c4d08fceb0ba3681c8b59b +https://github.com/sflow/host-sflow==eb58c6420cb2651e0c32a69e98c5b3a485e5fb09 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 c17f2ec5cbad..dd85f9e5a036 100644 --- a/files/build/versions/default/versions-mirror +++ b/files/build/versions/default/versions-mirror @@ -1,15 +1,15 @@ deb.nodesource.com_node%5f14.x_dists_bullseye==2023-02-17T00:35:28Z deb.nodesource.com_node%5f14.x_dists_buster==2023-02-17T00:35:28Z -debian==20230402T000158Z -debian-security==20230402T000159Z +debian==20230404T000134Z +debian-security==20230404T000455Z download.docker.com_linux_debian_dists_bullseye==2023-03-31T22:52:46Z download.docker.com_linux_debian_dists_buster==2023-03-31T22:52:46Z packages.microsoft.com_repos_sonic-dev_dists_jessie==2022-10-31T19:34:29Z -packages.trafficmanager.net_snapshot_debian-security_20230402T000159Z_dists_bullseye-security==2023-04-01T15:23:02Z -packages.trafficmanager.net_snapshot_debian-security_20230402T000159Z_dists_buster_updates==2023-04-01T15:23:02Z -packages.trafficmanager.net_snapshot_debian_20230402T000158Z_dists_bullseye==2022-12-17T10:14:37Z -packages.trafficmanager.net_snapshot_debian_20230402T000158Z_dists_bullseye-backports==2023-04-01T20:14:08Z -packages.trafficmanager.net_snapshot_debian_20230402T000158Z_dists_bullseye-updates==2023-04-01T20:14:08Z -packages.trafficmanager.net_snapshot_debian_20230402T000158Z_dists_buster==2022-09-10T11:30:54Z -packages.trafficmanager.net_snapshot_debian_20230402T000158Z_dists_buster-backports==2023-04-01T20:14:08Z -packages.trafficmanager.net_snapshot_debian_20230402T000158Z_dists_buster-updates==2023-04-01T20:14:08Z \ No newline at end of file +packages.trafficmanager.net_snapshot_debian-security_20230404T000455Z_dists_bullseye-security==2023-04-02T12:12:16Z +packages.trafficmanager.net_snapshot_debian-security_20230404T000455Z_dists_buster_updates==2023-04-02T12:12:16Z +packages.trafficmanager.net_snapshot_debian_20230404T000134Z_dists_bullseye==2022-12-17T10:14:37Z +packages.trafficmanager.net_snapshot_debian_20230404T000134Z_dists_bullseye-backports==2023-04-03T20:15:17Z +packages.trafficmanager.net_snapshot_debian_20230404T000134Z_dists_bullseye-updates==2023-04-03T20:15:16Z +packages.trafficmanager.net_snapshot_debian_20230404T000134Z_dists_buster==2022-09-10T11:30:54Z +packages.trafficmanager.net_snapshot_debian_20230404T000134Z_dists_buster-backports==2023-04-03T20:15:17Z +packages.trafficmanager.net_snapshot_debian_20230404T000134Z_dists_buster-updates==2023-04-03T20:15:17Z \ 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 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 From 6ba63bd815b63384a6b4262a6a0dfc6cf63a9486 Mon Sep 17 00:00:00 2001 From: mssonicbld <79238446+mssonicbld@users.noreply.github.com> Date: Wed, 5 Apr 2023 07:24:48 +0800 Subject: [PATCH 012/193] [submodule] Update submodule to the latest HEAD automatically (#14462) Why I did it src/linkmgrd * 373544f - (HEAD -> 202205, origin/202205) [active-active] Add mux server state correction mechanism (#191) (3 days ago) [Longxiang Lyu] src/sonic-platform-daemons * 0260695 - (HEAD -> 202205, origin/202205) Fix issue: Exception occured at SfpStateUpdateTask thread due to KeyError('status') (#346) (3 days ago) [Junchao-Mellanox] src/sonic-swss * af46930 - (HEAD -> 202205, origin/202205) Custom monitoring based priority tunnels (3 days ago) [siqbal1986] src/sonic-utilities * fe224f09 - (HEAD -> 202205, origin/202205) Revert "Convert IPv6 addresses to lowercase in apply-patch (#2299)" (#2758) (3 days ago) [jingwenxie] * cf12bb5e - [warm-reboot] Use kexec_file_load instead of kexec_load when available (#2608) (10 days ago) [Saikrishna Arcot] * 93f1d740 - [warm-reboot] fix warm-reboot when /tmp/cache is missing (#2367) (10 days ago) [Stepan Blyshchak] --- src/linkmgrd | 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/linkmgrd b/src/linkmgrd index 3403160c7234..373544fb157c 160000 --- a/src/linkmgrd +++ b/src/linkmgrd @@ -1 +1 @@ -Subproject commit 3403160c7234679be9f1684e35b32a484ce6be8e +Subproject commit 373544fb157ca6ea1e541d021181507a35e63979 diff --git a/src/sonic-platform-daemons b/src/sonic-platform-daemons index a6015f2142af..026069535091 160000 --- a/src/sonic-platform-daemons +++ b/src/sonic-platform-daemons @@ -1 +1 @@ -Subproject commit a6015f2142af67f53bcbb12036968ea8e113e512 +Subproject commit 02606953509120a2acd0fbeebbda56fb47a93109 diff --git a/src/sonic-swss b/src/sonic-swss index a2f1428294e3..af469306b4fa 160000 --- a/src/sonic-swss +++ b/src/sonic-swss @@ -1 +1 @@ -Subproject commit a2f1428294e3b13043c288efcdeb64c44c2e1e9f +Subproject commit af469306b4fa0589f19827c2f26658b2795fbabd diff --git a/src/sonic-utilities b/src/sonic-utilities index 329386658776..fe224f09bea1 160000 --- a/src/sonic-utilities +++ b/src/sonic-utilities @@ -1 +1 @@ -Subproject commit 3293866587761e677a922820e52c14a168025234 +Subproject commit fe224f09bea1441f67707721018bc74a7669e991 From eab159f5e3d0a38dd75e8953837d44096d184cd0 Mon Sep 17 00:00:00 2001 From: mssonicbld <79238446+mssonicbld@users.noreply.github.com> Date: Wed, 5 Apr 2023 15:28:41 +0800 Subject: [PATCH 013/193] Delay mux/sflow/snmp timer after interface-config service (#14506) (#14523) --- files/build_templates/mux.service.j2 | 2 +- files/build_templates/sflow.service.j2 | 2 +- files/build_templates/snmp.timer | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/files/build_templates/mux.service.j2 b/files/build_templates/mux.service.j2 index ee1f8ce75389..dbb65ac9eb2b 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 swss.service -After=swss.service +After=swss.service interfaces-config.service BindsTo=sonic.target After=sonic.target StartLimitIntervalSec=1200 diff --git a/files/build_templates/sflow.service.j2 b/files/build_templates/sflow.service.j2 index 9a734742ed0e..fd366fa9d6d9 100644 --- a/files/build_templates/sflow.service.j2 +++ b/files/build_templates/sflow.service.j2 @@ -1,7 +1,7 @@ [Unit] Description=sFlow container Requisite=swss.service -After=swss.service syncd.service hostcfgd.service +After=swss.service syncd.service hostcfgd.service interfaces-config.service BindsTo=sonic.target After=sonic.target Before=ntp-config.service diff --git a/files/build_templates/snmp.timer b/files/build_templates/snmp.timer index 0d17391a73f6..bcbe4963adc4 100644 --- a/files/build_templates/snmp.timer +++ b/files/build_templates/snmp.timer @@ -1,7 +1,7 @@ [Unit] Description=Delays snmp container until SONiC has started PartOf=snmp.service -After=swss.service +After=swss.service interfaces-config.service [Timer] OnUnitActiveSec=0 sec From fec29540a61b212a56bb855ac11dee7411354b4e Mon Sep 17 00:00:00 2001 From: Rajkumar-Marvell <54936542+rajkumar38@users.noreply.github.com> Date: Wed, 5 Apr 2023 23:46:21 +0530 Subject: [PATCH 014/193] [Marvell] Update armhf sai debian (#14413) Why I did it Fixed syncd syslog errors reported in issue sonic-net/SONiC#1248 Fixes sonic-net/SONiC#1248 How I did it Compile and load the SAI debian in SONiC 202205 image. How to verify it Verify PTF autorestart testcase passes. Signed-off-by: rajkumar38 --- 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 454222b7e4d1..1577a625c185 100644 --- a/platform/marvell-armhf/sai.mk +++ b/platform/marvell-armhf/sai.mk @@ -1,6 +1,6 @@ # Marvell SAI -export MRVL_SAI_VERSION = 1.10.2-2 +export MRVL_SAI_VERSION = 1.10.2-3 export MRVL_SAI = mrvllibsai_$(MRVL_SAI_VERSION)_$(PLATFORM_ARCH).deb $(MRVL_SAI)_SRC_PATH = $(PLATFORM_PATH)/sai From 82873c24ce3f7435dd805aceb060e3545a69b51f Mon Sep 17 00:00:00 2001 From: Dev Ojha <47282568+developfast@users.noreply.github.com> Date: Thu, 6 Apr 2023 07:52:43 -0700 Subject: [PATCH 015/193] [202205][Buffer] Added cable length config to buffer config template for EdgeZoneAggregator (#14538) 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. 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. --- files/build_templates/buffers_config.j2 | 3 + .../tests/sample-arista-7060-t0-minigraph.xml | 1048 +++++++++++++++++ .../py2/buffer-arista7060-t0.json | 440 +++++++ .../py3/buffer-arista7060-t0.json | 440 +++++++ src/sonic-config-engine/tests/test_j2files.py | 7 +- 5 files changed, 1936 insertions(+), 2 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 173c46040937..2ba9d009062f 100644 --- a/files/build_templates/buffers_config.j2 +++ b/files/build_templates/buffers_config.j2 @@ -53,6 +53,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 @@ + + + + + + false + str2-7060cx-32s-29 + 10.0.0.56 + ARISTA01T1 + 10.0.0.57 + 1 + 10 + 3 + + + str2-7060cx-32s-29 + FC00::71 + ARISTA01T1 + FC00::72 + 1 + 10 + 3 + + + false + str2-7060cx-32s-29 + 10.0.0.58 + ARISTA02T1 + 10.0.0.59 + 1 + 10 + 3 + + + str2-7060cx-32s-29 + FC00::75 + ARISTA02T1 + FC00::76 + 1 + 10 + 3 + + + false + str2-7060cx-32s-29 + 10.0.0.60 + ARISTA03T1 + 10.0.0.61 + 1 + 10 + 3 + + + str2-7060cx-32s-29 + FC00::79 + ARISTA03T1 + FC00::7A + 1 + 10 + 3 + + + false + str2-7060cx-32s-29 + 10.0.0.62 + ARISTA04T1 + 10.0.0.63 + 1 + 10 + 3 + + + str2-7060cx-32s-29 + FC00::7D + ARISTA04T1 + FC00::7E + 1 + 10 + 3 + + + + + 65100 + str2-7060cx-32s-29 + + +
10.0.0.57
+ + + + + +
10.0.0.59
+ + + + + +
10.0.0.61
+ + + + + +
10.0.0.63
+ + + + + + BGPPeer +
10.1.0.32
+ + + + BGPSLBPassive + 10.255.0.0/25 + + + BGPPeer +
10.1.0.32
+ + + + BGPVac + 192.168.0.0/21 + + + + + + 64600 + ARISTA01T1 + + + + 64600 + ARISTA02T1 + + + + 64600 + ARISTA03T1 + + + + 64600 + ARISTA04T1 + + + + + + + + + + HostIP + Loopback0 + + 10.1.0.32/32 + + 10.1.0.32/32 + + + HostIP1 + Loopback0 + + FC00:1::32/128 + + FC00:1::32/128 + + + + + HostIP + eth0 + + 10.3.146.57/23 + + 10.3.146.57/23 + + + V6HostIP + eth0 + + FC00:2::32/64 + + FC00:2::32/64 + + + + + + + str2-7060cx-32s-29 + + + PortChannel101 + Ethernet29/1 + + + + PortChannel102 + Ethernet30/1 + + + + PortChannel103 + Ethernet31/1 + + + + PortChannel104 + Ethernet32/1 + + + + + + Vlan1000 + 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 + False + 0.0.0.0/0 + 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 + fc02:2000::1;fc02:2000::2;fc02:2000::3;fc02:2000::4 + 1000 + 1000 + 192.168.0.0/21 + + + + + + PortChannel101 + 10.0.0.56/31 + + + + PortChannel101 + FC00::71/126 + + + + PortChannel102 + 10.0.0.58/31 + + + + PortChannel102 + FC00::75/126 + + + + PortChannel103 + 10.0.0.60/31 + + + + PortChannel103 + FC00::79/126 + + + + PortChannel104 + 10.0.0.62/31 + + + + PortChannel104 + FC00::7D/126 + + + + Vlan1000 + 192.168.0.1/21 + + + + Vlan1000 + fc02:1000::1/64 + + + + + + NTP_ACL + NTP + NTP + + + SNMP_ACL + SNMP + SNMP + + + ERSPAN + Everflow + Everflow + + + ERSPANV6 + EverflowV6 + EverflowV6 + + + VTY_LINE + ssh-only + SSH + + + PortChannel101;PortChannel102;PortChannel103;PortChannel104 + DataAcl + DataPlane + + + + + + + + + + DeviceInterfaceLink + ARISTA01T1 + Ethernet1 + str2-7060cx-32s-29 + Ethernet29/1 + + + DeviceInterfaceLink + ARISTA02T1 + Ethernet1 + str2-7060cx-32s-29 + Ethernet30/1 + + + DeviceInterfaceLink + ARISTA03T1 + Ethernet1 + str2-7060cx-32s-29 + Ethernet31/1 + + + DeviceInterfaceLink + ARISTA04T1 + Ethernet1 + str2-7060cx-32s-29 + Ethernet32/1 + + + DeviceInterfaceLink + str2-7060cx-32s-29 + Ethernet2/1 + Servers0 + eth0 + + + DeviceInterfaceLink + str2-7060cx-32s-29 + Ethernet3/1 + Servers1 + eth0 + + + DeviceInterfaceLink + str2-7060cx-32s-29 + Ethernet4/1 + Servers2 + eth0 + + + DeviceInterfaceLink + str2-7060cx-32s-29 + Ethernet5/1 + Servers3 + eth0 + + + DeviceInterfaceLink + str2-7060cx-32s-29 + Ethernet6/1 + Servers4 + eth0 + + + DeviceInterfaceLink + str2-7060cx-32s-29 + Ethernet7/1 + Servers5 + eth0 + + + DeviceInterfaceLink + str2-7060cx-32s-29 + Ethernet8/1 + Servers6 + eth0 + + + DeviceInterfaceLink + str2-7060cx-32s-29 + Ethernet9/1 + Servers7 + eth0 + + + DeviceInterfaceLink + str2-7060cx-32s-29 + Ethernet10/1 + Servers8 + eth0 + + + DeviceInterfaceLink + str2-7060cx-32s-29 + Ethernet11/1 + Servers9 + eth0 + + + DeviceInterfaceLink + str2-7060cx-32s-29 + Ethernet12/1 + Servers10 + eth0 + + + DeviceInterfaceLink + str2-7060cx-32s-29 + Ethernet13/1 + Servers11 + eth0 + + + DeviceInterfaceLink + str2-7060cx-32s-29 + Ethernet14/1 + Servers12 + eth0 + + + DeviceInterfaceLink + str2-7060cx-32s-29 + Ethernet15/1 + Servers13 + eth0 + + + DeviceInterfaceLink + str2-7060cx-32s-29 + Ethernet16/1 + Servers14 + eth0 + + + DeviceInterfaceLink + str2-7060cx-32s-29 + Ethernet17/1 + Servers15 + eth0 + + + DeviceInterfaceLink + str2-7060cx-32s-29 + Ethernet18/1 + Servers16 + eth0 + + + DeviceInterfaceLink + str2-7060cx-32s-29 + Ethernet19/1 + Servers17 + eth0 + + + DeviceInterfaceLink + str2-7060cx-32s-29 + Ethernet20/1 + Servers18 + eth0 + + + DeviceInterfaceLink + str2-7060cx-32s-29 + Ethernet21/1 + Servers19 + eth0 + + + DeviceInterfaceLink + str2-7060cx-32s-29 + Ethernet22/1 + Servers20 + eth0 + + + DeviceInterfaceLink + str2-7060cx-32s-29 + Ethernet23/1 + Servers21 + eth0 + + + DeviceInterfaceLink + str2-7060cx-32s-29 + Ethernet24/1 + Servers22 + eth0 + + + DeviceInterfaceLink + str2-7060cx-32s-29 + Ethernet25/1 + Servers23 + eth0 + + + + + str2-7060cx-32s-29 + Arista-7060CX-32S-D48C8 + + 10.3.146.57 + + + + ARISTA04T1 + + 172.16.137.127 + + Arista-VM + + + ARISTA03T1 + + 172.16.137.126 + + Arista-VM + + + ARISTA02T1 + + 172.16.137.125 + + Arista-VM + + + ARISTA01T1 + + 172.16.137.124 + + Arista-VM + + + + + + true + + + DeviceInterface + + true + true + 1 + Ethernet1/1 + + false + 0 + 0 + 40000 + + + DeviceInterface + + true + true + 1 + Ethernet2/1 + + false + 0 + 0 + 40000 + + + DeviceInterface + + true + true + 1 + Ethernet3/1 + + false + 0 + 0 + 40000 + + + DeviceInterface + + true + true + 1 + Ethernet4/1 + + false + 0 + 0 + 40000 + + + DeviceInterface + + true + true + 1 + Ethernet5/1 + + false + 0 + 0 + 40000 + + + DeviceInterface + + true + true + 1 + Ethernet6/1 + + false + 0 + 0 + 40000 + + + DeviceInterface + + true + true + 1 + Ethernet7/1 + + false + 0 + 0 + 40000 + + + DeviceInterface + + true + true + 1 + Ethernet8/1 + + false + 0 + 0 + 40000 + + + DeviceInterface + + true + true + 1 + Ethernet9/1 + + false + 0 + 0 + 40000 + + + DeviceInterface + + true + true + 1 + Ethernet10/1 + + false + 0 + 0 + 40000 + + + DeviceInterface + + true + true + 1 + Ethernet11/1 + + false + 0 + 0 + 40000 + + + DeviceInterface + + true + true + 1 + Ethernet12/1 + + false + 0 + 0 + 40000 + + + DeviceInterface + + true + true + 1 + Ethernet13/1 + + false + 0 + 0 + 40000 + + + DeviceInterface + + true + true + 1 + Ethernet14/1 + + false + 0 + 0 + 40000 + + + DeviceInterface + + true + true + 1 + Ethernet15/1 + + false + 0 + 0 + 40000 + + + DeviceInterface + + true + true + 1 + Ethernet16/1 + + false + 0 + 0 + 40000 + + + DeviceInterface + + true + true + 1 + Ethernet17/1 + + false + 0 + 0 + 40000 + + + DeviceInterface + + true + true + 1 + Ethernet18/1 + + false + 0 + 0 + 40000 + + + DeviceInterface + + true + true + 1 + Ethernet19/1 + + false + 0 + 0 + 40000 + + + DeviceInterface + + true + true + 1 + Ethernet20/1 + + false + 0 + 0 + 40000 + + + DeviceInterface + + true + true + 1 + Ethernet21/1 + + false + 0 + 0 + 40000 + + + DeviceInterface + + true + true + 1 + Ethernet22/1 + + false + 0 + 0 + 40000 + + + DeviceInterface + + true + true + 1 + Ethernet23/1 + + false + 0 + 0 + 40000 + + + DeviceInterface + + true + true + 1 + Ethernet24/1 + + false + 0 + 0 + 40000 + + + DeviceInterface + + true + true + 1 + Ethernet25/1 + + false + 0 + 0 + 40000 + + + DeviceInterface + + true + true + 1 + Ethernet26/1 + + false + 0 + 0 + 40000 + + + DeviceInterface + + true + true + 1 + Ethernet27/1 + + false + 0 + 0 + 40000 + + + DeviceInterface + + true + true + 1 + Ethernet28/1 + + false + 0 + 0 + 40000 + + + DeviceInterface + + true + true + 1 + Ethernet29/1 + + false + 0 + 0 + 40000 + + + DeviceInterface + + true + true + 1 + Ethernet30/1 + + false + 0 + 0 + 40000 + + + DeviceInterface + + true + true + 1 + Ethernet31/1 + + false + 0 + 0 + 40000 + + + DeviceInterface + + true + true + 1 + Ethernet32/1 + + false + 0 + 0 + 40000 + + + true + 0 + Arista-7060CX-32S-D48C8 + + + + + + + str2-7060cx-32s-29 + + + DeploymentId + + 1 + + + QosProfile + + Profile0 + + + DhcpResources + + 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 + + + NtpResources + + 10.20.8.129;10.20.8.130 + + + SnmpResources + + 10.3.145.98 + + + SyslogResources + + 10.64.246.95 + + + TacacsGroup + + Starlab + + + TacacsServer + + 100.127.20.21 + + + ForcedMgmtRoutes + + 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 + + + ErspanDestinationIpv4 + + 10.20.6.16 + + + + + + + str2-7060cx-32s-29 + Arista-7060CX-32S-D48C8 + 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..f883dd1aa417 --- /dev/null +++ b/src/sonic-config-engine/tests/sample_output/py2/buffer-arista7060-t0.json @@ -0,0 +1,440 @@ +{ + "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": "40m", + "Ethernet122": "5m", + "Ethernet92": "5m", + "Ethernet120": "40m", + "Ethernet50": "5m", + "Ethernet52": "5m", + "Ethernet54": "5m", + "Ethernet56": "5m", + "Ethernet76": "5m", + "Ethernet74": "5m", + "Ethernet18": "5m", + "Ethernet70": "5m", + "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": "40m", + "Ethernet82": "5m", + "Ethernet114": "5m", + "Ethernet80": "5m", + "Ethernet112": "40m", + "Ethernet86": "5m", + "Ethernet110": "5m", + "Ethernet84": "5m", + "Ethernet48": "5m", + "Ethernet10": "5m", + "Ethernet44": "5m", + "Ethernet42": "5m", + "Ethernet40": "5m", + "Ethernet64": "5m", + "Ethernet66": "5m", + "Ethernet12": "5m", + "Ethernet46": "5m", + "Ethernet20": "5m", + "Ethernet22": "5m", + "Ethernet68": "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":"ingress_lossless_pool", + "size":"0", + "dynamic_th":"3" + }, + "egress_lossless_profile": { + "pool":"egress_lossless_pool", + "size":"1518", + "static_th":"15982720" + }, + "egress_lossy_profile": { + "pool":"egress_lossy_pool", + "size":"1518", + "dynamic_th":"3" + } + }, + + "BUFFER_PG": { + "Ethernet8|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet4|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet68|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet96|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet124|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet92|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet120|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet52|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet56|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet76|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet72|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet32|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet16|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet36|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet12|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet28|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet88|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet116|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet80|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet112|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet84|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet48|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet44|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet40|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet64|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet60|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet20|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet24|0": { + "profile" : "ingress_lossy_profile" + } + }, + + "BUFFER_QUEUE": { + "Ethernet8|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet4|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet68|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet96|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet124|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet92|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet120|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet52|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet56|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet76|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet72|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet32|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet16|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet36|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet12|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet28|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet88|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet116|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet80|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet112|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet84|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet48|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet44|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet40|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet64|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet60|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet20|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet24|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet8|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet4|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet68|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet96|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet124|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet92|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet120|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet52|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet56|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet76|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet72|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet32|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet16|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet36|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet12|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet28|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet88|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet116|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet80|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet112|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet84|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet48|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet44|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet40|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet64|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet60|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet20|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet24|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet8|5-6": { + "profile" : "egress_lossy_profile" + }, + "Ethernet4|5-6": { + "profile" : "egress_lossy_profile" + }, + "Ethernet68|5-6": { + "profile" : "egress_lossy_profile" + }, + "Ethernet96|5-6": { + "profile" : "egress_lossy_profile" + }, + "Ethernet124|5-6": { + "profile" : "egress_lossy_profile" + }, + "Ethernet92|5-6": { + "profile" : "egress_lossy_profile" + }, + "Ethernet120|5-6": { + "profile" : "egress_lossy_profile" + }, + "Ethernet52|5-6": { + "profile" : "egress_lossy_profile" + }, + "Ethernet56|5-6": { + "profile" : "egress_lossy_profile" + }, + "Ethernet76|5-6": { + "profile" : "egress_lossy_profile" + }, + "Ethernet72|5-6": { + "profile" : "egress_lossy_profile" + }, + "Ethernet32|5-6": { + "profile" : "egress_lossy_profile" + }, + "Ethernet16|5-6": { + "profile" : "egress_lossy_profile" + }, + "Ethernet36|5-6": { + "profile" : "egress_lossy_profile" + }, + "Ethernet12|5-6": { + "profile" : "egress_lossy_profile" + }, + "Ethernet28|5-6": { + "profile" : "egress_lossy_profile" + }, + "Ethernet88|5-6": { + "profile" : "egress_lossy_profile" + }, + "Ethernet116|5-6": { + "profile" : "egress_lossy_profile" + }, + "Ethernet80|5-6": { + "profile" : "egress_lossy_profile" + }, + "Ethernet112|5-6": { + "profile" : "egress_lossy_profile" + }, + "Ethernet84|5-6": { + "profile" : "egress_lossy_profile" + }, + "Ethernet48|5-6": { + "profile" : "egress_lossy_profile" + }, + "Ethernet44|5-6": { + "profile" : "egress_lossy_profile" + }, + "Ethernet40|5-6": { + "profile" : "egress_lossy_profile" + }, + "Ethernet64|5-6": { + "profile" : "egress_lossy_profile" + }, + "Ethernet60|5-6": { + "profile" : "egress_lossy_profile" + }, + "Ethernet20|5-6": { + "profile" : "egress_lossy_profile" + }, + "Ethernet24|5-6": { + "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..f883dd1aa417 --- /dev/null +++ b/src/sonic-config-engine/tests/sample_output/py3/buffer-arista7060-t0.json @@ -0,0 +1,440 @@ +{ + "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": "40m", + "Ethernet122": "5m", + "Ethernet92": "5m", + "Ethernet120": "40m", + "Ethernet50": "5m", + "Ethernet52": "5m", + "Ethernet54": "5m", + "Ethernet56": "5m", + "Ethernet76": "5m", + "Ethernet74": "5m", + "Ethernet18": "5m", + "Ethernet70": "5m", + "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": "40m", + "Ethernet82": "5m", + "Ethernet114": "5m", + "Ethernet80": "5m", + "Ethernet112": "40m", + "Ethernet86": "5m", + "Ethernet110": "5m", + "Ethernet84": "5m", + "Ethernet48": "5m", + "Ethernet10": "5m", + "Ethernet44": "5m", + "Ethernet42": "5m", + "Ethernet40": "5m", + "Ethernet64": "5m", + "Ethernet66": "5m", + "Ethernet12": "5m", + "Ethernet46": "5m", + "Ethernet20": "5m", + "Ethernet22": "5m", + "Ethernet68": "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":"ingress_lossless_pool", + "size":"0", + "dynamic_th":"3" + }, + "egress_lossless_profile": { + "pool":"egress_lossless_pool", + "size":"1518", + "static_th":"15982720" + }, + "egress_lossy_profile": { + "pool":"egress_lossy_pool", + "size":"1518", + "dynamic_th":"3" + } + }, + + "BUFFER_PG": { + "Ethernet8|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet4|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet68|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet96|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet124|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet92|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet120|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet52|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet56|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet76|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet72|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet32|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet16|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet36|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet12|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet28|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet88|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet116|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet80|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet112|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet84|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet48|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet44|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet40|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet64|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet60|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet20|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet24|0": { + "profile" : "ingress_lossy_profile" + } + }, + + "BUFFER_QUEUE": { + "Ethernet8|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet4|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet68|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet96|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet124|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet92|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet120|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet52|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet56|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet76|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet72|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet32|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet16|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet36|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet12|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet28|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet88|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet116|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet80|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet112|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet84|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet48|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet44|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet40|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet64|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet60|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet20|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet24|3-4": { + "profile" : "egress_lossless_profile" + }, + "Ethernet8|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet4|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet68|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet96|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet124|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet92|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet120|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet52|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet56|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet76|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet72|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet32|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet16|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet36|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet12|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet28|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet88|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet116|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet80|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet112|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet84|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet48|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet44|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet40|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet64|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet60|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet20|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet24|0-2": { + "profile" : "egress_lossy_profile" + }, + "Ethernet8|5-6": { + "profile" : "egress_lossy_profile" + }, + "Ethernet4|5-6": { + "profile" : "egress_lossy_profile" + }, + "Ethernet68|5-6": { + "profile" : "egress_lossy_profile" + }, + "Ethernet96|5-6": { + "profile" : "egress_lossy_profile" + }, + "Ethernet124|5-6": { + "profile" : "egress_lossy_profile" + }, + "Ethernet92|5-6": { + "profile" : "egress_lossy_profile" + }, + "Ethernet120|5-6": { + "profile" : "egress_lossy_profile" + }, + "Ethernet52|5-6": { + "profile" : "egress_lossy_profile" + }, + "Ethernet56|5-6": { + "profile" : "egress_lossy_profile" + }, + "Ethernet76|5-6": { + "profile" : "egress_lossy_profile" + }, + "Ethernet72|5-6": { + "profile" : "egress_lossy_profile" + }, + "Ethernet32|5-6": { + "profile" : "egress_lossy_profile" + }, + "Ethernet16|5-6": { + "profile" : "egress_lossy_profile" + }, + "Ethernet36|5-6": { + "profile" : "egress_lossy_profile" + }, + "Ethernet12|5-6": { + "profile" : "egress_lossy_profile" + }, + "Ethernet28|5-6": { + "profile" : "egress_lossy_profile" + }, + "Ethernet88|5-6": { + "profile" : "egress_lossy_profile" + }, + "Ethernet116|5-6": { + "profile" : "egress_lossy_profile" + }, + "Ethernet80|5-6": { + "profile" : "egress_lossy_profile" + }, + "Ethernet112|5-6": { + "profile" : "egress_lossy_profile" + }, + "Ethernet84|5-6": { + "profile" : "egress_lossy_profile" + }, + "Ethernet48|5-6": { + "profile" : "egress_lossy_profile" + }, + "Ethernet44|5-6": { + "profile" : "egress_lossy_profile" + }, + "Ethernet40|5-6": { + "profile" : "egress_lossy_profile" + }, + "Ethernet64|5-6": { + "profile" : "egress_lossy_profile" + }, + "Ethernet60|5-6": { + "profile" : "egress_lossy_profile" + }, + "Ethernet20|5-6": { + "profile" : "egress_lossy_profile" + }, + "Ethernet24|5-6": { + "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 e51c964d1777..09aa5315f808 100644 --- a/src/sonic-config-engine/tests/test_j2files.py +++ b/src/sonic-config-engine/tests/test_j2files.py @@ -175,7 +175,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) @@ -508,7 +508,7 @@ 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 utils.cmp(sample_output_file, self.output_file), self.run_diff(sample_output_file, self.output_file) @@ -622,6 +622,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 7926a69b8cd8792bf35fcbe9828d8e8b9d87bc28 Mon Sep 17 00:00:00 2001 From: mssonicbld <79238446+mssonicbld@users.noreply.github.com> Date: Thu, 6 Apr 2023 23:18:30 +0800 Subject: [PATCH 016/193] [submodule] Update submodule to the latest HEAD automatically (#14540) Why I did it src/linkmgrd * 2b81c83 - (HEAD -> 202205, origin/202205) [active-standby] Enforce switchover based on heartbeats when mux probe keeps failing (#184) (5 hours ago) [Jing Zhang] src/sonic-platform-common * c401866 - (HEAD -> 202205, origin/202205) Add set/get_lpmode APIs for sff8436 and sff8636 optics (#353) (4 hours ago) [longhuan-cisco] * ea8331e - implement CMIS set_laser_freq to support 100GHz grid space (#294) (4 hours ago) [ChiouRung Haung] src/sonic-platform-daemons * cc32493 - (HEAD -> 202205, origin/202205) Retrieve subport from CONFIG_DB to enable breakout support (#342) (4 hours ago) [mihirpat1] * 864e589 - Pass grid parameter while calling set_laser_freq (#317) (4 hours ago) [mihirpat1] src/sonic-swss * 699477d - (HEAD -> 202205, origin/202205) overlay_dmac change in Vnet configuration. (#2721) (4 hours ago) [siqbal1986] src/sonic-utilities * f9f3e7e4 - (HEAD -> 202205, origin/202205) [voq] Add fabric_ns to the ns_list when display_option is DISPLAY_ALL. (#2717) (4 hours ago) [jfeng-arista] * eb2d9167 - [GCU] Prohibit removal of PFC_WD POLL_INTERVAL field (#2777) (4 hours ago) [isabelmsft] --- src/linkmgrd | 2 +- src/sonic-platform-common | 2 +- src/sonic-platform-daemons | 2 +- src/sonic-swss | 2 +- src/sonic-utilities | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/linkmgrd b/src/linkmgrd index 373544fb157c..2b81c8301584 160000 --- a/src/linkmgrd +++ b/src/linkmgrd @@ -1 +1 @@ -Subproject commit 373544fb157ca6ea1e541d021181507a35e63979 +Subproject commit 2b81c830158472e344610c0357829fe0d1f20b5b diff --git a/src/sonic-platform-common b/src/sonic-platform-common index 9b367e441439..c401866682f3 160000 --- a/src/sonic-platform-common +++ b/src/sonic-platform-common @@ -1 +1 @@ -Subproject commit 9b367e4414394608421ed9641767e4a31c2da6f8 +Subproject commit c401866682f3689b16d223181651a6e57e603e6c diff --git a/src/sonic-platform-daemons b/src/sonic-platform-daemons index 026069535091..cc3249375904 160000 --- a/src/sonic-platform-daemons +++ b/src/sonic-platform-daemons @@ -1 +1 @@ -Subproject commit 02606953509120a2acd0fbeebbda56fb47a93109 +Subproject commit cc3249375904518f8878e1fc95b2b4189eb8cca0 diff --git a/src/sonic-swss b/src/sonic-swss index af469306b4fa..699477d63333 160000 --- a/src/sonic-swss +++ b/src/sonic-swss @@ -1 +1 @@ -Subproject commit af469306b4fa0589f19827c2f26658b2795fbabd +Subproject commit 699477d63333dda0fc0167a6167b54858c71bfac diff --git a/src/sonic-utilities b/src/sonic-utilities index fe224f09bea1..f9f3e7e4361a 160000 --- a/src/sonic-utilities +++ b/src/sonic-utilities @@ -1 +1 @@ -Subproject commit fe224f09bea1441f67707721018bc74a7669e991 +Subproject commit f9f3e7e4361aedf3adca9976395dc231981a2776 From 9680eb9e074c9cc2e78e877688a1c32e4589d5d0 Mon Sep 17 00:00:00 2001 From: mssonicbld <79238446+mssonicbld@users.noreply.github.com> Date: Sat, 8 Apr 2023 20:37:10 +0800 Subject: [PATCH 017/193] [ci/build]: Upgrade SONiC package versions (#14573) --- .../build-sonic-slave-bullseye/versions-py3 | 2 +- .../build-sonic-slave-bullseye/versions-web | 1 + .../build-sonic-slave-buster/versions-py3 | 2 +- .../build-sonic-slave-buster/versions-web | 1 + files/build/versions/default/versions-git | 8 +++---- files/build/versions/default/versions-mirror | 24 +++++++++---------- files/build/versions/default/versions-web | 2 +- .../dockers/docker-ptf/versions-deb-buster | 4 ++-- .../docker-sonic-mgmt-framework/versions-py3 | 2 +- .../dockers/docker-sonic-vs/versions-py3 | 2 +- .../versions-deb-bullseye-armhf | 2 +- .../versions-deb-bullseye | 8 +++---- .../sonic-slave-buster/versions-deb-buster | 6 ++--- .../dockers/sonic-slave-buster/versions-py3 | 2 +- files/build/versions/host-image/versions-py3 | 2 +- 15 files changed, 35 insertions(+), 33 deletions(-) create mode 100644 files/build/versions/build/build-sonic-slave-bullseye/versions-web create mode 100644 files/build/versions/build/build-sonic-slave-buster/versions-web diff --git a/files/build/versions/build/build-sonic-slave-bullseye/versions-py3 b/files/build/versions/build/build-sonic-slave-bullseye/versions-py3 index b03023f4b62c..f3c7560ba25c 100644 --- a/files/build/versions/build/build-sonic-slave-bullseye/versions-py3 +++ b/files/build/versions/build/build-sonic-slave-bullseye/versions-py3 @@ -5,7 +5,7 @@ colorful==0.5.5 docker==6.0.1 docker-image-py==0.1.12 enlighten==1.11.2 -filelock==3.10.7 +filelock==3.11.0 ijson==2.6.1 ipaddress==1.0.23 jsondiff==2.0.0 diff --git a/files/build/versions/build/build-sonic-slave-bullseye/versions-web b/files/build/versions/build/build-sonic-slave-bullseye/versions-web new file mode 100644 index 000000000000..e38c4130f734 --- /dev/null +++ b/files/build/versions/build/build-sonic-slave-bullseye/versions-web @@ -0,0 +1 @@ +https://sonicstorage.blob.core.windows.net/packages/debian/socat_1.7.4.1-3.dsc?sv=2020-04-08&st=2021-12-14T00%3A00%3A00Z&se=2050-12-15T00%3A00%3A00Z&sr=b&sp=r&sig=fIy6dVz3s59K0TiMkTlwSWN8lCzRl3i76ruAtROhfWA%3D==df3ed0dd965589fd09bf6a2920bc273e \ 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 6f1e5a93e3b9..a0bb27cf6517 100644 --- a/files/build/versions/build/build-sonic-slave-buster/versions-py3 +++ b/files/build/versions/build/build-sonic-slave-buster/versions-py3 @@ -7,7 +7,7 @@ dbus-python==1.3.2 docker==6.0.1 docker-image-py==0.1.12 enlighten==1.11.2 -filelock==3.10.7 +filelock==3.11.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-web b/files/build/versions/build/build-sonic-slave-buster/versions-web new file mode 100644 index 000000000000..f9066e4513a6 --- /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.4.1-3.dsc?sv=2020-04-08&st=2021-12-14T00%3A00%3A00Z&se=2050-12-15T00%3A00%3A00Z&sr=b&sp=r&sig=fIy6dVz3s59K0TiMkTlwSWN8lCzRl3i76ruAtROhfWA%3D==d41d8cd98f00b204e9800998ecf8427e \ No newline at end of file diff --git a/files/build/versions/default/versions-git b/files/build/versions/default/versions-git index 0c2de0e8a8e3..3383f35bed62 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==ef6c30622146c4f273157eb40927fa669717a1f9 +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/audisp-tacplus.git==559c9f22edd4f2dea0ecedffb3ad9502b12a75b6 https://github.com/daveolson53/libnss-tacplus.git==19008ab68d9d504aa58eb34d5f564755a1613b8b https://github.com/dyninc/OpenBFDD.git==e35f43ad8d2b3f084e96a84c392528a90d05a287 -https://github.com/flashrom/flashrom.git==3ed016f08faa011736443f3b39bf68187d974781 -https://github.com/FreeRADIUS/freeradius-server.git==adc2b27f351490d933977dda86c48f8ca5ec6bf2 +https://github.com/flashrom/flashrom.git==3eaef7528b622955a48611fdc0801ca853665efd +https://github.com/FreeRADIUS/freeradius-server.git==9884f1aa3847a32fd062fad51665ea98b88e83fc https://github.com/FreeRADIUS/pam_radius.git==8d373539bb9f13b0abfe8bcae0095a930a00fad0 https://github.com/jeroennijhof/pam_tacplus.git==4284d9016e64def2bb81d5f50f96dc3b59bfdc39 https://github.com/jpirko/libteam.git==61e27812c1074a865d7e1a778c0ce442837c28d7 @@ -14,7 +14,7 @@ https://github.com/Marvell-switching/mrvl-prestera.git==9dbae444204a2c27b33be698 https://github.com/Mellanox/libpsample.git==62bb27d9a49424e45191eee81df7ce0d8c74e774 https://github.com/opencomputeproject/SAI.git==3ff228a7e5619a56e3c169966cb1a8631705768a https://github.com/p4lang/scapy-vxlan.git==85ffe83da156568ee47a0750f638227e6e1d7479 -https://github.com/sflow/host-sflow==eb58c6420cb2651e0c32a69e98c5b3a485e5fb09 +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/default/versions-mirror b/files/build/versions/default/versions-mirror index dd85f9e5a036..d3c3daf1ed34 100644 --- a/files/build/versions/default/versions-mirror +++ b/files/build/versions/default/versions-mirror @@ -1,15 +1,15 @@ deb.nodesource.com_node%5f14.x_dists_bullseye==2023-02-17T00:35:28Z deb.nodesource.com_node%5f14.x_dists_buster==2023-02-17T00:35:28Z -debian==20230404T000134Z -debian-security==20230404T000455Z -download.docker.com_linux_debian_dists_bullseye==2023-03-31T22:52:46Z -download.docker.com_linux_debian_dists_buster==2023-03-31T22:52:46Z +debian==20230408T000241Z +debian-security==20230408T000248Z +download.docker.com_linux_debian_dists_bullseye==2023-04-06T18:06:41Z +download.docker.com_linux_debian_dists_buster==2023-04-04T23:38:54Z packages.microsoft.com_repos_sonic-dev_dists_jessie==2022-10-31T19:34:29Z -packages.trafficmanager.net_snapshot_debian-security_20230404T000455Z_dists_bullseye-security==2023-04-02T12:12:16Z -packages.trafficmanager.net_snapshot_debian-security_20230404T000455Z_dists_buster_updates==2023-04-02T12:12:16Z -packages.trafficmanager.net_snapshot_debian_20230404T000134Z_dists_bullseye==2022-12-17T10:14:37Z -packages.trafficmanager.net_snapshot_debian_20230404T000134Z_dists_bullseye-backports==2023-04-03T20:15:17Z -packages.trafficmanager.net_snapshot_debian_20230404T000134Z_dists_bullseye-updates==2023-04-03T20:15:16Z -packages.trafficmanager.net_snapshot_debian_20230404T000134Z_dists_buster==2022-09-10T11:30:54Z -packages.trafficmanager.net_snapshot_debian_20230404T000134Z_dists_buster-backports==2023-04-03T20:15:17Z -packages.trafficmanager.net_snapshot_debian_20230404T000134Z_dists_buster-updates==2023-04-03T20:15:17Z \ No newline at end of file +packages.trafficmanager.net_snapshot_debian-security_20230408T000248Z_dists_bullseye-security==2023-04-07T20:22:40Z +packages.trafficmanager.net_snapshot_debian-security_20230408T000248Z_dists_buster_updates==2023-04-07T20:22:40Z +packages.trafficmanager.net_snapshot_debian_20230408T000241Z_dists_bullseye==2022-12-17T10:14:37Z +packages.trafficmanager.net_snapshot_debian_20230408T000241Z_dists_bullseye-backports==2023-04-07T20:14:56Z +packages.trafficmanager.net_snapshot_debian_20230408T000241Z_dists_bullseye-updates==2023-04-07T20:14:56Z +packages.trafficmanager.net_snapshot_debian_20230408T000241Z_dists_buster==2022-09-10T11:30:54Z +packages.trafficmanager.net_snapshot_debian_20230408T000241Z_dists_buster-backports==2023-04-07T20:14:56Z +packages.trafficmanager.net_snapshot_debian_20230408T000241Z_dists_buster-updates==2023-04-07T20:14:56Z \ No newline at end of file diff --git a/files/build/versions/default/versions-web b/files/build/versions/default/versions-web index de03aa4fdcd3..4fec18071c29 100644 --- a/files/build/versions/default/versions-web +++ b/files/build/versions/default/versions-web @@ -44,7 +44,7 @@ https://github.com/CentecNetworks/sonic-binaries/raw/master/amd64/third_party/ad https://github.com/CentecNetworks/sonic-binaries/raw/master/amd64/third_party/advantech/libSUSI-4.00.so.1==393a94b0abba146777e276e1febe0cb0 https://github.com/CentecNetworks/sonic-binaries/raw/master/arm64/sai/libsai_1.9.1-0_arm64.deb==c354c766cc763a5af621a88637b9e126 https://github.com/CumulusNetworks/ifupdown2/archive/3.0.0-1.tar.gz==755459b3a58fbc11625336846cea7420 -https://github.com/Marvell-switching/sonic-marvell-binaries/raw/master/armhf/sai-plugin/mrvllibsai_1.10.2-2_armhf.deb==4a8b1c9542f47164556ae83c917f438e +https://github.com/Marvell-switching/sonic-marvell-binaries/raw/master/armhf/sai-plugin/mrvllibsai_1.10.2-3_armhf.deb==13728edb8ddb2cede3244d031580a468 https://github.com/Mellanox/Spectrum-SDK-Drivers-SONiC-Bins/releases/download/fw-2010.4204/fw-SPC-rel-13_2010_4204-EVB.mfa==c511454113db7cbf01a5bc898250cf8d https://github.com/Mellanox/Spectrum-SDK-Drivers-SONiC-Bins/releases/download/fw-2010.4204/fw-SPC2-rel-29_2010_4204-EVB.mfa==eb004feb6008dc7f109e42d36f372fc6 https://github.com/Mellanox/Spectrum-SDK-Drivers-SONiC-Bins/releases/download/fw-2010.4204/fw-SPC3-rel-30_2010_4204-EVB.mfa==9099a37a1efb22b6dce535ad2e1528d4 diff --git a/files/build/versions/dockers/docker-ptf/versions-deb-buster b/files/build/versions/dockers/docker-ptf/versions-deb-buster index d341784cb324..99f074cf90e2 100644 --- a/files/build/versions/dockers/docker-ptf/versions-deb-buster +++ b/files/build/versions/dockers/docker-ptf/versions-deb-buster @@ -149,8 +149,8 @@ libgnutls30==3.6.7-4+deb10u10 libgomp1==8.3.0-6 libgpm2==1.20.7-5 libgraphite2-3==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 libgssapi-krb5-2==1.17-3+deb10u5 libgts-0.7-5==0.7.6+darcs121130-4 libgts-bin==0.7.6+darcs121130-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 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/docker-sonic-vs/versions-py3 b/files/build/versions/dockers/docker-sonic-vs/versions-py3 index 14b0272d3ac6..2d3cd50e27a3 100644 --- a/files/build/versions/dockers/docker-sonic-vs/versions-py3 +++ b/files/build/versions/dockers/docker-sonic-vs/versions-py3 @@ -8,7 +8,7 @@ dbus-python==1.3.2 docker==6.0.1 docker-image-py==0.1.12 enlighten==1.11.2 -filelock==3.10.7 +filelock==3.11.0 idna==3.4 jsonpatch==1.32 jsonpointer==2.3 diff --git a/files/build/versions/dockers/docker-syncd-mrvl/versions-deb-bullseye-armhf b/files/build/versions/dockers/docker-syncd-mrvl/versions-deb-bullseye-armhf index 259073792bfe..44f115ddbb69 100644 --- a/files/build/versions/dockers/docker-syncd-mrvl/versions-deb-bullseye-armhf +++ b/files/build/versions/dockers/docker-syncd-mrvl/versions-deb-bullseye-armhf @@ -25,7 +25,7 @@ libsensors4-dev==1:3.6.0-7 libsensors5==1:3.6.0-7 mailcap==3.69 mime-support==3.66 -mrvllibsai==1.10.2-2 +mrvllibsai==1.10.2-3 nfs-common==1:1.3.4-6 pkg-config==0.29.2-1 python-dev-is-python2==2.7.18-9 diff --git a/files/build/versions/dockers/sonic-slave-bullseye/versions-deb-bullseye b/files/build/versions/dockers/sonic-slave-bullseye/versions-deb-bullseye index 531bda04b58b..bf87aa0ef15e 100644 --- a/files/build/versions/dockers/sonic-slave-bullseye/versions-deb-bullseye +++ b/files/build/versions/dockers/sonic-slave-bullseye/versions-deb-bullseye @@ -95,7 +95,7 @@ docbook-utils==0.6.14-3.4 docbook-xml==4.5-9 docker-ce==5:20.10.14~3-0~debian-bullseye docker-ce-cli==5:20.10.14~3-0~debian-bullseye -docker-ce-rootless-extras==5:23.0.2-1~debian.11~bullseye +docker-ce-rootless-extras==5:23.0.3-1~debian.11~bullseye docker-scan-plugin==0.23.0~debian-bullseye docutils-common==0.16+dfsg-4 dosfstools==4.2-1 @@ -143,7 +143,7 @@ gem2deb==1.4 gem2deb-test-runner==1.4 gettext==0.21-4 gettext-base==0.21-4 -ghostscript==9.53.3~dfsg-7+deb11u2 +ghostscript==9.53.3~dfsg-7+deb11u4 gir1.2-atk-1.0==2.36.0-2 gir1.2-atspi-2.0==2.38.0-4 gir1.2-freedesktop==1.66.1-1+b1 @@ -618,8 +618,8 @@ libgraphite2-3==1.3.14-1 libgraphite2-dev==1.3.14-1 libgrpc++1==1.30.2-3 libgrpc10==1.30.2-3 -libgs9==9.53.3~dfsg-7+deb11u2 -libgs9-common==9.53.3~dfsg-7+deb11u2 +libgs9==9.53.3~dfsg-7+deb11u4 +libgs9-common==9.53.3~dfsg-7+deb11u4 libgsasl7==1.10.0-4+deb11u1 libgsm1==1.0.18-2 libgssrpc4==1.18.3-6+deb11u3 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 901c625efe2b..936a0fbb4326 100644 --- a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster +++ b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster @@ -144,7 +144,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 @@ -589,8 +589,8 @@ libgraphite2-3==1.3.13-7 libgraphite2-dev==1.3.13-7 libgrpc++1==1.16.1-1 libgrpc6==1.16.1-1 -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 diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-py3 b/files/build/versions/dockers/sonic-slave-buster/versions-py3 index 57293995cfc4..6a4ff022d947 100644 --- a/files/build/versions/dockers/sonic-slave-buster/versions-py3 +++ b/files/build/versions/dockers/sonic-slave-buster/versions-py3 @@ -20,7 +20,7 @@ gcovr==4.1 gpg==1.12.0 idna==2.6 imagesize==1.0.0 -importlib-metadata==6.1.0 +importlib-metadata==6.2.0 jinja2==3.0.3 keyring==17.1.1 keyrings.alt==3.1.1 diff --git a/files/build/versions/host-image/versions-py3 b/files/build/versions/host-image/versions-py3 index 532031c744ff..5b5565da8180 100644 --- a/files/build/versions/host-image/versions-py3 +++ b/files/build/versions/host-image/versions-py3 @@ -14,7 +14,7 @@ dbus-python==1.2.16 docker==5.0.3 docker-image-py==0.1.12 enlighten==1.11.2 -filelock==3.10.7 +filelock==3.11.0 grpcio==1.39.0 grpcio-tools==1.39.0 idna==3.4 From c62ed6800eda37514b3997ef7a3800d28fad6bb8 Mon Sep 17 00:00:00 2001 From: mssonicbld <79238446+mssonicbld@users.noreply.github.com> Date: Sun, 9 Apr 2023 20:29:39 +0800 Subject: [PATCH 018/193] [ci/build]: Upgrade SONiC package versions (#14579) --- .../build-sonic-slave-bullseye/versions-web | 1 - .../build-sonic-slave-buster/versions-web | 1 - files/build/versions/default/versions-mirror | 20 +++++++++---------- 3 files changed, 10 insertions(+), 12 deletions(-) delete mode 100644 files/build/versions/build/build-sonic-slave-bullseye/versions-web delete mode 100644 files/build/versions/build/build-sonic-slave-buster/versions-web diff --git a/files/build/versions/build/build-sonic-slave-bullseye/versions-web b/files/build/versions/build/build-sonic-slave-bullseye/versions-web deleted file mode 100644 index e38c4130f734..000000000000 --- a/files/build/versions/build/build-sonic-slave-bullseye/versions-web +++ /dev/null @@ -1 +0,0 @@ -https://sonicstorage.blob.core.windows.net/packages/debian/socat_1.7.4.1-3.dsc?sv=2020-04-08&st=2021-12-14T00%3A00%3A00Z&se=2050-12-15T00%3A00%3A00Z&sr=b&sp=r&sig=fIy6dVz3s59K0TiMkTlwSWN8lCzRl3i76ruAtROhfWA%3D==df3ed0dd965589fd09bf6a2920bc273e \ 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 f9066e4513a6..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.4.1-3.dsc?sv=2020-04-08&st=2021-12-14T00%3A00%3A00Z&se=2050-12-15T00%3A00%3A00Z&sr=b&sp=r&sig=fIy6dVz3s59K0TiMkTlwSWN8lCzRl3i76ruAtROhfWA%3D==d41d8cd98f00b204e9800998ecf8427e \ No newline at end of file diff --git a/files/build/versions/default/versions-mirror b/files/build/versions/default/versions-mirror index d3c3daf1ed34..6b52c7ea400f 100644 --- a/files/build/versions/default/versions-mirror +++ b/files/build/versions/default/versions-mirror @@ -1,15 +1,15 @@ deb.nodesource.com_node%5f14.x_dists_bullseye==2023-02-17T00:35:28Z deb.nodesource.com_node%5f14.x_dists_buster==2023-02-17T00:35:28Z -debian==20230408T000241Z -debian-security==20230408T000248Z +debian==20230409T000128Z +debian-security==20230409T000248Z download.docker.com_linux_debian_dists_bullseye==2023-04-06T18:06:41Z download.docker.com_linux_debian_dists_buster==2023-04-04T23:38:54Z packages.microsoft.com_repos_sonic-dev_dists_jessie==2022-10-31T19:34:29Z -packages.trafficmanager.net_snapshot_debian-security_20230408T000248Z_dists_bullseye-security==2023-04-07T20:22:40Z -packages.trafficmanager.net_snapshot_debian-security_20230408T000248Z_dists_buster_updates==2023-04-07T20:22:40Z -packages.trafficmanager.net_snapshot_debian_20230408T000241Z_dists_bullseye==2022-12-17T10:14:37Z -packages.trafficmanager.net_snapshot_debian_20230408T000241Z_dists_bullseye-backports==2023-04-07T20:14:56Z -packages.trafficmanager.net_snapshot_debian_20230408T000241Z_dists_bullseye-updates==2023-04-07T20:14:56Z -packages.trafficmanager.net_snapshot_debian_20230408T000241Z_dists_buster==2022-09-10T11:30:54Z -packages.trafficmanager.net_snapshot_debian_20230408T000241Z_dists_buster-backports==2023-04-07T20:14:56Z -packages.trafficmanager.net_snapshot_debian_20230408T000241Z_dists_buster-updates==2023-04-07T20:14:56Z \ No newline at end of file +packages.trafficmanager.net_snapshot_debian-security_20230409T000248Z_dists_bullseye-security==2023-04-07T20:22:40Z +packages.trafficmanager.net_snapshot_debian-security_20230409T000248Z_dists_buster_updates==2023-04-07T20:22:40Z +packages.trafficmanager.net_snapshot_debian_20230409T000128Z_dists_bullseye==2022-12-17T10:14:37Z +packages.trafficmanager.net_snapshot_debian_20230409T000128Z_dists_bullseye-backports==2023-04-08T20:12:51Z +packages.trafficmanager.net_snapshot_debian_20230409T000128Z_dists_bullseye-updates==2023-04-08T20:12:51Z +packages.trafficmanager.net_snapshot_debian_20230409T000128Z_dists_buster==2022-09-10T11:30:54Z +packages.trafficmanager.net_snapshot_debian_20230409T000128Z_dists_buster-backports==2023-04-08T20:12:51Z +packages.trafficmanager.net_snapshot_debian_20230409T000128Z_dists_buster-updates==2023-04-08T20:12:51Z \ No newline at end of file From c55a5a94ebc181a46bf56085bf323e3e790e6751 Mon Sep 17 00:00:00 2001 From: Ye Jianquan Date: Mon, 10 Apr 2023 23:40:31 +0800 Subject: [PATCH 019/193] Revert "chassis-packet: resolve the missing static routes (#14230)" (#14545) This reverts commit a6d597a81193296a862f1de65650390376507386. --- files/build_templates/arp_update_vars.j2 | 3 +-- files/scripts/arp_update | 27 +++++++----------------- 2 files changed, 9 insertions(+), 21 deletions(-) diff --git a/files/build_templates/arp_update_vars.j2 b/files/build_templates/arp_update_vars.j2 index 9f4ba4a42050..91992e781ac0 100644 --- a/files/build_templates/arp_update_vars.j2 +++ b/files/build_templates/arp_update_vars.j2 @@ -4,6 +4,5 @@ "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 %}", - "static_route_nexthops": "{% if STATIC_ROUTE %}{% for static_route_prefix, static_route_attr in STATIC_ROUTE.items() %}{%- if static_route_prefix -%}{{ static_route_attr['nexthop'].split(',') | join(' ') | lower + " " }}{%- endif -%}{% endfor %}{% endif %}", - "static_route_ifnames": "{% if STATIC_ROUTE %}{% for static_route_prefix, static_route_attr in STATIC_ROUTE.items() %}{%- if static_route_prefix -%}{{ static_route_attr['ifname'].split(',') | join(' ') + " " }}{%- endif -%}{% endfor %}{% endif %}" + "static_route_nexthops": "{% if STATIC_ROUTE %}{% for static_route_prefix, static_route_attr in STATIC_ROUTE.items() %}{%- if static_route_prefix -%}{{ static_route_attr['nexthop'].split(',') | join(' ') | lower + " " }}{%- endif -%}{% endfor %}{% endif %}" } diff --git a/files/scripts/arp_update b/files/scripts/arp_update index 2725f034668b..b686e1a93e24 100755 --- a/files/scripts/arp_update +++ b/files/scripts/arp_update @@ -14,16 +14,13 @@ while /bin/true; do ARP_UPDATE_VARS=$(sonic-cfggen -d -t ${ARP_UPDATE_VARS_FILE}) SWITCH_TYPE=$(echo $ARP_UPDATE_VARS | jq -r '.switch_type') if [[ "$SWITCH_TYPE" == "chassis-packet" ]]; then - # Get array of Nexthops and ifnames. Nexthops and ifnames are mapped one to one - STATIC_ROUTE_NEXTHOPS=($(echo $ARP_UPDATE_VARS | jq -r '.static_route_nexthops')) - STATIC_ROUTE_IFNAMES=($(echo $ARP_UPDATE_VARS | jq -r '.static_route_ifnames')) + STATIC_ROUTE_NEXTHOPS=$(echo $ARP_UPDATE_VARS | jq -r '.static_route_nexthops') # on supervisor/rp exit the script gracefully - if [[ -z "$STATIC_ROUTE_NEXTHOPS" ]] || [[ -z "$STATIC_ROUTE_IFNAMES" ]]; then + if [[ -z "$STATIC_ROUTE_NEXTHOPS" ]]; then logger "arp_update: exiting as no static route in packet based chassis" exit 0 fi - for i in ${!STATIC_ROUTE_NEXTHOPS[@]}; do - nexthop="${STATIC_ROUTE_NEXTHOPS[i]}" + for nexthop in $STATIC_ROUTE_NEXTHOPS; do if [[ $nexthop == *"."* ]]; then neigh_state=( $(ip -4 neigh show | grep -w $nexthop | tr -s ' ' | cut -d ' ' -f 3,4) ) ping_prefix=ping @@ -31,19 +28,11 @@ while /bin/true; do neigh_state=( $(ip -6 neigh show | grep -w $nexthop | tr -s ' ' | cut -d ' ' -f 3,4) ) ping_prefix=ping6 fi - if [[ -z "${neigh_state}" ]] || [[ "${neigh_state[1]}" == "INCOMPLETE" ]] || [[ "${neigh_state[1]}" == "FAILED" ]]; then - interface="${STATIC_ROUTE_IFNAMES[i]}" - if [[ -z "$interface" ]]; then - # should never be here, handling just in case - logger "ERR: arp_update: missing interface entry for static route $nexthop" - interface=${neigh_state[0]} - fi - intf_up=$(ip link show $interface | grep "state UP") - if [[ -n "$intf_up" ]]; then - pingcmd="timeout 0.2 $ping_prefix -I ${interface} -n -q -i 0 -c 1 -W 1 $nexthop >/dev/null" - eval $pingcmd - logger "arp_update: static route nexthop not resolved, pinging $nexthop on ${neigh_state[0]}" - fi + + if [[ "${neigh_state[1]}" == "INCOMPLETE" ]] || [[ "${neigh_state[1]}" == "FAILED" ]]; then + pingcmd="timeout 0.2 $ping_prefix -I ${neigh_state[0]} -n -q -i 0 -c 1 -W 1 $nexthop >/dev/null" + eval $pingcmd + logger "arp_update: sttaic route nexthop not resolved, pinging $nexthop on ${neigh_state[0]}" fi done From 597d37d39538ef2876ea901d87f4d94ea25ee64f Mon Sep 17 00:00:00 2001 From: mssonicbld <79238446+mssonicbld@users.noreply.github.com> Date: Tue, 11 Apr 2023 21:29:00 +0800 Subject: [PATCH 020/193] [ci/build]: Upgrade SONiC package versions (#14604) --- 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 +- .../dockers/sonic-slave-buster/versions-py3 | 2 +- files/build/versions/host-image/versions-py3 | 2 +- 6 files changed, 16 insertions(+), 16 deletions(-) diff --git a/files/build/versions/default/versions-git b/files/build/versions/default/versions-git index 3383f35bed62..10312b79eae9 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==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/audisp-tacplus.git==559c9f22edd4f2dea0ecedffb3ad9502b12a75b6 https://github.com/daveolson53/libnss-tacplus.git==19008ab68d9d504aa58eb34d5f564755a1613b8b https://github.com/dyninc/OpenBFDD.git==e35f43ad8d2b3f084e96a84c392528a90d05a287 https://github.com/flashrom/flashrom.git==3eaef7528b622955a48611fdc0801ca853665efd -https://github.com/FreeRADIUS/freeradius-server.git==9884f1aa3847a32fd062fad51665ea98b88e83fc +https://github.com/FreeRADIUS/freeradius-server.git==1a70a189ac85eb1e496dc5e9cb1f5852bec08590 https://github.com/FreeRADIUS/pam_radius.git==8d373539bb9f13b0abfe8bcae0095a930a00fad0 https://github.com/jeroennijhof/pam_tacplus.git==4284d9016e64def2bb81d5f50f96dc3b59bfdc39 https://github.com/jpirko/libteam.git==61e27812c1074a865d7e1a778c0ce442837c28d7 diff --git a/files/build/versions/default/versions-mirror b/files/build/versions/default/versions-mirror index 6b52c7ea400f..d47a7eddbb38 100644 --- a/files/build/versions/default/versions-mirror +++ b/files/build/versions/default/versions-mirror @@ -1,15 +1,15 @@ deb.nodesource.com_node%5f14.x_dists_bullseye==2023-02-17T00:35:28Z deb.nodesource.com_node%5f14.x_dists_buster==2023-02-17T00:35:28Z -debian==20230409T000128Z -debian-security==20230409T000248Z +debian==20230411T000410Z +debian-security==20230411T000232Z download.docker.com_linux_debian_dists_bullseye==2023-04-06T18:06:41Z download.docker.com_linux_debian_dists_buster==2023-04-04T23:38:54Z packages.microsoft.com_repos_sonic-dev_dists_jessie==2022-10-31T19:34:29Z -packages.trafficmanager.net_snapshot_debian-security_20230409T000248Z_dists_bullseye-security==2023-04-07T20:22:40Z -packages.trafficmanager.net_snapshot_debian-security_20230409T000248Z_dists_buster_updates==2023-04-07T20:22:40Z -packages.trafficmanager.net_snapshot_debian_20230409T000128Z_dists_bullseye==2022-12-17T10:14:37Z -packages.trafficmanager.net_snapshot_debian_20230409T000128Z_dists_bullseye-backports==2023-04-08T20:12:51Z -packages.trafficmanager.net_snapshot_debian_20230409T000128Z_dists_bullseye-updates==2023-04-08T20:12:51Z -packages.trafficmanager.net_snapshot_debian_20230409T000128Z_dists_buster==2022-09-10T11:30:54Z -packages.trafficmanager.net_snapshot_debian_20230409T000128Z_dists_buster-backports==2023-04-08T20:12:51Z -packages.trafficmanager.net_snapshot_debian_20230409T000128Z_dists_buster-updates==2023-04-08T20:12:51Z \ No newline at end of file +packages.trafficmanager.net_snapshot_debian-security_20230411T000232Z_dists_bullseye-security==2023-04-10T18:02:36Z +packages.trafficmanager.net_snapshot_debian-security_20230411T000232Z_dists_buster_updates==2023-04-10T18:02:36Z +packages.trafficmanager.net_snapshot_debian_20230411T000410Z_dists_bullseye==2022-12-17T10:14:37Z +packages.trafficmanager.net_snapshot_debian_20230411T000410Z_dists_bullseye-backports==2023-04-10T20:09:25Z +packages.trafficmanager.net_snapshot_debian_20230411T000410Z_dists_bullseye-updates==2023-04-10T20:09:25Z +packages.trafficmanager.net_snapshot_debian_20230411T000410Z_dists_buster==2022-09-10T11:30:54Z +packages.trafficmanager.net_snapshot_debian_20230411T000410Z_dists_buster-backports==2023-04-10T20:09:25Z +packages.trafficmanager.net_snapshot_debian_20230411T000410Z_dists_buster-updates==2023-04-10T20:09:25Z \ 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 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/docker-sonic-vs/versions-py3 b/files/build/versions/dockers/docker-sonic-vs/versions-py3 index 2d3cd50e27a3..96a93b741d9c 100644 --- a/files/build/versions/dockers/docker-sonic-vs/versions-py3 +++ b/files/build/versions/dockers/docker-sonic-vs/versions-py3 @@ -21,7 +21,7 @@ prefixed==0.7.0 prettyprinter==0.18.0 ptyprocess==0.7.0 pycairo==1.23.0 -pygments==2.14.0 +pygments==2.15.0 pygobject==3.44.1 pyparsing==3.0.9 pyroute2==0.5.14 diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-py3 b/files/build/versions/dockers/sonic-slave-buster/versions-py3 index 6a4ff022d947..ae6057d6bd4a 100644 --- a/files/build/versions/dockers/sonic-slave-buster/versions-py3 +++ b/files/build/versions/dockers/sonic-slave-buster/versions-py3 @@ -20,7 +20,7 @@ gcovr==4.1 gpg==1.12.0 idna==2.6 imagesize==1.0.0 -importlib-metadata==6.2.0 +importlib-metadata==6.3.0 jinja2==3.0.3 keyring==17.1.1 keyrings.alt==3.1.1 diff --git a/files/build/versions/host-image/versions-py3 b/files/build/versions/host-image/versions-py3 index 5b5565da8180..14eed6ecf99f 100644 --- a/files/build/versions/host-image/versions-py3 +++ b/files/build/versions/host-image/versions-py3 @@ -47,7 +47,7 @@ pyangbind==0.8.1 pycairo==1.23.0 pycparser==2.21 pycurl==7.43.0.6 -pygments==2.14.0 +pygments==2.15.0 pygobject==3.44.1 pyroute2==0.5.19 python-apt==2.2.1 From efa6d611440f79f42584f7fcbdf52ab8665a2efd Mon Sep 17 00:00:00 2001 From: Saikrishna Arcot Date: Tue, 11 Apr 2023 11:04:57 -0700 Subject: [PATCH 021/193] [202205][submodule] Advance sonic-swss-common pointer (#14554) #### Why I did it Update sonic-swss-common submodule pointer to include the following: * 55fd28a [202205] Non recursive automake and Debian packaging changes (sonic-net/sonic-swss-common#772) --- rules/swss-common.mk | 2 +- src/sonic-swss-common | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/rules/swss-common.mk b/rules/swss-common.mk index 9ab49b672b6c..7c9e28734197 100644 --- a/rules/swss-common.mk +++ b/rules/swss-common.mk @@ -27,7 +27,7 @@ endif PYTHON3_SWSSCOMMON = python3-swsscommon_$(LIBSWSSCOMMON_VERSION)_$(CONFIGURED_ARCH).deb $(eval $(call add_derived_package,$(LIBSWSSCOMMON),$(PYTHON3_SWSSCOMMON))) -LIBSWSSCOMMON_DBG = $(LIBSWSSCOMMON_NAME)-dbg_$(LIBSWSSCOMMON_VERSION)_$(CONFIGURED_ARCH).deb +LIBSWSSCOMMON_DBG = $(LIBSWSSCOMMON_NAME)-dbgsym_$(LIBSWSSCOMMON_VERSION)_$(CONFIGURED_ARCH).deb $(LIBSWSSCOMMON_DBG)_DEPENDS += $(LIBSWSSCOMMON) $(LIBSWSSCOMMON_DBG)_RDEPENDS += $(LIBSWSSCOMMON) $(eval $(call add_derived_package,$(LIBSWSSCOMMON),$(LIBSWSSCOMMON_DBG))) diff --git a/src/sonic-swss-common b/src/sonic-swss-common index 643132e56692..55fd28a2e18b 160000 --- a/src/sonic-swss-common +++ b/src/sonic-swss-common @@ -1 +1 @@ -Subproject commit 643132e5669229d5e17443dc7708300103436bf6 +Subproject commit 55fd28a2e18bac8fae21b2897b091d758823eaa1 From 46fb9b438219c39cb04109ecfa757b78798e740b Mon Sep 17 00:00:00 2001 From: James An <94036556+jamesan47@users.noreply.github.com> Date: Thu, 13 Apr 2023 05:37:36 -0700 Subject: [PATCH 022/193] Update cisco-8000.ini (#14569) Why I did it Release Notes for Cisco 8808 platform: Thermal sensor driver support Release Notes for Cisco 8101-32FH-O: Support for unwanted Alarm Suppression How I did it Update platform version to 202205.2.2.1 (v0.15) How to verify it --- 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 559b9dfa812c..a6ab6a95f841 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=202205-v0.13 +ref=202205.2.2.1 From 980301a6bca6770704bb816a3f6bf948c3adc188 Mon Sep 17 00:00:00 2001 From: Tejaswini Chadaga <85581939+tjchadaga@users.noreply.github.com> Date: Thu, 13 Apr 2023 14:11:33 -0700 Subject: [PATCH 023/193] [202205] Update Broadcom SAI version to 7.1.42.4 (#14555) To include the following DNX changes: Revert patch and add official SDK/SAI fix for the below CSPs a. CS00012282080 : syncd crashes after a speed change due to "cosq src vsqs gport get" failure b. CS00012281200 : J2C+ : Scope of config.bcm SOC property bcm_stat_interval Fixes for: a. CS00012278343: SONiC J2c+ Macsec: Shutting down LAG members which have macsec cause remaining active LAG members to go down b. CS00012279717: Instance_id printed in SAI syslog messages are truncated to 9 bytes --- platform/broadcom/sai.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platform/broadcom/sai.mk b/platform/broadcom/sai.mk index 4454ec124630..ad318414ac60 100644 --- a/platform/broadcom/sai.mk +++ b/platform/broadcom/sai.mk @@ -1,5 +1,5 @@ LIBSAIBCM_XGS_VERSION = 7.1.36.4 -LIBSAIBCM_DNX_VERSION = 7.1.36.4-2 +LIBSAIBCM_DNX_VERSION = 7.1.42.4 LIBSAIBCM_BRANCH_NAME = REL_7.0_202205 LIBSAIBCM_XGS_URL_PREFIX = "https://sonicstorage.blob.core.windows.net/public/sai/bcmsai/$(LIBSAIBCM_BRANCH_NAME)/$(LIBSAIBCM_XGS_VERSION)" LIBSAIBCM_DNX_URL_PREFIX = "https://sonicstorage.blob.core.windows.net/public/sai/bcmsai/$(LIBSAIBCM_BRANCH_NAME)/$(LIBSAIBCM_DNX_VERSION)" From 32b8764d3bdf1b8a148505df3de6d8feba93a9c6 Mon Sep 17 00:00:00 2001 From: mssonicbld <79238446+mssonicbld@users.noreply.github.com> Date: Sat, 15 Apr 2023 20:36:48 +0800 Subject: [PATCH 024/193] [ci/build]: Upgrade SONiC package versions (#14674) --- files/build/versions/default/versions-docker | 24 +++++++++---------- files/build/versions/default/versions-git | 6 ++--- files/build/versions/default/versions-mirror | 24 +++++++++---------- files/build/versions/default/versions-web | 2 +- .../docker-database/versions-deb-bullseye | 2 +- .../docker-dhcp-relay/versions-deb-bullseye | 2 +- .../docker-fpm-frr/versions-deb-bullseye | 2 +- .../versions-deb-bullseye | 2 +- .../versions-deb-bullseye | 2 +- .../docker-gbsyncd-vs/versions-deb-bullseye | 1 + .../dockers/docker-lldp/versions-deb-bullseye | 2 +- .../docker-macsec/versions-deb-bullseye | 2 +- .../dockers/docker-mux/versions-deb-bullseye | 2 +- .../dockers/docker-nat/versions-deb-buster | 2 +- .../docker-orchagent/versions-deb-bullseye | 2 +- .../versions-deb-bullseye | 2 +- .../versions-deb-bullseye | 2 +- .../dockers/docker-sflow/versions-deb-buster | 2 +- .../dockers/docker-snmp/versions-deb-bullseye | 2 +- .../versions-deb-buster | 2 +- .../docker-sonic-mgmt-framework/versions-py3 | 2 +- .../versions-deb-bullseye | 2 +- .../dockers/docker-sonic-vs/versions-py3 | 2 +- .../versions-deb-bullseye | 4 ++-- .../docker-syncd-brcm/versions-deb-bullseye | 2 +- .../docker-syncd-centec/versions-deb-buster | 1 + .../docker-syncd-mlnx/versions-deb-bullseye | 1 + .../docker-syncd-vs/versions-deb-buster | 1 + .../docker-teamd/versions-deb-bullseye | 2 +- .../versions-deb-bullseye-arm64 | 3 +-- .../versions-deb-bullseye-armhf | 1 - .../dockers/sonic-slave-bullseye/versions-py3 | 2 +- .../sonic-slave-buster/versions-deb-buster | 2 -- .../dockers/sonic-slave-buster/versions-py3 | 2 +- files/build/versions/host-image/versions-py3 | 2 +- 35 files changed, 58 insertions(+), 58 deletions(-) diff --git a/files/build/versions/default/versions-docker b/files/build/versions/default/versions-docker index f92fadfab97f..a5b33cfde3ef 100644 --- a/files/build/versions/default/versions-docker +++ b/files/build/versions/default/versions-docker @@ -1,12 +1,12 @@ -amd64:amd64/debian:bullseye==sha256:d0bf7d85ad1e61ab3520b1d22d1e2a136799defd4e0d1e3f998d3b9045f38551 -amd64:amd64/debian:buster==sha256:ac8ad4307a275784e5fce8c832d1101b0fc8fd876e37f6fb2cb355c33ba456b1 -amd64:debian:bullseye==sha256:7b991788987ad860810df60927e1adbaf8e156520177bd4db82409f81dd3b721 -amd64:debian:buster==sha256:235f2a778fbc0d668c66afa9fd5f1efabab94c1d6588779ea4e221e1496f89da -arm64:arm64v8/debian:bullseye==sha256:c7908b5cd3ce2969645bc08efd3940e1d145da5d935fb084e7fde00949a1ccb9 -arm64:arm64v8/debian:buster==sha256:a5f47fe848328e0744bfa9929bc07049f9f7fae244f6d3db9cfc7fb9d9db7899 -arm64:debian:bullseye==sha256:7b991788987ad860810df60927e1adbaf8e156520177bd4db82409f81dd3b721 -arm64:debian:buster==sha256:235f2a778fbc0d668c66afa9fd5f1efabab94c1d6588779ea4e221e1496f89da -armhf:arm32v7/debian:bullseye==sha256:c0eb6a0cc41c84db8f967a6708c136bf113cf4db37a6a7db0ec73f890ce725c5 -armhf:arm32v7/debian:buster==sha256:5a0917270fe6093c5a45ab4d4036ec167764f188778f3c20e78905219eedda12 -armhf:debian:bullseye==sha256:7b991788987ad860810df60927e1adbaf8e156520177bd4db82409f81dd3b721 -armhf:debian:buster==sha256:235f2a778fbc0d668c66afa9fd5f1efabab94c1d6588779ea4e221e1496f89da \ No newline at end of file +amd64:amd64/debian:bullseye==sha256:4effa16ae79ab36347d55ebb6bb4aad411077b72ad735054e684b3eeba373a35 +amd64:amd64/debian:buster==sha256:2803ab27dfe4f2e23b58d351e80e8d433942b6fb830225e6d034098ed450a169 +amd64:debian:bullseye==sha256:0a78ed641b76252739e28ebbbe8cdbd80dc367fba4502565ca839e5803cfd86e +amd64:debian:buster==sha256:173f0b19d2ac5ee17194dbe9a888a4a617dbf905ee666c9e780afad55eaf1d8c +arm64:arm64v8/debian:bullseye==sha256:c0f6422141bb031238126fbd535c0df24db4252a2d9876216a94082df74c8fda +arm64:arm64v8/debian:buster==sha256:55cd39723a057f730e9c33487fea9fe151bbe86dce51e92a73ccfd12206a1f43 +arm64:debian:bullseye==sha256:0a78ed641b76252739e28ebbbe8cdbd80dc367fba4502565ca839e5803cfd86e +arm64:debian:buster==sha256:173f0b19d2ac5ee17194dbe9a888a4a617dbf905ee666c9e780afad55eaf1d8c +armhf:arm32v7/debian:bullseye==sha256:ab0ce510343d33415fc4eaea0102da2d24cb720b185aaee0b411c48a07abb0de +armhf:arm32v7/debian:buster==sha256:3e45d273ad15d7b648212c8faa5e236f6fdc694af7272b8c4bd25a5d90c27fe1 +armhf:debian:bullseye==sha256:0a78ed641b76252739e28ebbbe8cdbd80dc367fba4502565ca839e5803cfd86e +armhf:debian:buster==sha256:173f0b19d2ac5ee17194dbe9a888a4a617dbf905ee666c9e780afad55eaf1d8c \ No newline at end of file diff --git a/files/build/versions/default/versions-git b/files/build/versions/default/versions-git index 10312b79eae9..0e17eced5343 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==a73a2497375acfdc42486fbffa4ba17d5005fa26 +https://chromium.googlesource.com/chromium/tools/depot_tools.git==97dadd025f541f67af48417cc12ebdc00c1ad29c https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f https://github.com/CESNET/libyang.git==9a4e5b2ce30b9696116d6e654ee55caab5aafed8 https://github.com/daveolson53/audisp-tacplus.git==559c9f22edd4f2dea0ecedffb3ad9502b12a75b6 https://github.com/daveolson53/libnss-tacplus.git==19008ab68d9d504aa58eb34d5f564755a1613b8b https://github.com/dyninc/OpenBFDD.git==e35f43ad8d2b3f084e96a84c392528a90d05a287 -https://github.com/flashrom/flashrom.git==3eaef7528b622955a48611fdc0801ca853665efd -https://github.com/FreeRADIUS/freeradius-server.git==1a70a189ac85eb1e496dc5e9cb1f5852bec08590 +https://github.com/flashrom/flashrom.git==f3c21c6439f8bbd2911f120c55f301982ecd35bc +https://github.com/FreeRADIUS/freeradius-server.git==3af1c0f667ee341f8948d93f60c957a6e2a7f1e1 https://github.com/FreeRADIUS/pam_radius.git==8d373539bb9f13b0abfe8bcae0095a930a00fad0 https://github.com/jeroennijhof/pam_tacplus.git==4284d9016e64def2bb81d5f50f96dc3b59bfdc39 https://github.com/jpirko/libteam.git==61e27812c1074a865d7e1a778c0ce442837c28d7 diff --git a/files/build/versions/default/versions-mirror b/files/build/versions/default/versions-mirror index d47a7eddbb38..5077d9860ce7 100644 --- a/files/build/versions/default/versions-mirror +++ b/files/build/versions/default/versions-mirror @@ -1,15 +1,15 @@ deb.nodesource.com_node%5f14.x_dists_bullseye==2023-02-17T00:35:28Z deb.nodesource.com_node%5f14.x_dists_buster==2023-02-17T00:35:28Z -debian==20230411T000410Z -debian-security==20230411T000232Z -download.docker.com_linux_debian_dists_bullseye==2023-04-06T18:06:41Z -download.docker.com_linux_debian_dists_buster==2023-04-04T23:38:54Z +debian==20230415T000234Z +debian-security==20230415T000238Z +download.docker.com_linux_debian_dists_bullseye==2023-04-14T12:24:31Z +download.docker.com_linux_debian_dists_buster==2023-04-14T12:24:31Z packages.microsoft.com_repos_sonic-dev_dists_jessie==2022-10-31T19:34:29Z -packages.trafficmanager.net_snapshot_debian-security_20230411T000232Z_dists_bullseye-security==2023-04-10T18:02:36Z -packages.trafficmanager.net_snapshot_debian-security_20230411T000232Z_dists_buster_updates==2023-04-10T18:02:36Z -packages.trafficmanager.net_snapshot_debian_20230411T000410Z_dists_bullseye==2022-12-17T10:14:37Z -packages.trafficmanager.net_snapshot_debian_20230411T000410Z_dists_bullseye-backports==2023-04-10T20:09:25Z -packages.trafficmanager.net_snapshot_debian_20230411T000410Z_dists_bullseye-updates==2023-04-10T20:09:25Z -packages.trafficmanager.net_snapshot_debian_20230411T000410Z_dists_buster==2022-09-10T11:30:54Z -packages.trafficmanager.net_snapshot_debian_20230411T000410Z_dists_buster-backports==2023-04-10T20:09:25Z -packages.trafficmanager.net_snapshot_debian_20230411T000410Z_dists_buster-updates==2023-04-10T20:09:25Z \ No newline at end of file +packages.trafficmanager.net_snapshot_debian-security_20230415T000238Z_dists_bullseye-security==2023-04-14T16:32:44Z +packages.trafficmanager.net_snapshot_debian-security_20230415T000238Z_dists_buster_updates==2023-04-14T16:32:44Z +packages.trafficmanager.net_snapshot_debian_20230415T000234Z_dists_bullseye==2022-12-17T10:14:37Z +packages.trafficmanager.net_snapshot_debian_20230415T000234Z_dists_bullseye-backports==2023-04-14T20:11:23Z +packages.trafficmanager.net_snapshot_debian_20230415T000234Z_dists_bullseye-updates==2023-04-14T20:11:24Z +packages.trafficmanager.net_snapshot_debian_20230415T000234Z_dists_buster==2022-09-10T11:30:54Z +packages.trafficmanager.net_snapshot_debian_20230415T000234Z_dists_buster-backports==2023-04-14T20:11:23Z +packages.trafficmanager.net_snapshot_debian_20230415T000234Z_dists_buster-updates==2023-04-14T20:11:23Z \ No newline at end of file diff --git a/files/build/versions/default/versions-web b/files/build/versions/default/versions-web index 4fec18071c29..d6aed35e8429 100644 --- a/files/build/versions/default/versions-web +++ b/files/build/versions/default/versions-web @@ -147,9 +147,9 @@ https://sonicstorage.blob.core.windows.net/public/fips/bullseye/0.7/arm64/python https://sonicstorage.blob.core.windows.net/public/fips/bullseye/0.7/arm64/python3.9_3.9.2-1+fips_arm64.deb==4d6307dabcd3060235d6188cfa0346b8 https://sonicstorage.blob.core.windows.net/public/fips/bullseye/0.7/arm64/symcrypt-openssl_0.7_arm64.deb==f25f73823a0f22805b8e0be43bef190f https://sonicstorage.blob.core.windows.net/public/sai/bcmpai/REL_3.8/3.8/libsaibroncos_3.8_amd64.deb==f7c3f0ed8c97c2572e3c2e59faaae4a8 -https://sonicstorage.blob.core.windows.net/public/sai/bcmsai/REL_7.0_202205/7.1.36.4-2/libsaibcm_dnx_7.1.36.4-2_amd64.deb==d2b24475e7f357b533878a6b06e02140 https://sonicstorage.blob.core.windows.net/public/sai/bcmsai/REL_7.0_202205/7.1.36.4/libsaibcm-dev_7.1.36.4_amd64.deb==9bc69f9e35c2ff72e681af4d0b7d2606 https://sonicstorage.blob.core.windows.net/public/sai/bcmsai/REL_7.0_202205/7.1.36.4/libsaibcm_7.1.36.4_amd64.deb==cb86b76aa2fa44fcfc37a64c1b93f2ad +https://sonicstorage.blob.core.windows.net/public/sai/bcmsai/REL_7.0_202205/7.1.42.4/libsaibcm_dnx_7.1.42.4_amd64.deb==bd8126337938bfd96befbb72838f8d8f 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-database/versions-deb-bullseye b/files/build/versions/dockers/docker-database/versions-deb-bullseye index 12f2e5eb11e6..2e7379318da8 100644 --- a/files/build/versions/dockers/docker-database/versions-deb-bullseye +++ b/files/build/versions/dockers/docker-database/versions-deb-bullseye @@ -16,7 +16,7 @@ libipt2==2.0.3-1 libmpfr6==4.1.0-3 libsource-highlight-common==3.1.9-3 libsource-highlight4v5==3.1.9-3+b1 -libswsscommon-dbg==1.0.0 +libswsscommon-dbgsym==1.0.0 libunwind8==1.3.2-2 openssh-client==1:8.4p1-5+deb11u1 redis-server==5:6.0.16-1+deb11u2 diff --git a/files/build/versions/dockers/docker-dhcp-relay/versions-deb-bullseye b/files/build/versions/dockers/docker-dhcp-relay/versions-deb-bullseye index f054c99d6ae1..99fb47ac111d 100644 --- a/files/build/versions/dockers/docker-dhcp-relay/versions-deb-bullseye +++ b/files/build/versions/dockers/docker-dhcp-relay/versions-deb-bullseye @@ -25,7 +25,7 @@ libisccfg-export163==1:9.11.19+dfsg-2.1 libmpfr6==4.1.0-3 libsource-highlight-common==3.1.9-3 libsource-highlight4v5==3.1.9-3+b1 -libswsscommon-dbg==1.0.0 +libswsscommon-dbgsym==1.0.0 libunwind8==1.3.2-2 lsof==4.93.2+dfsg-1.1 openssh-client==1:8.4p1-5+deb11u1 diff --git a/files/build/versions/dockers/docker-fpm-frr/versions-deb-bullseye b/files/build/versions/dockers/docker-fpm-frr/versions-deb-bullseye index 06e838eea07c..56f4f3045831 100644 --- a/files/build/versions/dockers/docker-fpm-frr/versions-deb-bullseye +++ b/files/build/versions/dockers/docker-fpm-frr/versions-deb-bullseye @@ -29,7 +29,7 @@ libsnmp-base==5.9+dfsg-4+deb11u1 libsnmp40==5.9+dfsg-4+deb11u1 libsource-highlight-common==3.1.9-3 libsource-highlight4v5==3.1.9-3+b1 -libswsscommon-dbg==1.0.0 +libswsscommon-dbgsym==1.0.0 libunwind8==1.3.2-2 libyang2==2.0.112-6 libyang2-dbgsym==2.0.112-6 diff --git a/files/build/versions/dockers/docker-gbsyncd-broncos/versions-deb-bullseye b/files/build/versions/dockers/docker-gbsyncd-broncos/versions-deb-bullseye index cab46aba3968..11871bc77364 100644 --- a/files/build/versions/dockers/docker-gbsyncd-broncos/versions-deb-bullseye +++ b/files/build/versions/dockers/docker-gbsyncd-broncos/versions-deb-bullseye @@ -26,7 +26,7 @@ libsaimetadata==1.0.0 libsairedis==1.0.0 libsource-highlight-common==3.1.9-3 libsource-highlight4v5==3.1.9-3+b1 -libswsscommon-dbg==1.0.0 +libswsscommon-dbgsym==1.0.0 libtirpc-dev==1.3.1-1+deb11u1 libunwind8==1.3.2-2 linux-libc-dev==5.10.162-1 diff --git a/files/build/versions/dockers/docker-gbsyncd-credo/versions-deb-bullseye b/files/build/versions/dockers/docker-gbsyncd-credo/versions-deb-bullseye index 47e1f38ad7a1..50bbb06d9dc4 100644 --- a/files/build/versions/dockers/docker-gbsyncd-credo/versions-deb-bullseye +++ b/files/build/versions/dockers/docker-gbsyncd-credo/versions-deb-bullseye @@ -20,7 +20,7 @@ libsaimetadata==1.0.0 libsairedis==1.0.0 libsource-highlight-common==3.1.9-3 libsource-highlight4v5==3.1.9-3+b1 -libswsscommon-dbg==1.0.0 +libswsscommon-dbgsym==1.0.0 libunwind8==1.3.2-2 openssh-client==1:8.4p1-5+deb11u1 sshpass==1.09-1+b1 diff --git a/files/build/versions/dockers/docker-gbsyncd-vs/versions-deb-bullseye b/files/build/versions/dockers/docker-gbsyncd-vs/versions-deb-bullseye index 27c76f12ca04..597f07e60f6d 100644 --- a/files/build/versions/dockers/docker-gbsyncd-vs/versions-deb-bullseye +++ b/files/build/versions/dockers/docker-gbsyncd-vs/versions-deb-bullseye @@ -23,6 +23,7 @@ libsaivs-dbg==1.0.0 libsource-highlight-common==3.1.9-3 libsource-highlight4v5==3.1.9-3+b1 libswsscommon-dbg==1.0.0 +libswsscommon-dbgsym==1.0.0 libunwind8==1.3.2-2 openssh-client==1:8.4p1-5+deb11u1 sshpass==1.09-1+b1 diff --git a/files/build/versions/dockers/docker-lldp/versions-deb-bullseye b/files/build/versions/dockers/docker-lldp/versions-deb-bullseye index 3953148d0bf6..0f418b558861 100644 --- a/files/build/versions/dockers/docker-lldp/versions-deb-bullseye +++ b/files/build/versions/dockers/docker-lldp/versions-deb-bullseye @@ -22,7 +22,7 @@ libsnmp-base==5.9+dfsg-4+deb11u1 libsnmp40==5.9+dfsg-4+deb11u1 libsource-highlight-common==3.1.9-3 libsource-highlight4v5==3.1.9-3+b1 -libswsscommon-dbg==1.0.0 +libswsscommon-dbgsym==1.0.0 libunwind8==1.3.2-2 libxml2==2.9.10+dfsg-6.7+deb11u3 lldpd==1.0.4-1 diff --git a/files/build/versions/dockers/docker-macsec/versions-deb-bullseye b/files/build/versions/dockers/docker-macsec/versions-deb-bullseye index 793dde861317..433e9d5d0311 100644 --- a/files/build/versions/dockers/docker-macsec/versions-deb-bullseye +++ b/files/build/versions/dockers/docker-macsec/versions-deb-bullseye @@ -19,7 +19,7 @@ libsaimetadata==1.0.0 libsairedis==1.0.0 libsource-highlight-common==3.1.9-3 libsource-highlight4v5==3.1.9-3+b1 -libswsscommon-dbg==1.0.0 +libswsscommon-dbgsym==1.0.0 libteam5==1.30-1 libteamdctl0==1.30-1 libunwind8==1.3.2-2 diff --git a/files/build/versions/dockers/docker-mux/versions-deb-bullseye b/files/build/versions/dockers/docker-mux/versions-deb-bullseye index 985269cb7de4..d2fb85eba4f3 100644 --- a/files/build/versions/dockers/docker-mux/versions-deb-bullseye +++ b/files/build/versions/dockers/docker-mux/versions-deb-bullseye @@ -20,7 +20,7 @@ libipt2==2.0.3-1 libmpfr6==4.1.0-3 libsource-highlight-common==3.1.9-3 libsource-highlight4v5==3.1.9-3+b1 -libswsscommon-dbg==1.0.0 +libswsscommon-dbgsym==1.0.0 libunwind8==1.3.2-2 openssh-client==1:8.4p1-5+deb11u1 sonic-linkmgrd==1.0.0-1 diff --git a/files/build/versions/dockers/docker-nat/versions-deb-buster b/files/build/versions/dockers/docker-nat/versions-deb-buster index a83e5172d565..8273d568ebcb 100644 --- a/files/build/versions/dockers/docker-nat/versions-deb-buster +++ b/files/build/versions/dockers/docker-nat/versions-deb-buster @@ -18,7 +18,7 @@ libnetfilter-conntrack3==1.0.7-1 libnfnetlink0==1.0.1-3+b1 libnftnl11==1.1.2-2 libpopt0==1.16-12 -libswsscommon-dbg==1.0.0 +libswsscommon-dbgsym==1.0.0 libunwind8==1.2.1-10~deb10u1 openssh-client==1:7.9p1-10+deb10u2 sshpass==1.06-1 diff --git a/files/build/versions/dockers/docker-orchagent/versions-deb-bullseye b/files/build/versions/dockers/docker-orchagent/versions-deb-bullseye index af83ba6451e0..f19b8913e5e1 100644 --- a/files/build/versions/dockers/docker-orchagent/versions-deb-bullseye +++ b/files/build/versions/dockers/docker-orchagent/versions-deb-bullseye @@ -61,7 +61,7 @@ libsairedis-dbg==1.0.0 libsource-highlight-common==3.1.9-3 libsource-highlight4v5==3.1.9-3+b1 libstdc++-10-dev==10.2.1-6 -libswsscommon-dbg==1.0.0 +libswsscommon-dbgsym==1.0.0 libtirpc-dev==1.3.1-1+deb11u1 libtsan0==10.2.1-6 libubsan1==10.2.1-6 diff --git a/files/build/versions/dockers/docker-platform-monitor/versions-deb-bullseye b/files/build/versions/dockers/docker-platform-monitor/versions-deb-bullseye index 7234daf33683..9b1d7e9e78bc 100644 --- a/files/build/versions/dockers/docker-platform-monitor/versions-deb-bullseye +++ b/files/build/versions/dockers/docker-platform-monitor/versions-deb-bullseye @@ -84,7 +84,7 @@ libsensors5-dbgsym==1:3.6.0-7 libsource-highlight-common==3.1.9-3 libsource-highlight4v5==3.1.9-3+b1 libstdc++-10-dev==10.2.1-6 -libswsscommon-dbg==1.0.0 +libswsscommon-dbgsym==1.0.0 libthai-data==0.1.28-3 libthai0==0.1.28-3 libtirpc-dev==1.3.1-1+deb11u1 diff --git a/files/build/versions/dockers/docker-router-advertiser/versions-deb-bullseye b/files/build/versions/dockers/docker-router-advertiser/versions-deb-bullseye index bd766eb787eb..1740ef17a275 100644 --- a/files/build/versions/dockers/docker-router-advertiser/versions-deb-bullseye +++ b/files/build/versions/dockers/docker-router-advertiser/versions-deb-bullseye @@ -16,7 +16,7 @@ libipt2==2.0.3-1 libmpfr6==4.1.0-3 libsource-highlight-common==3.1.9-3 libsource-highlight4v5==3.1.9-3+b1 -libswsscommon-dbg==1.0.0 +libswsscommon-dbgsym==1.0.0 libunwind8==1.3.2-2 openssh-client==1:8.4p1-5+deb11u1 radvd==1:2.18-3 diff --git a/files/build/versions/dockers/docker-sflow/versions-deb-buster b/files/build/versions/dockers/docker-sflow/versions-deb-buster index e76e7260e0c6..9b35def629ea 100644 --- a/files/build/versions/dockers/docker-sflow/versions-deb-buster +++ b/files/build/versions/dockers/docker-sflow/versions-deb-buster @@ -11,7 +11,7 @@ libgpm2==1.20.7-5 libhiredis0.14-dbgsym==0.14.0-3~bpo9+1 libipt2==2.0-2 libpopt0==1.16-12 -libswsscommon-dbg==1.0.0 +libswsscommon-dbgsym==1.0.0 libunwind8==1.2.1-10~deb10u1 openssh-client==1:7.9p1-10+deb10u2 psample==1.1-1 diff --git a/files/build/versions/dockers/docker-snmp/versions-deb-bullseye b/files/build/versions/dockers/docker-snmp/versions-deb-bullseye index de81fd609331..44b375fa23c9 100644 --- a/files/build/versions/dockers/docker-snmp/versions-deb-bullseye +++ b/files/build/versions/dockers/docker-snmp/versions-deb-bullseye @@ -54,7 +54,7 @@ libsnmp40==5.9+dfsg-4+deb11u1 libsnmp40-dbgsym==5.9+dfsg-4+deb11u1 libsource-highlight-common==3.1.9-3 libsource-highlight4v5==3.1.9-3+b1 -libswsscommon-dbg==1.0.0 +libswsscommon-dbgsym==1.0.0 libtirpc-dev==1.3.1-1+deb11u1 libtsan0==10.2.1-6 libubsan1==10.2.1-6 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 6960f6d6626b..ef18d1cefaac 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 @@ -41,7 +41,7 @@ libpython3-dev==3.7.3-1 libpython3.7-dev==3.7.3-2+deb10u4 libquadmath0==8.3.0-6 libstdc++-8-dev==8.3.0-6 -libswsscommon-dbg==1.0.0 +libswsscommon-dbgsym==1.0.0 libtsan0==8.3.0-6 libubsan1==8.3.0-6 libunwind8==1.2.1-10~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 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/docker-sonic-telemetry/versions-deb-bullseye b/files/build/versions/dockers/docker-sonic-telemetry/versions-deb-bullseye index 68e2f212c5c5..eddeb70ec8af 100644 --- a/files/build/versions/dockers/docker-sonic-telemetry/versions-deb-bullseye +++ b/files/build/versions/dockers/docker-sonic-telemetry/versions-deb-bullseye @@ -16,7 +16,7 @@ libipt2==2.0.3-1 libmpfr6==4.1.0-3 libsource-highlight-common==3.1.9-3 libsource-highlight4v5==3.1.9-3+b1 -libswsscommon-dbg==1.0.0 +libswsscommon-dbgsym==1.0.0 libunwind8==1.3.2-2 openssh-client==1:8.4p1-5+deb11u1 sonic-mgmt-common==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 96a93b741d9c..8b67de44c697 100644 --- a/files/build/versions/dockers/docker-sonic-vs/versions-py3 +++ b/files/build/versions/dockers/docker-sonic-vs/versions-py3 @@ -15,7 +15,7 @@ jsonpointer==2.3 lazy-object-proxy==1.9.0 m2crypto==0.38.0 netifaces==0.10.9 -packaging==23.0 +packaging==23.1 pexpect==4.8.0 prefixed==0.7.0 prettyprinter==0.18.0 diff --git a/files/build/versions/dockers/docker-syncd-brcm-dnx/versions-deb-bullseye b/files/build/versions/dockers/docker-syncd-brcm-dnx/versions-deb-bullseye index 6296a2d79153..6616b6ad23f0 100644 --- a/files/build/versions/dockers/docker-syncd-brcm-dnx/versions-deb-bullseye +++ b/files/build/versions/dockers/docker-syncd-brcm-dnx/versions-deb-bullseye @@ -17,14 +17,14 @@ libicu67==67.1-7 libipt2==2.0.3-1 libkmod2==28-1 libmpfr6==4.1.0-3 -libsaibcm==7.1.36.4-2 +libsaibcm==7.1.42.4 libsaimetadata==1.0.0 libsaimetadata-dbg==1.0.0 libsairedis==1.0.0 libsairedis-dbg==1.0.0 libsource-highlight-common==3.1.9-3 libsource-highlight4v5==3.1.9-3+b1 -libswsscommon-dbg==1.0.0 +libswsscommon-dbgsym==1.0.0 libunwind8==1.3.2-2 openssh-client==1:8.4p1-5+deb11u1 sshpass==1.09-1+b1 diff --git a/files/build/versions/dockers/docker-syncd-brcm/versions-deb-bullseye b/files/build/versions/dockers/docker-syncd-brcm/versions-deb-bullseye index dd0278cf5d06..a9d15503f6ac 100644 --- a/files/build/versions/dockers/docker-syncd-brcm/versions-deb-bullseye +++ b/files/build/versions/dockers/docker-syncd-brcm/versions-deb-bullseye @@ -24,7 +24,7 @@ libsairedis==1.0.0 libsairedis-dbg==1.0.0 libsource-highlight-common==3.1.9-3 libsource-highlight4v5==3.1.9-3+b1 -libswsscommon-dbg==1.0.0 +libswsscommon-dbgsym==1.0.0 libunwind8==1.3.2-2 libyaml-0-2==0.2.2-1 openssh-client==1:8.4p1-5+deb11u1 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 570998ec7364..697fbed945ba 100644 --- a/files/build/versions/dockers/docker-syncd-centec/versions-deb-buster +++ b/files/build/versions/dockers/docker-syncd-centec/versions-deb-buster @@ -15,6 +15,7 @@ libsai==1.9.1-0 libsaimetadata==1.0.0 libsairedis==1.0.0 libswsscommon-dbg==1.0.0 +libswsscommon-dbgsym==1.0.0 libunwind8==1.2.1-10~deb10u1 openssh-client==1:7.9p1-10+deb10u2 sshpass==1.06-1 diff --git a/files/build/versions/dockers/docker-syncd-mlnx/versions-deb-bullseye b/files/build/versions/dockers/docker-syncd-mlnx/versions-deb-bullseye index dd5aca15d25c..32141df70ac0 100644 --- a/files/build/versions/dockers/docker-syncd-mlnx/versions-deb-bullseye +++ b/files/build/versions/dockers/docker-syncd-mlnx/versions-deb-bullseye @@ -40,6 +40,7 @@ libsairedis-dbg==1.0.0 libsource-highlight-common==3.1.9-3 libsource-highlight4v5==3.1.9-3+b1 libswsscommon-dbg==1.0.0 +libswsscommon-dbgsym==1.0.0 libtirpc-dev==1.3.1-1+deb11u1 libunwind8==1.3.2-2 libxml2==2.9.10+dfsg-6.7+deb11u3 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 9a5ad7eb8ed3..69991139fbab 100644 --- a/files/build/versions/dockers/docker-syncd-vs/versions-deb-buster +++ b/files/build/versions/dockers/docker-syncd-vs/versions-deb-buster @@ -18,6 +18,7 @@ libsairedis-dbg==1.0.0 libsaivs==1.0.0 libsaivs-dbg==1.0.0 libswsscommon-dbg==1.0.0 +libswsscommon-dbgsym==1.0.0 libunwind8==1.2.1-10~deb10u1 openssh-client==1:7.9p1-10+deb10u2 sshpass==1.06-1 diff --git a/files/build/versions/dockers/docker-teamd/versions-deb-bullseye b/files/build/versions/dockers/docker-teamd/versions-deb-bullseye index 02f1f5a43a3d..6d8a7109877c 100644 --- a/files/build/versions/dockers/docker-teamd/versions-deb-bullseye +++ b/files/build/versions/dockers/docker-teamd/versions-deb-bullseye @@ -16,7 +16,7 @@ libipt2==2.0.3-1 libmpfr6==4.1.0-3 libsource-highlight-common==3.1.9-3 libsource-highlight4v5==3.1.9-3+b1 -libswsscommon-dbg==1.0.0 +libswsscommon-dbgsym==1.0.0 libteam-utils==1.30-1 libteam-utils-dbgsym==1.30-1 libteamdctl0-dbgsym==1.30-1 diff --git a/files/build/versions/dockers/sonic-slave-bullseye/versions-deb-bullseye-arm64 b/files/build/versions/dockers/sonic-slave-bullseye/versions-deb-bullseye-arm64 index 16733d30c727..2b165604932b 100644 --- a/files/build/versions/dockers/sonic-slave-bullseye/versions-deb-bullseye-arm64 +++ b/files/build/versions/dockers/sonic-slave-bullseye/versions-deb-bullseye-arm64 @@ -19,5 +19,4 @@ libubsan1-armhf-cross==10.2.1-6cross1 libxslt1-dev==1.1.34-4+deb11u1 linux-headers-5.10.0-21-arm64==5.10.162-1 linux-headers-arm64==5.10.162-1 -nodejs==14.21.3-deb-1nodesource1 -tzdata==2021a-1+deb11u9 \ 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-bullseye/versions-deb-bullseye-armhf b/files/build/versions/dockers/sonic-slave-bullseye/versions-deb-bullseye-armhf index 2c986b789a6f..b2ce3312f7ed 100644 --- a/files/build/versions/dockers/sonic-slave-bullseye/versions-deb-bullseye-armhf +++ b/files/build/versions/dockers/sonic-slave-bullseye/versions-deb-bullseye-armhf @@ -51,5 +51,4 @@ sassc==3.6.1+20201027-1 texlive-extra-utils==2020.20210202-3 texlive-font-utils==2020.20210202-3 texlive-luatex==2020.20210202-3 -tzdata==2021a-1+deb11u9 yui-compressor==2.4.8-2.1 \ No newline at end of file diff --git a/files/build/versions/dockers/sonic-slave-bullseye/versions-py3 b/files/build/versions/dockers/sonic-slave-bullseye/versions-py3 index f081870935cc..101720dba57a 100644 --- a/files/build/versions/dockers/sonic-slave-bullseye/versions-py3 +++ b/files/build/versions/dockers/sonic-slave-bullseye/versions-py3 @@ -67,7 +67,7 @@ pyangbind==0.8.1 pyasn1==0.4.8 pyasn1-modules==0.2.1 pycurl==7.43.0.6 -pyfakefs==5.2.0 +pyfakefs==5.2.2 pygments==2.7.1 pygobject==3.38.0 pyhamcrest==1.9.0 diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster index 936a0fbb4326..e21b7d1e1d79 100644 --- a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster +++ b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster @@ -1114,7 +1114,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 @@ -1156,7 +1155,6 @@ libtypes-serialiser-perl==1.0-1 libubsan1==8.3.0-6 libuchardet0==0.0.6-3 libudev-dev==241-7~deb10u9 -libudev1==241-7~deb10u9 libunbound8==1.9.0-2+deb10u3 libunicode-utf8-perl==0.62-1 libunwind-dev==1.2.1-10~deb10u1 diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-py3 b/files/build/versions/dockers/sonic-slave-buster/versions-py3 index ae6057d6bd4a..c9da0f629b47 100644 --- a/files/build/versions/dockers/sonic-slave-buster/versions-py3 +++ b/files/build/versions/dockers/sonic-slave-buster/versions-py3 @@ -48,7 +48,7 @@ pyang==2.4.0 pyangbind==0.8.1 pycrypto==2.6.1 pycurl==7.43.0.2 -pyfakefs==5.2.0 +pyfakefs==5.2.2 pygments==2.3.1 pygobject==3.30.4 pympler==0.8 diff --git a/files/build/versions/host-image/versions-py3 b/files/build/versions/host-image/versions-py3 index 14eed6ecf99f..a34214e04a95 100644 --- a/files/build/versions/host-image/versions-py3 +++ b/files/build/versions/host-image/versions-py3 @@ -9,7 +9,7 @@ charset-normalizer==3.1.0 click==7.0 click-log==0.4.0 colorful==0.5.5 -cryptography==40.0.1 +cryptography==40.0.2 dbus-python==1.2.16 docker==5.0.3 docker-image-py==0.1.12 From c919e758dbb6b5dfa4fce696b5111fd26795b695 Mon Sep 17 00:00:00 2001 From: mssonicbld <79238446+mssonicbld@users.noreply.github.com> Date: Sun, 16 Apr 2023 20:54:23 +0800 Subject: [PATCH 025/193] [ci/build]: Upgrade SONiC package versions (#14681) --- files/build/versions/default/versions-git | 4 ++-- files/build/versions/default/versions-mirror | 20 +++++++++---------- .../docker-sonic-mgmt-framework/versions-py3 | 2 +- .../dockers/sonic-slave-buster/versions-py3 | 2 +- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/files/build/versions/default/versions-git b/files/build/versions/default/versions-git index 0e17eced5343..46dd7b86a27d 100644 --- a/files/build/versions/default/versions-git +++ b/files/build/versions/default/versions-git @@ -5,7 +5,7 @@ https://github.com/daveolson53/audisp-tacplus.git==559c9f22edd4f2dea0ecedffb3ad9 https://github.com/daveolson53/libnss-tacplus.git==19008ab68d9d504aa58eb34d5f564755a1613b8b https://github.com/dyninc/OpenBFDD.git==e35f43ad8d2b3f084e96a84c392528a90d05a287 https://github.com/flashrom/flashrom.git==f3c21c6439f8bbd2911f120c55f301982ecd35bc -https://github.com/FreeRADIUS/freeradius-server.git==3af1c0f667ee341f8948d93f60c957a6e2a7f1e1 +https://github.com/FreeRADIUS/freeradius-server.git==a285a9335288917e775957bef5a2c4a629f59889 https://github.com/FreeRADIUS/pam_radius.git==8d373539bb9f13b0abfe8bcae0095a930a00fad0 https://github.com/jeroennijhof/pam_tacplus.git==4284d9016e64def2bb81d5f50f96dc3b59bfdc39 https://github.com/jpirko/libteam.git==61e27812c1074a865d7e1a778c0ce442837c28d7 @@ -21,4 +21,4 @@ https://salsa.debian.org/debian/libteam.git==48142125234a665ad5367b724af36a58fb4 https://salsa.debian.org/kernel-team/ethtool/==68409b09a969b49a07fbf3930409f155b953434b https://salsa.debian.org/kernel-team/initramfs-tools.git==193dfbb7929e518976f89f6c8dd9201982e56f80 https://salsa.debian.org/sk-guest/monit.git==c9da7ebb1f35dfba17b50b5969a6e75e29cbec0d -https://salsa.debian.org/ssh-team/openssh.git==49836a13815efec2773fbd76d34189424a26fb20 \ 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-mirror b/files/build/versions/default/versions-mirror index 5077d9860ce7..dfed14735813 100644 --- a/files/build/versions/default/versions-mirror +++ b/files/build/versions/default/versions-mirror @@ -1,15 +1,15 @@ deb.nodesource.com_node%5f14.x_dists_bullseye==2023-02-17T00:35:28Z deb.nodesource.com_node%5f14.x_dists_buster==2023-02-17T00:35:28Z -debian==20230415T000234Z -debian-security==20230415T000238Z +debian==20230416T000236Z +debian-security==20230416T000621Z download.docker.com_linux_debian_dists_bullseye==2023-04-14T12:24:31Z download.docker.com_linux_debian_dists_buster==2023-04-14T12:24:31Z packages.microsoft.com_repos_sonic-dev_dists_jessie==2022-10-31T19:34:29Z -packages.trafficmanager.net_snapshot_debian-security_20230415T000238Z_dists_bullseye-security==2023-04-14T16:32:44Z -packages.trafficmanager.net_snapshot_debian-security_20230415T000238Z_dists_buster_updates==2023-04-14T16:32:44Z -packages.trafficmanager.net_snapshot_debian_20230415T000234Z_dists_bullseye==2022-12-17T10:14:37Z -packages.trafficmanager.net_snapshot_debian_20230415T000234Z_dists_bullseye-backports==2023-04-14T20:11:23Z -packages.trafficmanager.net_snapshot_debian_20230415T000234Z_dists_bullseye-updates==2023-04-14T20:11:24Z -packages.trafficmanager.net_snapshot_debian_20230415T000234Z_dists_buster==2022-09-10T11:30:54Z -packages.trafficmanager.net_snapshot_debian_20230415T000234Z_dists_buster-backports==2023-04-14T20:11:23Z -packages.trafficmanager.net_snapshot_debian_20230415T000234Z_dists_buster-updates==2023-04-14T20:11:23Z \ No newline at end of file +packages.trafficmanager.net_snapshot_debian-security_20230416T000621Z_dists_bullseye-security==2023-04-14T16:32:44Z +packages.trafficmanager.net_snapshot_debian-security_20230416T000621Z_dists_buster_updates==2023-04-14T16:32:44Z +packages.trafficmanager.net_snapshot_debian_20230416T000236Z_dists_bullseye==2022-12-17T10:14:37Z +packages.trafficmanager.net_snapshot_debian_20230416T000236Z_dists_bullseye-backports==2023-04-15T20:12:30Z +packages.trafficmanager.net_snapshot_debian_20230416T000236Z_dists_bullseye-updates==2023-04-15T20:12:30Z +packages.trafficmanager.net_snapshot_debian_20230416T000236Z_dists_buster==2022-09-10T11:30:54Z +packages.trafficmanager.net_snapshot_debian_20230416T000236Z_dists_buster-backports==2023-04-15T20:12:30Z +packages.trafficmanager.net_snapshot_debian_20230416T000236Z_dists_buster-updates==2023-04-15T20:12:30Z \ 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 diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-py3 b/files/build/versions/dockers/sonic-slave-buster/versions-py3 index c9da0f629b47..8e653dd7ec8b 100644 --- a/files/build/versions/dockers/sonic-slave-buster/versions-py3 +++ b/files/build/versions/dockers/sonic-slave-buster/versions-py3 @@ -20,7 +20,7 @@ gcovr==4.1 gpg==1.12.0 idna==2.6 imagesize==1.0.0 -importlib-metadata==6.3.0 +importlib-metadata==6.4.1 jinja2==3.0.3 keyring==17.1.1 keyrings.alt==3.1.1 From f6f060f49dc0a3d1f1450c92c711cfcc96c2a4d0 Mon Sep 17 00:00:00 2001 From: Pavan-Nokia <120486223+Pavan-Nokia@users.noreply.github.com> Date: Mon, 17 Apr 2023 20:26:15 -0400 Subject: [PATCH 026/193] [armhf][Nokia-7215]Add SFP refactor support for Nokia-7215 platform (#14551) Why I did it Add support for SFP refactor on Nokia-7215 Marvell armhf platform. Platform: armhf-nokia_ixs7215_52x-r0 HwSKU: Nokia-7215 ASIC: marvell Port Config: 48x1G + 4x10G (SFP+) How I did it Modify sfp.py to support SFP refactor optoe driver and platform.json to facilitate proper OC test completion. How to verify it Build armhf target for Nokia-7215 and verify proper Xcvrd and SFP refactor operation. --- .../armhf-nokia_ixs7215_52x-r0/platform.json | 8 +- .../7215/sonic_platform/sfp.py | 959 ++---------------- 2 files changed, 95 insertions(+), 872 deletions(-) diff --git a/device/nokia/armhf-nokia_ixs7215_52x-r0/platform.json b/device/nokia/armhf-nokia_ixs7215_52x-r0/platform.json index 4f4585b1e4de..2e4cae1219e3 100644 --- a/device/nokia/armhf-nokia_ixs7215_52x-r0/platform.json +++ b/device/nokia/armhf-nokia_ixs7215_52x-r0/platform.json @@ -267,16 +267,16 @@ "name": "Ethernet47" }, { - "name": "Ethernet48" + "name": "SFP48" }, { - "name": "Ethernet49" + "name": "SFP49" }, { - "name": "Ethernet50" + "name": "SFP50" }, { - "name": "Ethernet51" + "name": "SFP51" } ] }, 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 846bd7131685..e05908386d39 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 @@ -1,24 +1,21 @@ -############################################################################# -# Nokia +# Name: sfp.py, version: 1.0 +# +# Description: Module contains the definitions of SFP related APIs +# for Nokia IXR 7250 platform. +# +# Copyright (c) 2023, Nokia +# All rights reserved. # -############################################################################# - -import os -import sys 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.sfputilhelper import SfpUtilHelper - from sonic_py_common import logger + from sonic_platform_base.sonic_xcvr.sfp_optoe_base import SfpOptoeBase + from sonic_py_common.logger import Logger + from sonic_py_common import device_info + except ImportError as e: raise ImportError(str(e) + "- required module not found") -if sys.version_info[0] < 3: - import commands as cmd -else: - import subprocess as cmd +import subprocess as cmd smbus_present = 1 @@ -27,77 +24,6 @@ except ImportError as e: smbus_present = 0 - -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_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_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_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 - -SFP_DOM_BULK_DATA_START = 96 -SFP_DOM_BULK_DATA_SIZE = 10 - -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 - -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') - COPPER_TYPE = "COPPER" SFP_TYPE = "SFP" @@ -105,15 +31,13 @@ SFP_PORT_START = 49 SFP_PORT_END = 52 -SYSLOG_IDENTIFIER = "xcvrd" -sonic_logger = logger.Logger(SYSLOG_IDENTIFIER) +logger = Logger() - -class Sfp(SfpBase): - """Platform-specific Sfp class""" +class Sfp(SfpOptoeBase): """ - Nokia platform-specific Sfp class + Nokia IXR-7215 Platform-specific Sfp refactor class """ + instances = [] # Paths PLATFORM_ROOT_PATH = "/usr/share/sonic/device" @@ -125,669 +49,137 @@ class Sfp(SfpBase): port_to_i2c_mapping = 0 + # def __init__(self, index, sfp_type, stub): def __init__(self, index, sfp_type, eeprom_path, port_i2c_map): - SfpBase.__init__(self) + SfpOptoeBase.__init__(self) self.index = index self.port_num = index self.sfp_type = sfp_type self.eeprom_path = eeprom_path self.port_to_i2c_mapping = port_i2c_map + self.name = sfp_type + str(index-1) self.port_name = sfp_type + str(index) self.port_to_eeprom_mapping = {} self.port_to_eeprom_mapping[index] = eeprom_path - self.info_dict_keys = ['type', 'vendor_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'] - - 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'] - - 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 - - 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) - for n in range(0, num_bytes): - eeprom_raw[n] = hex(raw[n])[2:].zfill(2) - except Exception as e: - pass - finally: - if sysfsfile_eeprom: - sysfsfile_eeprom.close() - return eeprom_raw - - def _dom_capability_detect(self): - if 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 - vendor_rev |1*255VCHAR |vendor revision 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 - 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 - ======================================================================== - """ - - if self.sfp_type == COPPER_TYPE: - return None - - compliance_code_dict = {} - transceiver_info_dict = dict.fromkeys(self.info_dict_keys, 'N/A') - - if not self.get_presence(): - return transceiver_info_dict - - if self.sfp_type == SFP_TYPE: - 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 - - 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['vendor_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']) - - 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']) - transceiver_info_dict['application_advertisement'] = 'N/A' - - 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 - txbias |INT |TX Bias Current in mA, n is the channel number, - | |for example, tx2bias stands for tx bias of channel 2. - rxpower |INT |received optical power in mW, n is the channel number, - | |for example, rx2power stands for rx power of channel 2. - txpower |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(self.dom_dict_keys, 'N/A') - - if self.sfp_type == COPPER_TYPE: - return transceiver_dom_info_dict - - if self.sfp_type == SFP_TYPE: - - self._dom_capability_detect() - 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']) - - 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. - ======================================================================== - """ - transceiver_dom_threshold_info_dict = dict.fromkeys( - self.threshold_dict_keys, 'N/A') - - if self.sfp_type == COPPER_TYPE: - return transceiver_dom_threshold_info_dict + self._version_info = device_info.get_sonic_version_info() + self.lastPresence = False - if self.sfp_type == SFP_TYPE: + logger.log_debug("Sfp __init__ index {} setting name to {} and eeprom_path to {}".format(index, self.name, self.eeprom_path)) - offset = SFP_MODULE_ADDRA2_OFFSET - - self._dom_capability_detect() - 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 + Sfp.instances.append(self) + + def get_eeprom_path(self): + return self.eeprom_path - def get_reset_status(self): + def get_presence(self): """ - Retrieves the reset status of SFP + Retrieves the presence Returns: - A Boolean, True if reset enabled, False if disabled + bool: True if is present, False if not """ - self._dom_capability_detect() - if not self.dom_supported: - return False if self.sfp_type == COPPER_TYPE: return False - if self.sfp_type == SFP_TYPE: - offset = 0 - - 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: - return False - else: - return True - - 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. - """ - if self.sfp_type == COPPER_TYPE: - return None - if not self.dom_supported: - return None - rx_los_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: - rx_los_data = int(dom_channel_monitor_raw[0], 16) - rx_los_list.append(rx_los_data & 0x02 != 0) + if smbus_present == 0: # if called from sfputil outside of pmon + cmdstatus, sfpstatus = cmd.getstatusoutput('sudo i2cget -y 0 0x41 0x3') + sfpstatus = int(sfpstatus, 16) else: - return None + bus = smbus.SMBus(0) + DEVICE_ADDRESS = 0x41 + DEVICE_REG = 0x3 + sfpstatus = bus.read_byte_data(DEVICE_ADDRESS, DEVICE_REG) - return rx_los_list + pos = [1, 2, 4, 8] + bit_pos = pos[self.index-SFP_PORT_START] + sfpstatus = sfpstatus & (bit_pos) - 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 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 + if sfpstatus == 0: + return True + return False - def get_tx_disable(self): + def get_name(self): """ - Retrieves the tx_disable status of this SFP - Returns: - A Boolean, True if tx_disable is enabled, False if disabled + Retrieves the name of the device + Returns: + string: The name of the device """ + return self.name - if self.sfp_type == COPPER_TYPE: - return None - if not self.dom_supported: - return None - - 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: - return None - - return tx_disable_list - - def get_tx_disable_channel(self): + def get_position_in_parent(self): """ - Retrieves the TX disabled channels in this SFP + Retrieves 1-based relative physical position in parent device. 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. + integer: The 1-based relative physical position in parent device or + -1 if cannot determine the position """ - 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 + return -1 - def get_lpmode(self): + def is_replaceable(self): """ - Retrieves the lpmode (low power mode) status of this SFP + Indicate whether this device is replaceable. Returns: - A Boolean, True if lpmode is enabled, False if disabled + bool: True if it is replaceable. """ - if self.sfp_type == COPPER_TYPE: - return False - if self.sfp_type == SFP_TYPE: - return False - 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 == COPPER_TYPE: - return False - if self.sfp_type == SFP_TYPE: + if self.sfp_type == "SFP": + return True + else: return False - def get_temperature(self): + def _get_error_code(self): """ - Retrieves the temperature of this SFP + Get error code of the SFP module + Returns: - An integer number of current temperature in Celsius + The error code """ - if self.sfp_type == COPPER_TYPE: - return None - - transceiver_bulk_status = self.get_transceiver_bulk_status() - return transceiver_bulk_status.get("temperature", "N/A") + return NotImplementedError - def get_voltage(self): - """ - Retrieves the supply voltage of this SFP - Returns: - An integer number of supply voltage in mV + def get_error_description(self): """ - if self.sfp_type == COPPER_TYPE: - return None + Get error description - transceiver_bulk_status = self.get_transceiver_bulk_status() - return transceiver_bulk_status.get("voltage", "N/A") + Args: + error_code: The error code returned by _get_error_code - def get_tx_bias(self): - """ - Retrieves the TX bias current of this SFP Returns: - + The error description """ - 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")) - - return tx_bias_list + if not self.get_presence(): + error_description = self.SFP_STATUS_UNPLUGGED + else: + error_description = self.SFP_STATUS_OK + return error_description + # return NotImplementedError - def get_rx_power(self): + def get_reset_status(self): """ - Retrieves the received optical power for this SFP + Retrieves the reset status of 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'] + A Boolean, True if reset enabled, False if disabled """ - rx_power_list = [] if self.sfp_type == COPPER_TYPE: - return None - + return False if self.sfp_type == SFP_TYPE: + return False - offset = 256 - - sfpd_obj = sff8472Dom() - if sfpd_obj is None: - return None - - self._dom_capability_detect() - 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): + def get_status(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'] + Retrieves the operational status of the device """ - tx_power_list = [] + reset = self.get_reset_status() - if self.sfp_type == COPPER_TYPE: - return None - - if self.sfp_type == SFP_TYPE: + if reset is True: + status = False + else: + status = True - offset = 256 - sfpd_obj = sff8472Dom() - if sfpd_obj is None: - return None - - self._dom_capability_detect() - 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 + return status def reset(self): """ @@ -798,64 +190,6 @@ def reset(self): # RJ45 and SFP ports not resettable return False - def tx_disable(self, tx_disable): - """ - Disable SFP TX - 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 == 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: - 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) - - 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): - """ - 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 - """ - - return NotImplementedError - def set_lpmode(self, lpmode): """ Sets the lpmode (low power mode) of SFP @@ -870,124 +204,13 @@ def set_lpmode(self, lpmode): if self.sfp_type == SFP_TYPE: return False - 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 - """ - - return NotImplementedError - - 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-1] or "Unknown" - return name - - def get_presence(self): + def get_lpmode(self): """ - Retrieves the presence + Retrieves the lpmode (low power mode) status of this SFP Returns: - bool: True if is present, False if not + A Boolean, True if lpmode is enabled, False if disabled """ if self.sfp_type == COPPER_TYPE: return False - - if smbus_present == 0: # if called from sfputil outside of pmon - cmdstatus, sfpstatus = cmd.getstatusoutput('sudo i2cget -y 0 0x41 0x3') - sfpstatus = int(sfpstatus, 16) - else: - bus = smbus.SMBus(0) - DEVICE_ADDRESS = 0x41 - DEVICE_REG = 0x3 - sfpstatus = bus.read_byte_data(DEVICE_ADDRESS, DEVICE_REG) - - pos = [1, 2, 4, 8] - bit_pos = pos[self.index-SFP_PORT_START] - sfpstatus = sfpstatus & (bit_pos) - - if sfpstatus == 0: - return True - - 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() - - 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: + if self.sfp_type == SFP_TYPE: 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 - - 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(): - error_description = self.SFP_STATUS_UNPLUGGED - else: - error_description = self.SFP_STATUS_OK - - return error_description From 3fbd67398791b1ab25342966a7448fc795fe3a3f Mon Sep 17 00:00:00 2001 From: Saikrishna Arcot Date: Mon, 17 Apr 2023 17:27:55 -0700 Subject: [PATCH 027/193] [202205] Always use the openssl backend of curl (#14351) (#14535) Why I did it This should make sure that the openssl backend of curl is used, instead of the gnutls or nss backend, for consistency reasons. --- sonic-slave-bullseye/Dockerfile.j2 | 4 ++-- sonic-slave-buster/Dockerfile.j2 | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sonic-slave-bullseye/Dockerfile.j2 b/sonic-slave-bullseye/Dockerfile.j2 index 3203ebb2170b..0a0071bbf46f 100644 --- a/sonic-slave-bullseye/Dockerfile.j2 +++ b/sonic-slave-bullseye/Dockerfile.j2 @@ -135,7 +135,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 \ @@ -290,7 +290,7 @@ RUN apt-get update && apt-get install -y \ xsltproc \ python3-lxml \ libexpat1-dev \ - libcurl3-gnutls \ + libcurl4 \ libcjson-dev \ # For WPA supplication qtbase5-dev \ diff --git a/sonic-slave-buster/Dockerfile.j2 b/sonic-slave-buster/Dockerfile.j2 index 4853d72e292c..e40c611be72e 100644 --- a/sonic-slave-buster/Dockerfile.j2 +++ b/sonic-slave-buster/Dockerfile.j2 @@ -135,7 +135,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 \ @@ -290,7 +290,7 @@ RUN apt-get update && apt-get install -y \ xsltproc \ python-lxml \ libexpat1-dev \ - libcurl3-gnutls \ + libcurl4 \ libcjson-dev \ # For WPA supplication qtbase5-dev \ From 5c4d424628e15aa68c73cca44cff4ec6061e6507 Mon Sep 17 00:00:00 2001 From: mssonicbld <79238446+mssonicbld@users.noreply.github.com> Date: Tue, 18 Apr 2023 08:29:53 +0800 Subject: [PATCH 028/193] [submodule] Update submodule to the latest HEAD automatically (#14561) Why I did it src/sonic-platform-common * 41e2a6e - (HEAD -> 202205, origin/202205) Fix pipeline apt-get purge error. (#349) (#358) (6 days ago) [Liu Shilong] src/sonic-swss * 804e5ac - (HEAD -> 202205, origin/202205) [FDB]Fixing FDB consolidated flush for Remote MACs (#2673) (#2725) (4 hours ago) [Sudharsan Dhamal Gopalarathnam] src/sonic-utilities * ea1d849a - (HEAD -> 202205, origin/202205) Use sonic-swss-common artifacts from the matching source branch (#2783) (5 days ago) [Saikrishna Arcot] --- src/sonic-platform-common | 2 +- src/sonic-swss | 2 +- src/sonic-utilities | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/sonic-platform-common b/src/sonic-platform-common index c401866682f3..41e2a6ec33e4 160000 --- a/src/sonic-platform-common +++ b/src/sonic-platform-common @@ -1 +1 @@ -Subproject commit c401866682f3689b16d223181651a6e57e603e6c +Subproject commit 41e2a6ec33e4fc05111405463b870945bb5b157a diff --git a/src/sonic-swss b/src/sonic-swss index 699477d63333..804e5ac54a0b 160000 --- a/src/sonic-swss +++ b/src/sonic-swss @@ -1 +1 @@ -Subproject commit 699477d63333dda0fc0167a6167b54858c71bfac +Subproject commit 804e5ac54a0bf6594001155b892e81f0869f8eb6 diff --git a/src/sonic-utilities b/src/sonic-utilities index f9f3e7e4361a..ea1d849adb4c 160000 --- a/src/sonic-utilities +++ b/src/sonic-utilities @@ -1 +1 @@ -Subproject commit f9f3e7e4361aedf3adca9976395dc231981a2776 +Subproject commit ea1d849adb4c20d25ccf261c476c7a4e8cbbf178 From 1a9d6cdc5a64f621c42ae11bcc48ae295c11f92d Mon Sep 17 00:00:00 2001 From: xumia <59720581+xumia@users.noreply.github.com> Date: Tue, 18 Apr 2023 08:30:49 +0800 Subject: [PATCH 029/193] Support to add SONiC OS Version in device info (#14601) (#14624) Why I did it Support to add SONiC OS Version in device info. It will be used to display the version info in the SONiC command "show version". The version is used to do the FIPS certification. We do not do the FIPS certification on a specific release, but on the SONiC OS Version. SONiC Software Version: SONiC.master-13812.218661-7d94c0c28 SONiC OS Version: 11 Distribution: Debian 11.6 Kernel: 5.10.0-18-2-amd64 How I did it --- Makefile.work | 1 + build_debian.sh | 1 + files/build_templates/sonic_version.yml.j2 | 1 + platform/vs/sonic-version.mk | 2 ++ rules/config | 3 +++ slave.mk | 1 + 6 files changed, 9 insertions(+) diff --git a/Makefile.work b/Makefile.work index b112701924b5..57081982273a 100644 --- a/Makefile.work +++ b/Makefile.work @@ -403,6 +403,7 @@ SONIC_BUILD_INSTRUCTION := make \ MIRROR_URLS=$(MIRROR_URLS) \ MIRROR_SECURITY_URLS=$(MIRROR_SECURITY_URLS) \ MIRROR_SNAPSHOT=$(MIRROR_SNAPSHOT) \ + SONIC_OS_VERSION=$(SONIC_OS_VERSION) \ $(SONIC_OVERRIDE_BUILD_VARS) .PHONY: sonic-slave-build sonic-slave-bash init reset diff --git a/build_debian.sh b/build_debian.sh index 4d660d5df68a..f94f7347dad7 100755 --- a/build_debian.sh +++ b/build_debian.sh @@ -560,6 +560,7 @@ export release="$(if [ -f $FILESYSTEM_ROOT/etc/sonic/sonic_release ]; then cat $ export build_date="$(date -u)" export build_number="${BUILD_NUMBER:-0}" export built_by="$USER@$BUILD_HOSTNAME" +export sonic_os_version="${SONIC_OS_VERSION}" j2 files/build_templates/sonic_version.yml.j2 | sudo tee $FILESYSTEM_ROOT/etc/sonic/sonic_version.yml ## Copy over clean-up script diff --git a/files/build_templates/sonic_version.yml.j2 b/files/build_templates/sonic_version.yml.j2 index bc6fb54189d4..8b829feeed00 100644 --- a/files/build_templates/sonic_version.yml.j2 +++ b/files/build_templates/sonic_version.yml.j2 @@ -29,3 +29,4 @@ built_by: {{ built_by }} {% if ENABLE_ASAN == "y" -%} asan: 'yes' {% endif -%} +sonic_os_version: {{ sonic_os_version }} diff --git a/platform/vs/sonic-version.mk b/platform/vs/sonic-version.mk index 9e21573227b3..82409abd1ec1 100644 --- a/platform/vs/sonic-version.mk +++ b/platform/vs/sonic-version.mk @@ -2,9 +2,11 @@ sonic_version=$(SONIC_GET_VERSION) sonic_asic_platform=$(CONFIGURED_PLATFORM) +sonic_os_version=$(SONIC_OS_VERSION) export sonic_version export sonic_asic_platform +export sonic_os_version SONIC_VERSION = sonic_version.yml $(SONIC_VERSION)_SRC_PATH = $(PLATFORM_PATH)/sonic-version diff --git a/rules/config b/rules/config index 5c9ebb6081a8..9b9ab102518b 100644 --- a/rules/config +++ b/rules/config @@ -253,3 +253,6 @@ ENABLE_FIPS ?= n # SONIC_SLAVE_DOCKER_DRIVER - set the sonic slave docker storage driver SONIC_SLAVE_DOCKER_DRIVER ?= vfs + +# SONIC_OS_VERSION - sonic os version +SONIC_OS_VERSION ?= 11 diff --git a/slave.mk b/slave.mk index faaaff986a83..3d3b0b721640 100644 --- a/slave.mk +++ b/slave.mk @@ -82,6 +82,7 @@ export MULTIARCH_QEMU_ENVIRON export DOCKER_BASE_ARCH export BLDENV export MIRROR_SNAPSHOT +export SONIC_OS_VERSION ############################################################################### ## Utility rules From 295378cfd29c86efc2945b7bb0255da745fd45bc Mon Sep 17 00:00:00 2001 From: xumia <59720581+xumia@users.noreply.github.com> Date: Tue, 18 Apr 2023 08:32:22 +0800 Subject: [PATCH 030/193] [Build] Optimize the version control for Debian packages (#14557) (#14611) Why I did it Optimize the version control for Debian packages. Fix sonic-slave-buster/sources.list.amd64 not found display issue, need to generate the file before running the shell command to evaluate the sonic image tag. When using the snapshot mirror, it is not necessary to update the version file based on the base image. It will reduce the version dependency issue, when an image is not run when freezing the version. How I did it Not to update the version file when snapshot mirror enabled. How to verify it --- Makefile.work | 2 +- scripts/prepare_docker_buildinfo.sh | 2 +- src/sonic-build-hooks/scripts/buildinfo_base.sh | 3 +++ 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Makefile.work b/Makefile.work index 57081982273a..3737c47e84af 100644 --- a/Makefile.work +++ b/Makefile.work @@ -173,7 +173,7 @@ $(shell \ # Generate the slave Dockerfile, and prepare build info for it $(shell CONFIGURED_ARCH=$(CONFIGURED_ARCH) MULTIARCH_QEMU_ENVIRON=$(MULTIARCH_QEMU_ENVIRON) ENABLE_FIPS_FEATURE=$(ENABLE_FIPS_FEATURE) 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);}') diff --git a/scripts/prepare_docker_buildinfo.sh b/scripts/prepare_docker_buildinfo.sh index c5547dfc3094..f39fe711dd48 100755 --- a/scripts/prepare_docker_buildinfo.sh +++ b/scripts/prepare_docker_buildinfo.sh @@ -22,7 +22,7 @@ if [ -z "$DISTRO" ]; then [ -z "$DISTRO" ] && DISTRO=jessie fi -if [[ "$IMAGENAME" == docker-base-* ]] || [[ "$IMAGENAME" == docker-ptf ]]; then +if [[ "$IMAGENAME" == sonic-slave-* ]] || [[ "$IMAGENAME" == docker-base-* ]] || [[ "$IMAGENAME" == docker-ptf ]]; then scripts/build_mirror_config.sh ${DOCKERFILE_PATH} $ARCH $DISTRO fi diff --git a/src/sonic-build-hooks/scripts/buildinfo_base.sh b/src/sonic-build-hooks/scripts/buildinfo_base.sh index a11ae178c040..6130e125f4b3 100755 --- a/src/sonic-build-hooks/scripts/buildinfo_base.sh +++ b/src/sonic-build-hooks/scripts/buildinfo_base.sh @@ -342,6 +342,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 From 7c9d399fe9c3bb3e985e7ae03ff5d4f11f1e17e7 Mon Sep 17 00:00:00 2001 From: mssonicbld <79238446+mssonicbld@users.noreply.github.com> Date: Tue, 18 Apr 2023 08:34:32 +0800 Subject: [PATCH 031/193] [submodule] Update submodule sonic-platform-common to the latest HEAD automatically (#14654) src/sonic-platform-common * 41e2a6e - (HEAD -> 202205, origin/202205) Fix pipeline apt-get purge error. (#349) (#358) (11 days ago) [Liu Shilong] From af6cd36fe1aefcc04bfa6bb5db4deab71820efae Mon Sep 17 00:00:00 2001 From: mssonicbld <79238446+mssonicbld@users.noreply.github.com> Date: Tue, 18 Apr 2023 08:35:42 +0800 Subject: [PATCH 032/193] [submodule] Update submodule sonic-utilities to the latest HEAD automatically (#14657) src/sonic-utilities * ea1d849a - (HEAD -> 202205, origin/202205) Use sonic-swss-common artifacts from the matching source branch (#2783) (10 days ago) [Saikrishna Arcot] From 5b024af2aa9cf17252425b96da995641ac75ecd3 Mon Sep 17 00:00:00 2001 From: mssonicbld <79238446+mssonicbld@users.noreply.github.com> Date: Tue, 18 Apr 2023 08:36:45 +0800 Subject: [PATCH 033/193] [submodule] Update submodule sonic-swss to the latest HEAD automatically (#14655) src/sonic-swss * 804e5ac - (HEAD -> 202205, origin/202205) [FDB]Fixing FDB consolidated flush for Remote MACs (#2673) (#2725) (5 days ago From 1d9cf5ac770947312a141afc2475aa391729d756 Mon Sep 17 00:00:00 2001 From: xumia <59720581+xumia@users.noreply.github.com> Date: Tue, 18 Apr 2023 09:00:57 +0800 Subject: [PATCH 034/193] [Submodule][202205] Advance sonic-restapi pointer (#14626) update restapi commits till: 4f6f979 (HEAD -> master, origin/master, origin/HEAD) [Security] Fix the redis security issue CVE-2023-28858 and CVE-2023-28859 (#139) --- src/sonic-restapi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/sonic-restapi b/src/sonic-restapi index e83e0e862cc4..4f6f979a5b5a 160000 --- a/src/sonic-restapi +++ b/src/sonic-restapi @@ -1 +1 @@ -Subproject commit e83e0e862cc4e8a2627eaf79f1461e7d7d9a4e75 +Subproject commit 4f6f979a5b5ac833b4279c73ed6c91c762d904c4 From c9d5e20923b351d54000b39a0e7b8f2487a8b603 Mon Sep 17 00:00:00 2001 From: mssonicbld <79238446+mssonicbld@users.noreply.github.com> Date: Tue, 18 Apr 2023 12:33:15 +0800 Subject: [PATCH 035/193] [image_config] add rasdaemon.timer (#14300) (#14692) --- files/build_templates/sonic_debian_extension.j2 | 5 +++++ files/image_config/rasdaemon/rasdaemon.timer | 10 ++++++++++ 2 files changed, 15 insertions(+) create mode 100644 files/image_config/rasdaemon/rasdaemon.timer diff --git a/files/build_templates/sonic_debian_extension.j2 b/files/build_templates/sonic_debian_extension.j2 index 31ef1f7b7571..c4a0cf0e1f95 100644 --- a/files/build_templates/sonic_debian_extension.j2 +++ b/files/build_templates/sonic_debian_extension.j2 @@ -430,6 +430,11 @@ sudo cp $IMAGE_CONFIGS/corefile_uploader/core_uploader.py $FILESYSTEM_ROOT/usr/b sudo cp $IMAGE_CONFIGS/corefile_uploader/core_analyzer.rc.json $FILESYSTEM_ROOT_ETC_SONIC/ sudo chmod og-rw $FILESYSTEM_ROOT_ETC_SONIC/core_analyzer.rc.json +# Rasdaemon service configuration. Use timer to start rasdaemon with a delay for better fast/warm boot performance +sudo cp $IMAGE_CONFIGS/rasdaemon/rasdaemon.timer $FILESYSTEM_ROOT_USR_LIB_SYSTEMD_SYSTEM +sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT systemctl disable rasdaemon.service +sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT systemctl enable rasdaemon.timer + sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y install libffi-dev libssl-dev if [[ $CONFIGURED_ARCH == armhf ]]; then diff --git a/files/image_config/rasdaemon/rasdaemon.timer b/files/image_config/rasdaemon/rasdaemon.timer new file mode 100644 index 000000000000..82e07912d66d --- /dev/null +++ b/files/image_config/rasdaemon/rasdaemon.timer @@ -0,0 +1,10 @@ +[Unit] +Description=Delays rasdaemon until SONiC has started + +[Timer] +OnUnitActiveSec=0 sec +OnBootSec=1min 30 sec +Unit=rasdaemon.service + +[Install] +WantedBy=multi-user.target From 0b30826e56aa35c7d6bf50e610575b6c9c5d0d48 Mon Sep 17 00:00:00 2001 From: anamehra <54692434+anamehra@users.noreply.github.com> Date: Wed, 12 Apr 2023 00:07:42 -0700 Subject: [PATCH 036/193] chassis-packet: resolve the missing static routes (#14593) Why I did it Fixes #14179 chassis-packet: missing arp entries for static routes causing high orchagent cpu usage It is observed that some sonic-mgmt test case calls sonic-clear arp, which clears the static arp entries as well. Orchagent or arp_update process does not try to resolve the missing arp entries after clear. How I did it arp_update should resolve the missing arp/ndp static route entries. Added code to check for missing entries and try ping if any found to resolve it. How to verify it After boot or config reload, check ipv4 and ipv4 neigh entries to make sure all static route entries are present manual validation: Use sonic-clear arp and sonic-clear ndp to clear all neighbor entries run arp_update Check for neigh entries. All entries should be present. Testing on T0 setup route/for test_static_route.py The test set the STATIC_ROUTE entry in conifg db without ifname: sonic-db-cli CONFIG_DB hmset 'STATIC_ROUTE|2.2.2.0/24' nexthop 192.168.0.18,192.168.0.25,192.168.0.23 "STATIC_ROUTE": { "2.2.2.0/24": { "nexthop": "192.168.0.18,192.168.0.25,192.168.0.23" } }, Validate that the arp_update gets the proper ARP_UPDATE_VARDS using arp_update_vars.j2 template from config db and does not crash: { "switch_type": "", "interface": "", "pc_interface" : "PortChannel101 PortChannel102 PortChannel103 PortChannel104 ", "vlan_sub_interface": "", "vlan" : "Vlan1000", "static_route_nexthops": "192.168.0.18 192.168.0.25 192.168.0.23 ", "static_route_ifnames": "" } validate route/test_static_route.py testcase pass. --- files/build_templates/arp_update_vars.j2 | 3 ++- files/scripts/arp_update | 27 +++++++++++++++++------- 2 files changed, 21 insertions(+), 9 deletions(-) diff --git a/files/build_templates/arp_update_vars.j2 b/files/build_templates/arp_update_vars.j2 index 91992e781ac0..d17f17ac8847 100644 --- a/files/build_templates/arp_update_vars.j2 +++ b/files/build_templates/arp_update_vars.j2 @@ -4,5 +4,6 @@ "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 %}", - "static_route_nexthops": "{% if STATIC_ROUTE %}{% for static_route_prefix, static_route_attr in STATIC_ROUTE.items() %}{%- if static_route_prefix -%}{{ static_route_attr['nexthop'].split(',') | join(' ') | lower + " " }}{%- endif -%}{% endfor %}{% endif %}" + "static_route_nexthops": "{% if STATIC_ROUTE %}{% for static_route_prefix, static_route_attr in STATIC_ROUTE.items() %}{%- if static_route_prefix -%}{{ static_route_attr['nexthop'].split(',') | join(' ') | lower + " " }}{%- endif -%}{% endfor %}{% endif %}", + "static_route_ifnames": "{% if STATIC_ROUTE %}{% for static_route_prefix, static_route_attr in STATIC_ROUTE.items() %}{%- if static_route_prefix and 'ifname' in static_route_attr -%}{{ static_route_attr['ifname'].split(',') | join(' ') + " " }}{%- endif -%}{% endfor %}{% endif %}" } diff --git a/files/scripts/arp_update b/files/scripts/arp_update index b686e1a93e24..2725f034668b 100755 --- a/files/scripts/arp_update +++ b/files/scripts/arp_update @@ -14,13 +14,16 @@ while /bin/true; do ARP_UPDATE_VARS=$(sonic-cfggen -d -t ${ARP_UPDATE_VARS_FILE}) SWITCH_TYPE=$(echo $ARP_UPDATE_VARS | jq -r '.switch_type') if [[ "$SWITCH_TYPE" == "chassis-packet" ]]; then - STATIC_ROUTE_NEXTHOPS=$(echo $ARP_UPDATE_VARS | jq -r '.static_route_nexthops') + # Get array of Nexthops and ifnames. Nexthops and ifnames are mapped one to one + STATIC_ROUTE_NEXTHOPS=($(echo $ARP_UPDATE_VARS | jq -r '.static_route_nexthops')) + STATIC_ROUTE_IFNAMES=($(echo $ARP_UPDATE_VARS | jq -r '.static_route_ifnames')) # on supervisor/rp exit the script gracefully - if [[ -z "$STATIC_ROUTE_NEXTHOPS" ]]; then + if [[ -z "$STATIC_ROUTE_NEXTHOPS" ]] || [[ -z "$STATIC_ROUTE_IFNAMES" ]]; then logger "arp_update: exiting as no static route in packet based chassis" exit 0 fi - for nexthop in $STATIC_ROUTE_NEXTHOPS; do + for i in ${!STATIC_ROUTE_NEXTHOPS[@]}; do + nexthop="${STATIC_ROUTE_NEXTHOPS[i]}" if [[ $nexthop == *"."* ]]; then neigh_state=( $(ip -4 neigh show | grep -w $nexthop | tr -s ' ' | cut -d ' ' -f 3,4) ) ping_prefix=ping @@ -28,11 +31,19 @@ while /bin/true; do neigh_state=( $(ip -6 neigh show | grep -w $nexthop | tr -s ' ' | cut -d ' ' -f 3,4) ) ping_prefix=ping6 fi - - if [[ "${neigh_state[1]}" == "INCOMPLETE" ]] || [[ "${neigh_state[1]}" == "FAILED" ]]; then - pingcmd="timeout 0.2 $ping_prefix -I ${neigh_state[0]} -n -q -i 0 -c 1 -W 1 $nexthop >/dev/null" - eval $pingcmd - logger "arp_update: sttaic route nexthop not resolved, pinging $nexthop on ${neigh_state[0]}" + if [[ -z "${neigh_state}" ]] || [[ "${neigh_state[1]}" == "INCOMPLETE" ]] || [[ "${neigh_state[1]}" == "FAILED" ]]; then + interface="${STATIC_ROUTE_IFNAMES[i]}" + if [[ -z "$interface" ]]; then + # should never be here, handling just in case + logger "ERR: arp_update: missing interface entry for static route $nexthop" + interface=${neigh_state[0]} + fi + intf_up=$(ip link show $interface | grep "state UP") + if [[ -n "$intf_up" ]]; then + pingcmd="timeout 0.2 $ping_prefix -I ${interface} -n -q -i 0 -c 1 -W 1 $nexthop >/dev/null" + eval $pingcmd + logger "arp_update: static route nexthop not resolved, pinging $nexthop on ${neigh_state[0]}" + fi fi done From 94ba9696763c6945697f38af63966c8a10942d80 Mon Sep 17 00:00:00 2001 From: mssonicbld <79238446+mssonicbld@users.noreply.github.com> Date: Tue, 18 Apr 2023 17:11:59 +0800 Subject: [PATCH 037/193] [write standby] force DB connections to use unix socket to connect (#14524) (#14553) --- files/scripts/write_standby.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/files/scripts/write_standby.py b/files/scripts/write_standby.py index 13c5b17ea64e..745b9c503d20 100755 --- a/files/scripts/write_standby.py +++ b/files/scripts/write_standby.py @@ -37,7 +37,7 @@ def config_db(self): Initializes the connector during the first call """ if self.config_db_connector is None: - self.config_db_connector = ConfigDBConnector() + self.config_db_connector = ConfigDBConnector(use_unix_socket_path=True) self.config_db_connector.connect() return self.config_db_connector @@ -69,7 +69,7 @@ def asic_db(self): Initializes the connector during the first call """ if self.asic_db_connector is None: - self.asic_db_connector = SonicV2Connector() + self.asic_db_connector = SonicV2Connector(use_unix_socket_path=True) self.asic_db_connector.connect('ASIC_DB') return self.asic_db_connector From 20bb5daa6a898d0e909f01cd0b50138501222010 Mon Sep 17 00:00:00 2001 From: mssonicbld Date: Tue, 18 Apr 2023 08:19:27 +0000 Subject: [PATCH 038/193] [ci/build]: Upgrade SONiC package versions --- .../build-sonic-slave-bullseye/versions-py3 | 2 +- files/build/versions/default/versions-git | 4 ++-- files/build/versions/default/versions-mirror | 24 +++++++++---------- .../versions/dockers/docker-snmp/versions-py3 | 2 +- .../docker-sonic-mgmt-framework/versions-py3 | 2 +- .../versions-deb-bullseye | 5 ++-- .../dockers/sonic-slave-bullseye/versions-py3 | 2 +- .../sonic-slave-buster/versions-deb-buster | 3 +-- files/build/versions/host-image/versions-py3 | 2 +- 9 files changed, 22 insertions(+), 24 deletions(-) diff --git a/files/build/versions/build/build-sonic-slave-bullseye/versions-py3 b/files/build/versions/build/build-sonic-slave-bullseye/versions-py3 index f3c7560ba25c..f70de32e9fa6 100644 --- a/files/build/versions/build/build-sonic-slave-bullseye/versions-py3 +++ b/files/build/versions/build/build-sonic-slave-bullseye/versions-py3 @@ -18,7 +18,7 @@ netifaces==0.11.0 pddf-platform==1.0 prefixed==0.7.0 prettyprinter==0.18.0 -psutil==5.9.4 +psutil==5.9.5 pycairo==1.23.0 pyroute2==0.5.19 python-arptable==0.0.2 diff --git a/files/build/versions/default/versions-git b/files/build/versions/default/versions-git index 46dd7b86a27d..7bdd3d3e3437 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==97dadd025f541f67af48417cc12ebdc00c1ad29c +https://chromium.googlesource.com/chromium/tools/depot_tools.git==93c715cc646e63c3f976c69098f1b5a76b5619b4 https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f https://github.com/CESNET/libyang.git==9a4e5b2ce30b9696116d6e654ee55caab5aafed8 https://github.com/daveolson53/audisp-tacplus.git==559c9f22edd4f2dea0ecedffb3ad9502b12a75b6 https://github.com/daveolson53/libnss-tacplus.git==19008ab68d9d504aa58eb34d5f564755a1613b8b https://github.com/dyninc/OpenBFDD.git==e35f43ad8d2b3f084e96a84c392528a90d05a287 https://github.com/flashrom/flashrom.git==f3c21c6439f8bbd2911f120c55f301982ecd35bc -https://github.com/FreeRADIUS/freeradius-server.git==a285a9335288917e775957bef5a2c4a629f59889 +https://github.com/FreeRADIUS/freeradius-server.git==6a68530492f1ae437404fe1a8870a8a7ea67a94d https://github.com/FreeRADIUS/pam_radius.git==8d373539bb9f13b0abfe8bcae0095a930a00fad0 https://github.com/jeroennijhof/pam_tacplus.git==4284d9016e64def2bb81d5f50f96dc3b59bfdc39 https://github.com/jpirko/libteam.git==61e27812c1074a865d7e1a778c0ce442837c28d7 diff --git a/files/build/versions/default/versions-mirror b/files/build/versions/default/versions-mirror index dfed14735813..7c7a33ffc453 100644 --- a/files/build/versions/default/versions-mirror +++ b/files/build/versions/default/versions-mirror @@ -1,15 +1,15 @@ deb.nodesource.com_node%5f14.x_dists_bullseye==2023-02-17T00:35:28Z deb.nodesource.com_node%5f14.x_dists_buster==2023-02-17T00:35:28Z -debian==20230416T000236Z -debian-security==20230416T000621Z -download.docker.com_linux_debian_dists_bullseye==2023-04-14T12:24:31Z -download.docker.com_linux_debian_dists_buster==2023-04-14T12:24:31Z +debian==20230418T000224Z +debian-security==20230418T000228Z +download.docker.com_linux_debian_dists_bullseye==2023-04-17T19:08:09Z +download.docker.com_linux_debian_dists_buster==2023-04-17T19:08:10Z packages.microsoft.com_repos_sonic-dev_dists_jessie==2022-10-31T19:34:29Z -packages.trafficmanager.net_snapshot_debian-security_20230416T000621Z_dists_bullseye-security==2023-04-14T16:32:44Z -packages.trafficmanager.net_snapshot_debian-security_20230416T000621Z_dists_buster_updates==2023-04-14T16:32:44Z -packages.trafficmanager.net_snapshot_debian_20230416T000236Z_dists_bullseye==2022-12-17T10:14:37Z -packages.trafficmanager.net_snapshot_debian_20230416T000236Z_dists_bullseye-backports==2023-04-15T20:12:30Z -packages.trafficmanager.net_snapshot_debian_20230416T000236Z_dists_bullseye-updates==2023-04-15T20:12:30Z -packages.trafficmanager.net_snapshot_debian_20230416T000236Z_dists_buster==2022-09-10T11:30:54Z -packages.trafficmanager.net_snapshot_debian_20230416T000236Z_dists_buster-backports==2023-04-15T20:12:30Z -packages.trafficmanager.net_snapshot_debian_20230416T000236Z_dists_buster-updates==2023-04-15T20:12:30Z \ No newline at end of file +packages.trafficmanager.net_snapshot_debian-security_20230418T000228Z_dists_bullseye-security==2023-04-17T21:55:39Z +packages.trafficmanager.net_snapshot_debian-security_20230418T000228Z_dists_buster_updates==2023-04-17T21:55:38Z +packages.trafficmanager.net_snapshot_debian_20230418T000224Z_dists_bullseye==2022-12-17T10:14:37Z +packages.trafficmanager.net_snapshot_debian_20230418T000224Z_dists_bullseye-backports==2023-04-17T20:10:42Z +packages.trafficmanager.net_snapshot_debian_20230418T000224Z_dists_bullseye-updates==2023-04-17T20:10:42Z +packages.trafficmanager.net_snapshot_debian_20230418T000224Z_dists_buster==2022-09-10T11:30:54Z +packages.trafficmanager.net_snapshot_debian_20230418T000224Z_dists_buster-backports==2023-04-17T20:10:42Z +packages.trafficmanager.net_snapshot_debian_20230418T000224Z_dists_buster-updates==2023-04-17T20:10:42Z \ 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 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..a78c9bccca03 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.2.0 +attrs==23.1.0 certifi==2017.4.17 charset-normalizer==3.1.0 click==8.1.3 diff --git a/files/build/versions/dockers/sonic-slave-bullseye/versions-deb-bullseye b/files/build/versions/dockers/sonic-slave-bullseye/versions-deb-bullseye index bf87aa0ef15e..fcca1860b914 100644 --- a/files/build/versions/dockers/sonic-slave-bullseye/versions-deb-bullseye +++ b/files/build/versions/dockers/sonic-slave-bullseye/versions-deb-bullseye @@ -95,7 +95,7 @@ docbook-utils==0.6.14-3.4 docbook-xml==4.5-9 docker-ce==5:20.10.14~3-0~debian-bullseye docker-ce-cli==5:20.10.14~3-0~debian-bullseye -docker-ce-rootless-extras==5:23.0.3-1~debian.11~bullseye +docker-ce-rootless-extras==5:23.0.4-1~debian.11~bullseye docker-scan-plugin==0.23.0~debian-bullseye docutils-common==0.16+dfsg-4 dosfstools==4.2-1 @@ -433,9 +433,8 @@ libcunit1==2.1-3-dfsg-2.3 libcunit1-dev==2.1-3-dfsg-2.3 libcups2==2.3.3op2-3+deb11u2 libcurl3-gnutls==7.74.0-1.3+deb11u7 -libcurl3-nss==7.74.0-1.3+deb11u7 libcurl4==7.74.0-1.3+deb11u7 -libcurl4-nss-dev==7.74.0-1.3+deb11u7 +libcurl4-openssl-dev==7.74.0-1.3+deb11u7 libdaemon-dev==0.14-7.1 libdaemon0==0.14-7.1 libdata-dpath-perl==0.58-1 diff --git a/files/build/versions/dockers/sonic-slave-bullseye/versions-py3 b/files/build/versions/dockers/sonic-slave-bullseye/versions-py3 index 101720dba57a..488cf2e439ff 100644 --- a/files/build/versions/dockers/sonic-slave-bullseye/versions-py3 +++ b/files/build/versions/dockers/sonic-slave-bullseye/versions-py3 @@ -46,7 +46,7 @@ markdown==3.3.4 markupsafe==1.1.1 mccabe==0.6.1 mmh3==2.5.1 -mock==5.0.1 +mock==5.0.2 mockredispy==2.9.3 more-itertools==4.2.0 mypy-extensions==0.4.3 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 e21b7d1e1d79..2e2a7d428578 100644 --- a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster +++ b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster @@ -417,9 +417,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 diff --git a/files/build/versions/host-image/versions-py3 b/files/build/versions/host-image/versions-py3 index a34214e04a95..59ea977ae21e 100644 --- a/files/build/versions/host-image/versions-py3 +++ b/files/build/versions/host-image/versions-py3 @@ -40,7 +40,7 @@ pexpect==4.8.0 prefixed==0.7.0 prettyprinter==0.18.0 protobuf==3.20.3 -psutil==5.9.4 +psutil==5.9.5 ptyprocess==0.7.0 pyang==2.5.3 pyangbind==0.8.1 From 2b3b85bac83a3b844e5c038eca4b052ed72e5575 Mon Sep 17 00:00:00 2001 From: mssonicbld <79238446+mssonicbld@users.noreply.github.com> Date: Tue, 18 Apr 2023 23:21:16 +0800 Subject: [PATCH 039/193] [submodule] Update submodule sonic-platform-common to the latest HEAD automatically (#14694) src/sonic-platform-common * 24009de - (HEAD -> 202205, origin/202205) Fix issue: should always check return value of a function if the function may return None (#350) (#356) (3 hours ago) [Junchao-Mellanox] --- 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 41e2a6ec33e4..24009de3e95a 160000 --- a/src/sonic-platform-common +++ b/src/sonic-platform-common @@ -1 +1 @@ -Subproject commit 41e2a6ec33e4fc05111405463b870945bb5b157a +Subproject commit 24009de3e95a73a70059bc8d714162d5d0d28a0c From 60f9602095353b9ce7aee26f7482926208f12268 Mon Sep 17 00:00:00 2001 From: Gokulnath-Raja <87805083+Gokulnath-Raja@users.noreply.github.com> Date: Wed, 19 Apr 2023 00:27:44 +0530 Subject: [PATCH 040/193] [sflow] Exception handling for if_nametoindex (#11437) (#14456) catch system error and log as warning level instead of error level in case interface was already deleted Signed-off-by: Gokulnath-Raja --- dockers/docker-sflow/port_index_mapper.py | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/dockers/docker-sflow/port_index_mapper.py b/dockers/docker-sflow/port_index_mapper.py index 3ee73181a5b4..707980e3b765 100755 --- a/dockers/docker-sflow/port_index_mapper.py +++ b/dockers/docker-sflow/port_index_mapper.py @@ -45,7 +45,15 @@ def update_db(self, ifname, op): index = port_util.get_index_from_str(ifname) if op == 'SET' and index is None: return - ifindex = if_nametoindex(ifname) + + # catch system error and log as warning level instead of + # error level in case interface was already deleted + ifindex = None + try: + ifindex = if_nametoindex(ifname) + except OSError as e: + logger.log_warning("%s" % str(e)) + if op == 'SET' and ifindex is None: return From 59aac9a83effad46ce5706b2741a033f0b7641e8 Mon Sep 17 00:00:00 2001 From: Lior Avramov <73036155+liorghub@users.noreply.github.com> Date: Sat, 8 Apr 2023 00:15:19 +0300 Subject: [PATCH 041/193] Add teamd patches to solve traffic loss issue when removing port from LAG (#14002) #### Why I did it When removing port from LAG while traffic is running thorough LAG there is traffic disruption of 60 seconds. Fix issue https://github.com/sonic-net/sonic-buildimage/issues/14381 #### How I did it The patch I added introduces "port_removing" op and call it right before Kernel is asked to remove the port. Implement the op in LACP runner to disable the port which leads to proper LACPDU send. #### How to verify it Set LAG between 2 switches. Set LAGs to be router port and set ip address. In switch A send ping to ip address of LAG in switch B. In switch B, while ping is running remove port from LAG. Verify ping is not stopping. --- ...ort-to-disabled-state-during-removal.patch | 108 ++++++++++++++++++ ...om-disabled-when-admin-state-is-down.patch | 32 ++++++ src/libteam/patch/series | 2 + 3 files changed, 142 insertions(+) create mode 100644 src/libteam/patch/0013-set-port-to-disabled-state-during-removal.patch create mode 100644 src/libteam/patch/0014-dont-move-the-port-state-from-disabled-when-admin-state-is-down.patch diff --git a/src/libteam/patch/0013-set-port-to-disabled-state-during-removal.patch b/src/libteam/patch/0013-set-port-to-disabled-state-during-removal.patch new file mode 100644 index 000000000000..8341a53572e1 --- /dev/null +++ b/src/libteam/patch/0013-set-port-to-disabled-state-during-removal.patch @@ -0,0 +1,108 @@ +From fd26b370d85d63cca0736d7e666736bb15c395aa Mon Sep 17 00:00:00 2001 +From: Jiri Pirko +Date: Wed, 7 Dec 2022 10:44:35 +0100 +Subject: [PATCH] teamd: lacp: set port to disabled state during removal + +Currently, the disabled state is set only after port is removed from +team master in kernel. Team driver puts the port netdevice down right +away. In some cases, there is nice to send LACPDU to the partner with +flags set accordingly for the disabled port. + +Introduce "port_removing" op and call it right before kernel +is asked to remove the port. Implement the op in LACP runner +to disable the port which leads to proper LACPDU send. + +Signed-off-by: Jiri Pirko +--- + teamd/teamd.h | 4 ++++ + teamd/teamd_events.c | 12 ++++++++++++ + teamd/teamd_per_port.c | 1 + + teamd/teamd_runner_lacp.c | 12 ++++++++++++ + 4 files changed, 29 insertions(+) +diff --git a/teamd/teamd.h b/teamd/teamd.h +index 701a6a4..d1d0f7f 100644 +--- a/teamd/teamd.h ++++ b/teamd/teamd.h +@@ -183,6 +183,8 @@ struct teamd_event_watch_ops { + int (*admin_state_changed)(struct teamd_context *ctx, void *priv); + int (*port_added)(struct teamd_context *ctx, + struct teamd_port *tdport, void *priv); ++ void (*port_removing)(struct teamd_context *ctx, ++ struct teamd_port *tdport, void *priv); + void (*port_removed)(struct teamd_context *ctx, + struct teamd_port *tdport, void *priv); + int (*port_changed)(struct teamd_context *ctx, +@@ -209,6 +211,8 @@ void teamd_refresh_ports(struct teamd_context *ctx); + void teamd_ports_flush_data(struct teamd_context *ctx); + int teamd_event_port_added(struct teamd_context *ctx, + struct teamd_port *tdport); ++void teamd_event_port_removing(struct teamd_context *ctx, ++ struct teamd_port *tdport); + void teamd_event_port_removed(struct teamd_context *ctx, + struct teamd_port *tdport); + int teamd_event_port_changed(struct teamd_context *ctx, +diff --git a/teamd/teamd_events.c b/teamd/teamd_events.c +index bd4dcc1..ff39990 100644 +--- a/teamd/teamd_events.c ++++ b/teamd/teamd_events.c +@@ -76,6 +76,18 @@ int teamd_event_port_added(struct teamd_context *ctx, + return 0; + } + ++void teamd_event_port_removing(struct teamd_context *ctx, ++ struct teamd_port *tdport) ++{ ++ struct event_watch_item *watch; ++ ++ list_for_each_node_entry(watch, &ctx->event_watch_list, list) { ++ if (!watch->ops->port_removing) ++ continue; ++ watch->ops->port_removing(ctx, tdport, watch->priv); ++ } ++} ++ + void teamd_event_port_removed(struct teamd_context *ctx, + struct teamd_port *tdport) + { +diff --git a/teamd/teamd_per_port.c b/teamd/teamd_per_port.c +index cefd6c2..68fc553 100644 +--- a/teamd/teamd_per_port.c ++++ b/teamd/teamd_per_port.c +@@ -358,6 +358,7 @@ static int teamd_port_remove(struct teamd_context *ctx, + + teamd_log_dbg(ctx, "%s: Removing port (found ifindex \"%d\").", + tdport->ifname, tdport->ifindex); ++ teamd_event_port_removing(ctx, tdport); + err = team_port_remove(ctx->th, tdport->ifindex); + if (err) + teamd_log_err("%s: Failed to remove port.", tdport->ifname); +diff --git a/teamd/teamd_runner_lacp.c b/teamd/teamd_runner_lacp.c +index 82b8b86..89f462a 100644 +--- a/teamd/teamd_runner_lacp.c ++++ b/teamd/teamd_runner_lacp.c +@@ -1779,6 +1779,17 @@ static int lacp_event_watch_port_added(struct teamd_context *ctx, + return teamd_balancer_port_added(lacp->tb, tdport); + } + ++static void lacp_event_watch_port_removing(struct teamd_context *ctx, ++ struct teamd_port *tdport, void *priv) ++{ ++ struct lacp *lacp = priv; ++ struct lacp_port *lacp_port = lacp_port_get(lacp, tdport); ++ ++ /* Ensure that no incoming LACPDU is going to be processed. */ ++ teamd_loop_callback_disable(ctx, LACP_SOCKET_CB_NAME, lacp_port); ++ lacp_port_set_state(lacp_port, PORT_STATE_DISABLED); ++} ++ + static void lacp_event_watch_port_removed(struct teamd_context *ctx, + struct teamd_port *tdport, void *priv) + { +@@ -1845,6 +1856,7 @@ 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, + .port_added = lacp_event_watch_port_added, ++ .port_removing = lacp_event_watch_port_removing, + .port_removed = lacp_event_watch_port_removed, + .port_changed = lacp_event_watch_port_changed, + .admin_state_changed = lacp_event_watch_admin_state_changed, diff --git a/src/libteam/patch/0014-dont-move-the-port-state-from-disabled-when-admin-state-is-down.patch b/src/libteam/patch/0014-dont-move-the-port-state-from-disabled-when-admin-state-is-down.patch new file mode 100644 index 000000000000..82637529fcb3 --- /dev/null +++ b/src/libteam/patch/0014-dont-move-the-port-state-from-disabled-when-admin-state-is-down.patch @@ -0,0 +1,32 @@ +From 23ab49c4df0c06eb629ce2e3bb4c4dd7c527975a Mon Sep 17 00:00:00 2001 +From: Jiri Pirko +Date: Thu, 2 Feb 2023 17:00:51 +0100 +Subject: [PATCH] teamd: lacp: don't move the port state from disabled when + admin state is down + +When the team admin state is down, the port should stay in disabled +state, no matter what's happening. So check the admin state and bail out +in that case. + +Signed-off-by: Jiri Pirko +--- + teamd/teamd_runner_lacp.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/teamd/teamd_runner_lacp.c b/teamd/teamd_runner_lacp.c +index 51c7714..a76c372 100644 +--- a/teamd/teamd_runner_lacp.c ++++ b/teamd/teamd_runner_lacp.c +@@ -956,9 +956,11 @@ static int lacpdu_send(struct lacp_port *lacp_port); + static int lacp_port_set_state(struct lacp_port *lacp_port, + enum lacp_port_state new_state) + { ++ bool admin_state = team_get_ifinfo_admin_state(lacp_port->ctx->ifinfo); + int err; + +- if (new_state == lacp_port->state) ++ if (new_state == lacp_port->state || ++ (!admin_state && new_state != PORT_STATE_DISABLED)) + return 0; + if (new_state == PORT_STATE_DISABLED) + lacp_port_periodic_off(lacp_port); diff --git a/src/libteam/patch/series b/src/libteam/patch/series index cd7522918f43..f47ee9c06a3f 100644 --- a/src/libteam/patch/series +++ b/src/libteam/patch/series @@ -10,3 +10,5 @@ 0010-When-read-of-timerfd-returned-0-don-t-consider-this-.patch 0011-Remove-extensive-debug-output.patch 0012-Increase-min_ports-upper-limit-to-1024.patch +0013-set-port-to-disabled-state-during-removal.patch +0014-dont-move-the-port-state-from-disabled-when-admin-state-is-down.patch From f409b3dc1667538408fbd0477f4bf8ddacd55bba Mon Sep 17 00:00:00 2001 From: jcaiMR <111116206+jcaiMR@users.noreply.github.com> Date: Sun, 26 Mar 2023 20:21:37 +0800 Subject: [PATCH 042/193] change static rt expiry timer max value (#14397) Why I did it Change static route expiry timer max timeout value from 1800 to 172800. To keep same value range as defined in sonic-restapi/sonic_api.yaml How I did it How to verify it apply change to bgpcfd, restart bgp container see if the value take action. --- src/sonic-bgpcfgd/bgpcfgd/static_rt_timer.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/sonic-bgpcfgd/bgpcfgd/static_rt_timer.py b/src/sonic-bgpcfgd/bgpcfgd/static_rt_timer.py index 060e7d59439c..a0e7d041382a 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 """ @@ -55,4 +56,5 @@ def run(self): else: time.sleep(self.DEFAULT_SLEEP) if time.time() - self.start >= self.DEFAULT_TIMER: - self.alarm() \ No newline at end of file + self.alarm() + From 735e35f179698664251e9de92f7909b8fdbf9455 Mon Sep 17 00:00:00 2001 From: mssonicbld <79238446+mssonicbld@users.noreply.github.com> Date: Thu, 20 Apr 2023 02:10:54 +0800 Subject: [PATCH 043/193] [submodule] Update submodule sonic-utilities to the latest HEAD automatically (#14713) src/sonic-utilities * fdea806d - (HEAD -> 202205, origin/202205) [route_check] fix IPv6 address handling (#2799) (9 hours ago) [Stepan Blyshc --- src/sonic-utilities | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/sonic-utilities b/src/sonic-utilities index ea1d849adb4c..fdea806d0a68 160000 --- a/src/sonic-utilities +++ b/src/sonic-utilities @@ -1 +1 @@ -Subproject commit ea1d849adb4c20d25ccf261c476c7a4e8cbbf178 +Subproject commit fdea806d0a68ad8f8aaac670cf4d13f000afa489 From 2cad50372aa112678f2d796e49a4e8e2a8694548 Mon Sep 17 00:00:00 2001 From: jcaiMR <111116206+jcaiMR@users.noreply.github.com> Date: Thu, 20 Apr 2023 04:17:15 +0800 Subject: [PATCH 044/193] [cherry-pick] 202205 advance dhcprelay to 67a3bdf (#14507) * advance dhcprelay to 67a3bdf * checkout dhcprelay version to 67a3bdf --- src/dhcprelay | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/dhcprelay b/src/dhcprelay index 4bf1868dcf3f..67a3bdf12e7d 160000 --- a/src/dhcprelay +++ b/src/dhcprelay @@ -1 +1 @@ -Subproject commit 4bf1868dcf3f77edfd298950e6c8826d24be8118 +Subproject commit 67a3bdf12e7d24260bf114c46da033e2be5f57cd From 96affcc0df9c1c7ff176eb201489df54de7a17e6 Mon Sep 17 00:00:00 2001 From: mssonicbld <79238446+mssonicbld@users.noreply.github.com> Date: Thu, 20 Apr 2023 05:21:17 +0800 Subject: [PATCH 045/193] Add monit_snmp file to monitor memory usage (#14464) (#14730) --- dockers/docker-snmp/base_image_files/monit_snmp | 5 +++++ rules/docker-snmp.mk | 1 + 2 files changed, 6 insertions(+) create mode 100644 dockers/docker-snmp/base_image_files/monit_snmp diff --git a/dockers/docker-snmp/base_image_files/monit_snmp b/dockers/docker-snmp/base_image_files/monit_snmp new file mode 100644 index 000000000000..979e3c60d682 --- /dev/null +++ b/dockers/docker-snmp/base_image_files/monit_snmp @@ -0,0 +1,5 @@ +############################################################################### +## Monit configuration for snmp container +############################################################################### +check program container_memory_snmp with path "/usr/bin/memory_checker snmp 4294967296" + if status == 3 for 10 times within 20 cycles then exec "/usr/bin/docker exec snmp supervisorctl restart snmp-subagent" diff --git a/rules/docker-snmp.mk b/rules/docker-snmp.mk index e0f7719c6034..047c8c59925e 100644 --- a/rules/docker-snmp.mk +++ b/rules/docker-snmp.mk @@ -31,6 +31,7 @@ $(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 SONIC_BULLSEYE_DOCKERS += $(DOCKER_SNMP) SONIC_BULLSEYE_DBG_DOCKERS += $(DOCKER_SNMP_DBG) From 7cc8c76f0f5f5e3ca59184fbd39c6e5336268ed6 Mon Sep 17 00:00:00 2001 From: mssonicbld <79238446+mssonicbld@users.noreply.github.com> Date: Thu, 20 Apr 2023 05:47:12 +0800 Subject: [PATCH 046/193] Increase wait_for_tunnel() timeout to 90s (#14279) (#14733) --- 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 745b9c503d20..13009922f577 100755 --- a/files/scripts/write_standby.py +++ b/files/scripts/write_standby.py @@ -136,7 +136,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=60): + def wait_for_tunnel(self, interval=1, timeout=90): """ Waits until the IP-in-IP tunnel has been created From 01311046cabc3681b00242f700843f883944ff7f Mon Sep 17 00:00:00 2001 From: mssonicbld <79238446+mssonicbld@users.noreply.github.com> Date: Thu, 20 Apr 2023 05:56:32 +0800 Subject: [PATCH 047/193] [devices/arista]: Added recycle ports required for egress mirroring (#13967) (#14731) --- .../jr2-a7280cr3-32d4-40x100G.config.bcm | 95 +++++++++++-------- .../0/j2p-a7800r3a-36d-36x400G.config.bcm | 40 ++++++++ .../1/j2p-a7800r3a-36d-36x400G.config.bcm | 40 ++++++++ .../0/j2p-a7800r3a-36d-36x400G.config.bcm | 40 ++++++++ .../1/j2p-a7800r3a-36d-36x400G.config.bcm | 40 ++++++++ .../0/j2p-a7800r3a-36d-36x400G.config.bcm | 40 ++++++++ .../1/j2p-a7800r3a-36d-36x400G.config.bcm | 40 ++++++++ src/sonic-device-data/tests/config_checker | 2 + 8 files changed, 297 insertions(+), 40 deletions(-) diff --git a/device/arista/x86_64-arista_7800r3_48cq2_lc/Arista-7800R3-48CQ2-C48/jr2-a7280cr3-32d4-40x100G.config.bcm b/device/arista/x86_64-arista_7800r3_48cq2_lc/Arista-7800R3-48CQ2-C48/jr2-a7280cr3-32d4-40x100G.config.bcm index e1c370b80907..e9ffad64773c 100644 --- a/device/arista/x86_64-arista_7800r3_48cq2_lc/Arista-7800R3-48CQ2-C48/jr2-a7280cr3-32d4-40x100G.config.bcm +++ b/device/arista/x86_64-arista_7800r3_48cq2_lc/Arista-7800R3-48CQ2-C48/jr2-a7280cr3-32d4-40x100G.config.bcm @@ -426,46 +426,61 @@ port_init_speed_cc.BCM8869X=200000 port_init_speed_cd.BCM8869X=400000 port_init_speed_il.BCM8869X=10312 -#ucode_port_100.BCM8869X=RCY_MIRROR.0:core_0.100 -#ucode_port_101.BCM8869X=RCY_MIRROR.1:core_0.101 -#ucode_port_102.BCM8869X=RCY_MIRROR.2:core_0.102 -#ucode_port_103.BCM8869X=RCY_MIRROR.3:core_0.103 -#ucode_port_104.BCM8869X=RCY_MIRROR.4:core_0.104 -#ucode_port_105.BCM8869X=RCY_MIRROR.5:core_0.105 -#ucode_port_106.BCM8869X=RCY_MIRROR.6:core_0.106 -#ucode_port_107.BCM8869X=RCY_MIRROR.7:core_0.107 -#ucode_port_108.BCM8869X=RCY_MIRROR.8:core_0.108 -#ucode_port_109.BCM8869X=RCY_MIRROR.9:core_0.109 -#ucode_port_110.BCM8869X=RCY_MIRROR.10:core_0.110 -#ucode_port_111.BCM8869X=RCY_MIRROR.11:core_0.111 -#ucode_port_112.BCM8869X=RCY_MIRROR.12:core_0.112 -#ucode_port_113.BCM8869X=RCY_MIRROR.13:core_0.113 -#ucode_port_114.BCM8869X=RCY_MIRROR.14:core_0.114 -#ucode_port_115.BCM8869X=RCY_MIRROR.15:core_0.115 -#ucode_port_116.BCM8869X=RCY_MIRROR.16:core_0.116 -#ucode_port_117.BCM8869X=RCY_MIRROR.17:core_0.117 -#ucode_port_118.BCM8869X=RCY_MIRROR.18:core_0.118 -#ucode_port_119.BCM8869X=RCY_MIRROR.19:core_0.119 -#ucode_port_120.BCM8869X=RCY_MIRROR.0:core_1.120 -#ucode_port_121.BCM8869X=RCY_MIRROR.1:core_1.121 -#ucode_port_122.BCM8869X=RCY_MIRROR.2:core_1.122 -#ucode_port_123.BCM8869X=RCY_MIRROR.3:core_1.123 -#ucode_port_124.BCM8869X=RCY_MIRROR.4:core_1.124 -#ucode_port_125.BCM8869X=RCY_MIRROR.5:core_1.125 -#ucode_port_126.BCM8869X=RCY_MIRROR.6:core_1.126 -#ucode_port_127.BCM8869X=RCY_MIRROR.7:core_1.127 -#ucode_port_128.BCM8869X=RCY_MIRROR.8:core_1.128 -#ucode_port_129.BCM8869X=RCY_MIRROR.9:core_1.129 -#ucode_port_130.BCM8869X=RCY_MIRROR.10:core_1.130 -#ucode_port_131.BCM8869X=RCY_MIRROR.11:core_1.131 -#ucode_port_132.BCM8869X=RCY_MIRROR.12:core_1.132 -#ucode_port_133.BCM8869X=RCY_MIRROR.13:core_1.133 -#ucode_port_134.BCM8869X=RCY_MIRROR.14:core_1.134 -#ucode_port_135.BCM8869X=RCY_MIRROR.15:core_1.135 -#ucode_port_136.BCM8869X=RCY_MIRROR.16:core_1.136 -#ucode_port_137.BCM8869X=RCY_MIRROR.17:core_1.137 -#ucode_port_138.BCM8869X=RCY_MIRROR.18:core_1.138 -#ucode_port_139.BCM8869X=RCY_MIRROR.19:core_1.139 +ucode_port_100.BCM8869X=RCY_MIRROR.0:core_0.100 +ucode_port_101.BCM8869X=RCY_MIRROR.1:core_0.101 +ucode_port_102.BCM8869X=RCY_MIRROR.2:core_0.102 +ucode_port_103.BCM8869X=RCY_MIRROR.3:core_0.103 +ucode_port_104.BCM8869X=RCY_MIRROR.4:core_0.104 +ucode_port_105.BCM8869X=RCY_MIRROR.5:core_0.105 +ucode_port_106.BCM8869X=RCY_MIRROR.6:core_0.106 +ucode_port_107.BCM8869X=RCY_MIRROR.7:core_0.107 +ucode_port_108.BCM8869X=RCY_MIRROR.8:core_0.108 +ucode_port_109.BCM8869X=RCY_MIRROR.9:core_0.109 +ucode_port_110.BCM8869X=RCY_MIRROR.10:core_0.110 +ucode_port_111.BCM8869X=RCY_MIRROR.11:core_0.111 +ucode_port_112.BCM8869X=RCY_MIRROR.12:core_0.112 +ucode_port_113.BCM8869X=RCY_MIRROR.13:core_0.113 +ucode_port_114.BCM8869X=RCY_MIRROR.14:core_0.114 +ucode_port_115.BCM8869X=RCY_MIRROR.15:core_0.115 +ucode_port_116.BCM8869X=RCY_MIRROR.16:core_0.116 +ucode_port_117.BCM8869X=RCY_MIRROR.17:core_0.117 +ucode_port_118.BCM8869X=RCY_MIRROR.18:core_0.118 +ucode_port_119.BCM8869X=RCY_MIRROR.19:core_0.119 +ucode_port_120.BCM8869X=RCY_MIRROR.0:core_1.120 +ucode_port_121.BCM8869X=RCY_MIRROR.1:core_1.121 +ucode_port_122.BCM8869X=RCY_MIRROR.2:core_1.122 +ucode_port_123.BCM8869X=RCY_MIRROR.3:core_1.123 +ucode_port_124.BCM8869X=RCY_MIRROR.4:core_1.124 +ucode_port_125.BCM8869X=RCY_MIRROR.5:core_1.125 +ucode_port_126.BCM8869X=RCY_MIRROR.6:core_1.126 +ucode_port_127.BCM8869X=RCY_MIRROR.7:core_1.127 +ucode_port_128.BCM8869X=RCY_MIRROR.8:core_1.128 +ucode_port_129.BCM8869X=RCY_MIRROR.9:core_1.129 +ucode_port_130.BCM8869X=RCY_MIRROR.10:core_1.130 +ucode_port_131.BCM8869X=RCY_MIRROR.11:core_1.131 +ucode_port_132.BCM8869X=RCY_MIRROR.12:core_1.132 +ucode_port_133.BCM8869X=RCY_MIRROR.13:core_1.133 +ucode_port_134.BCM8869X=RCY_MIRROR.14:core_1.134 +ucode_port_135.BCM8869X=RCY_MIRROR.15:core_1.135 +ucode_port_136.BCM8869X=RCY_MIRROR.16:core_1.136 +ucode_port_137.BCM8869X=RCY_MIRROR.17:core_1.137 +ucode_port_138.BCM8869X=RCY_MIRROR.18:core_1.138 +ucode_port_139.BCM8869X=RCY_MIRROR.19:core_1.139 +ucode_port_140.BCM8869X=RCY_MIRROR.20:core_0.130 +ucode_port_141.BCM8869X=RCY_MIRROR.21:core_0.131 +ucode_port_142.BCM8869X=RCY_MIRROR.22:core_0.132 +ucode_port_143.BCM8869X=RCY_MIRROR.23:core_0.133 +ucode_port_144.BCM8869X=RCY_MIRROR.24:core_0.134 +ucode_port_145.BCM8869X=RCY_MIRROR.25:core_0.135 +ucode_port_146.BCM8869X=RCY_MIRROR.20:core_1.142 +ucode_port_147.BCM8869X=RCY_MIRROR.21:core_1.143 +ucode_port_148.BCM8869X=RCY_MIRROR.22:core_1.144 +ucode_port_149.BCM8869X=RCY_MIRROR.23:core_1.145 +ucode_port_150.BCM8869X=RCY_MIRROR.24:core_1.140 +ucode_port_151.BCM8869X=RCY_MIRROR.26:core_1.141 +ucode_port_152.BCM8869X=RCY_MIRROR.27:core_0.136 +ucode_port_153.BCM8869X=RCY_MIRROR.28:core_0.137 +ucode_port_154.BCM8869X=RCY_MIRROR.27:core_1.142 port_priorities.BCM8869X=8 diff --git a/device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-C36/0/j2p-a7800r3a-36d-36x400G.config.bcm b/device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-C36/0/j2p-a7800r3a-36d-36x400G.config.bcm index f0a819b56356..3ffb6b93ee08 100644 --- a/device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-C36/0/j2p-a7800r3a-36d-36x400G.config.bcm +++ b/device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-C36/0/j2p-a7800r3a-36d-36x400G.config.bcm @@ -261,6 +261,46 @@ tm_port_header_type_out_50=ETH tm_port_header_type_in_50=ETH port_init_speed_49=400000 port_init_speed_50=400000 +ucode_port_100.BCM8885X=RCY_MIRROR.0:core_0.100 +ucode_port_101.BCM8885X=RCY_MIRROR.1:core_0.101 +ucode_port_102.BCM8885X=RCY_MIRROR.2:core_0.102 +ucode_port_103.BCM8885X=RCY_MIRROR.3:core_0.103 +ucode_port_104.BCM8885X=RCY_MIRROR.4:core_0.104 +ucode_port_105.BCM8885X=RCY_MIRROR.5:core_0.105 +ucode_port_106.BCM8885X=RCY_MIRROR.6:core_0.106 +ucode_port_107.BCM8885X=RCY_MIRROR.7:core_0.107 +ucode_port_108.BCM8885X=RCY_MIRROR.8:core_0.108 +ucode_port_109.BCM8885X=RCY_MIRROR.9:core_0.109 +ucode_port_110.BCM8885X=RCY_MIRROR.10:core_0.110 +ucode_port_111.BCM8885X=RCY_MIRROR.11:core_0.111 +ucode_port_112.BCM8885X=RCY_MIRROR.12:core_0.112 +ucode_port_113.BCM8885X=RCY_MIRROR.13:core_0.113 +ucode_port_114.BCM8885X=RCY_MIRROR.14:core_0.114 +ucode_port_115.BCM8885X=RCY_MIRROR.15:core_0.115 +ucode_port_116.BCM8885X=RCY_MIRROR.16:core_0.116 +ucode_port_117.BCM8885X=RCY_MIRROR.17:core_0.117 +ucode_port_118.BCM8885X=RCY_MIRROR.18:core_0.118 +ucode_port_119.BCM8885X=RCY_MIRROR.19:core_0.119 +ucode_port_120.BCM8885X=RCY_MIRROR.0:core_1.120 +ucode_port_121.BCM8885X=RCY_MIRROR.1:core_1.121 +ucode_port_122.BCM8885X=RCY_MIRROR.2:core_1.122 +ucode_port_123.BCM8885X=RCY_MIRROR.3:core_1.123 +ucode_port_124.BCM8885X=RCY_MIRROR.4:core_1.124 +ucode_port_125.BCM8885X=RCY_MIRROR.5:core_1.125 +ucode_port_126.BCM8885X=RCY_MIRROR.6:core_1.126 +ucode_port_127.BCM8885X=RCY_MIRROR.7:core_1.127 +ucode_port_128.BCM8885X=RCY_MIRROR.8:core_1.128 +ucode_port_129.BCM8885X=RCY_MIRROR.9:core_1.129 +ucode_port_130.BCM8885X=RCY_MIRROR.10:core_1.130 +ucode_port_131.BCM8885X=RCY_MIRROR.11:core_1.131 +ucode_port_132.BCM8885X=RCY_MIRROR.12:core_1.132 +ucode_port_133.BCM8885X=RCY_MIRROR.13:core_1.133 +ucode_port_134.BCM8885X=RCY_MIRROR.14:core_1.134 +ucode_port_135.BCM8885X=RCY_MIRROR.15:core_1.135 +ucode_port_136.BCM8885X=RCY_MIRROR.16:core_1.136 +ucode_port_137.BCM8885X=RCY_MIRROR.17:core_1.137 +ucode_port_138.BCM8885X=RCY_MIRROR.18:core_1.138 +ucode_port_139.BCM8885X=RCY_MIRROR.19:core_1.139 #OLP port tm_port_header_type_in_240=INJECTED_2 diff --git a/device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-C36/1/j2p-a7800r3a-36d-36x400G.config.bcm b/device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-C36/1/j2p-a7800r3a-36d-36x400G.config.bcm index eda77e49d90d..d2509fd6b6c0 100644 --- a/device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-C36/1/j2p-a7800r3a-36d-36x400G.config.bcm +++ b/device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-C36/1/j2p-a7800r3a-36d-36x400G.config.bcm @@ -261,6 +261,46 @@ tm_port_header_type_out_50=ETH tm_port_header_type_in_50=ETH port_init_speed_49=400000 port_init_speed_50=400000 +ucode_port_100.BCM8885X=RCY_MIRROR.0:core_0.100 +ucode_port_101.BCM8885X=RCY_MIRROR.1:core_0.101 +ucode_port_102.BCM8885X=RCY_MIRROR.2:core_0.102 +ucode_port_103.BCM8885X=RCY_MIRROR.3:core_0.103 +ucode_port_104.BCM8885X=RCY_MIRROR.4:core_0.104 +ucode_port_105.BCM8885X=RCY_MIRROR.5:core_0.105 +ucode_port_106.BCM8885X=RCY_MIRROR.6:core_0.106 +ucode_port_107.BCM8885X=RCY_MIRROR.7:core_0.107 +ucode_port_108.BCM8885X=RCY_MIRROR.8:core_0.108 +ucode_port_109.BCM8885X=RCY_MIRROR.9:core_0.109 +ucode_port_110.BCM8885X=RCY_MIRROR.10:core_0.110 +ucode_port_111.BCM8885X=RCY_MIRROR.11:core_0.111 +ucode_port_112.BCM8885X=RCY_MIRROR.12:core_0.112 +ucode_port_113.BCM8885X=RCY_MIRROR.13:core_0.113 +ucode_port_114.BCM8885X=RCY_MIRROR.14:core_0.114 +ucode_port_115.BCM8885X=RCY_MIRROR.15:core_0.115 +ucode_port_116.BCM8885X=RCY_MIRROR.16:core_0.116 +ucode_port_117.BCM8885X=RCY_MIRROR.17:core_0.117 +ucode_port_118.BCM8885X=RCY_MIRROR.18:core_0.118 +ucode_port_119.BCM8885X=RCY_MIRROR.19:core_0.119 +ucode_port_120.BCM8885X=RCY_MIRROR.0:core_1.120 +ucode_port_121.BCM8885X=RCY_MIRROR.1:core_1.121 +ucode_port_122.BCM8885X=RCY_MIRROR.2:core_1.122 +ucode_port_123.BCM8885X=RCY_MIRROR.3:core_1.123 +ucode_port_124.BCM8885X=RCY_MIRROR.4:core_1.124 +ucode_port_125.BCM8885X=RCY_MIRROR.5:core_1.125 +ucode_port_126.BCM8885X=RCY_MIRROR.6:core_1.126 +ucode_port_127.BCM8885X=RCY_MIRROR.7:core_1.127 +ucode_port_128.BCM8885X=RCY_MIRROR.8:core_1.128 +ucode_port_129.BCM8885X=RCY_MIRROR.9:core_1.129 +ucode_port_130.BCM8885X=RCY_MIRROR.10:core_1.130 +ucode_port_131.BCM8885X=RCY_MIRROR.11:core_1.131 +ucode_port_132.BCM8885X=RCY_MIRROR.12:core_1.132 +ucode_port_133.BCM8885X=RCY_MIRROR.13:core_1.133 +ucode_port_134.BCM8885X=RCY_MIRROR.14:core_1.134 +ucode_port_135.BCM8885X=RCY_MIRROR.15:core_1.135 +ucode_port_136.BCM8885X=RCY_MIRROR.16:core_1.136 +ucode_port_137.BCM8885X=RCY_MIRROR.17:core_1.137 +ucode_port_138.BCM8885X=RCY_MIRROR.18:core_1.138 +ucode_port_139.BCM8885X=RCY_MIRROR.19:core_1.139 #OLP port tm_port_header_type_in_240=INJECTED_2 diff --git a/device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-C72/0/j2p-a7800r3a-36d-36x400G.config.bcm b/device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-C72/0/j2p-a7800r3a-36d-36x400G.config.bcm index 4abfdf83380e..188ba39d234c 100644 --- a/device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-C72/0/j2p-a7800r3a-36d-36x400G.config.bcm +++ b/device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-C72/0/j2p-a7800r3a-36d-36x400G.config.bcm @@ -279,6 +279,46 @@ tm_port_header_type_out_222=ETH tm_port_header_type_in_222=ETH port_init_speed_221=400000 port_init_speed_222=400000 +ucode_port_100.BCM8885X=RCY_MIRROR.0:core_0.100 +ucode_port_101.BCM8885X=RCY_MIRROR.1:core_0.101 +ucode_port_102.BCM8885X=RCY_MIRROR.2:core_0.102 +ucode_port_103.BCM8885X=RCY_MIRROR.3:core_0.103 +ucode_port_104.BCM8885X=RCY_MIRROR.4:core_0.104 +ucode_port_105.BCM8885X=RCY_MIRROR.5:core_0.105 +ucode_port_106.BCM8885X=RCY_MIRROR.6:core_0.106 +ucode_port_107.BCM8885X=RCY_MIRROR.7:core_0.107 +ucode_port_108.BCM8885X=RCY_MIRROR.8:core_0.108 +ucode_port_109.BCM8885X=RCY_MIRROR.9:core_0.109 +ucode_port_110.BCM8885X=RCY_MIRROR.10:core_0.110 +ucode_port_111.BCM8885X=RCY_MIRROR.11:core_0.111 +ucode_port_112.BCM8885X=RCY_MIRROR.12:core_0.112 +ucode_port_113.BCM8885X=RCY_MIRROR.13:core_0.113 +ucode_port_114.BCM8885X=RCY_MIRROR.14:core_0.114 +ucode_port_115.BCM8885X=RCY_MIRROR.15:core_0.115 +ucode_port_116.BCM8885X=RCY_MIRROR.16:core_0.116 +ucode_port_117.BCM8885X=RCY_MIRROR.17:core_0.117 +ucode_port_118.BCM8885X=RCY_MIRROR.18:core_0.118 +ucode_port_119.BCM8885X=RCY_MIRROR.19:core_0.119 +ucode_port_120.BCM8885X=RCY_MIRROR.0:core_1.120 +ucode_port_121.BCM8885X=RCY_MIRROR.1:core_1.121 +ucode_port_122.BCM8885X=RCY_MIRROR.2:core_1.122 +ucode_port_123.BCM8885X=RCY_MIRROR.3:core_1.123 +ucode_port_124.BCM8885X=RCY_MIRROR.4:core_1.124 +ucode_port_125.BCM8885X=RCY_MIRROR.5:core_1.125 +ucode_port_126.BCM8885X=RCY_MIRROR.6:core_1.126 +ucode_port_127.BCM8885X=RCY_MIRROR.7:core_1.127 +ucode_port_128.BCM8885X=RCY_MIRROR.8:core_1.128 +ucode_port_129.BCM8885X=RCY_MIRROR.9:core_1.129 +ucode_port_130.BCM8885X=RCY_MIRROR.10:core_1.130 +ucode_port_131.BCM8885X=RCY_MIRROR.11:core_1.131 +ucode_port_132.BCM8885X=RCY_MIRROR.12:core_1.132 +ucode_port_133.BCM8885X=RCY_MIRROR.13:core_1.133 +ucode_port_134.BCM8885X=RCY_MIRROR.14:core_1.134 +ucode_port_135.BCM8885X=RCY_MIRROR.15:core_1.135 +ucode_port_136.BCM8885X=RCY_MIRROR.16:core_1.136 +ucode_port_137.BCM8885X=RCY_MIRROR.17:core_1.137 +ucode_port_138.BCM8885X=RCY_MIRROR.18:core_1.138 +ucode_port_139.BCM8885X=RCY_MIRROR.19:core_1.139 #OLP port tm_port_header_type_in_240=INJECTED_2 diff --git a/device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-C72/1/j2p-a7800r3a-36d-36x400G.config.bcm b/device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-C72/1/j2p-a7800r3a-36d-36x400G.config.bcm index 9332a4cd460e..359a15e3f45f 100644 --- a/device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-C72/1/j2p-a7800r3a-36d-36x400G.config.bcm +++ b/device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-C72/1/j2p-a7800r3a-36d-36x400G.config.bcm @@ -279,6 +279,46 @@ tm_port_header_type_out_222=ETH tm_port_header_type_in_222=ETH port_init_speed_221=400000 port_init_speed_222=400000 +ucode_port_100.BCM8885X=RCY_MIRROR.0:core_0.100 +ucode_port_101.BCM8885X=RCY_MIRROR.1:core_0.101 +ucode_port_102.BCM8885X=RCY_MIRROR.2:core_0.102 +ucode_port_103.BCM8885X=RCY_MIRROR.3:core_0.103 +ucode_port_104.BCM8885X=RCY_MIRROR.4:core_0.104 +ucode_port_105.BCM8885X=RCY_MIRROR.5:core_0.105 +ucode_port_106.BCM8885X=RCY_MIRROR.6:core_0.106 +ucode_port_107.BCM8885X=RCY_MIRROR.7:core_0.107 +ucode_port_108.BCM8885X=RCY_MIRROR.8:core_0.108 +ucode_port_109.BCM8885X=RCY_MIRROR.9:core_0.109 +ucode_port_110.BCM8885X=RCY_MIRROR.10:core_0.110 +ucode_port_111.BCM8885X=RCY_MIRROR.11:core_0.111 +ucode_port_112.BCM8885X=RCY_MIRROR.12:core_0.112 +ucode_port_113.BCM8885X=RCY_MIRROR.13:core_0.113 +ucode_port_114.BCM8885X=RCY_MIRROR.14:core_0.114 +ucode_port_115.BCM8885X=RCY_MIRROR.15:core_0.115 +ucode_port_116.BCM8885X=RCY_MIRROR.16:core_0.116 +ucode_port_117.BCM8885X=RCY_MIRROR.17:core_0.117 +ucode_port_118.BCM8885X=RCY_MIRROR.18:core_0.118 +ucode_port_119.BCM8885X=RCY_MIRROR.19:core_0.119 +ucode_port_120.BCM8885X=RCY_MIRROR.0:core_1.120 +ucode_port_121.BCM8885X=RCY_MIRROR.1:core_1.121 +ucode_port_122.BCM8885X=RCY_MIRROR.2:core_1.122 +ucode_port_123.BCM8885X=RCY_MIRROR.3:core_1.123 +ucode_port_124.BCM8885X=RCY_MIRROR.4:core_1.124 +ucode_port_125.BCM8885X=RCY_MIRROR.5:core_1.125 +ucode_port_126.BCM8885X=RCY_MIRROR.6:core_1.126 +ucode_port_127.BCM8885X=RCY_MIRROR.7:core_1.127 +ucode_port_128.BCM8885X=RCY_MIRROR.8:core_1.128 +ucode_port_129.BCM8885X=RCY_MIRROR.9:core_1.129 +ucode_port_130.BCM8885X=RCY_MIRROR.10:core_1.130 +ucode_port_131.BCM8885X=RCY_MIRROR.11:core_1.131 +ucode_port_132.BCM8885X=RCY_MIRROR.12:core_1.132 +ucode_port_133.BCM8885X=RCY_MIRROR.13:core_1.133 +ucode_port_134.BCM8885X=RCY_MIRROR.14:core_1.134 +ucode_port_135.BCM8885X=RCY_MIRROR.15:core_1.135 +ucode_port_136.BCM8885X=RCY_MIRROR.16:core_1.136 +ucode_port_137.BCM8885X=RCY_MIRROR.17:core_1.137 +ucode_port_138.BCM8885X=RCY_MIRROR.18:core_1.138 +ucode_port_139.BCM8885X=RCY_MIRROR.19:core_1.139 #OLP port tm_port_header_type_in_240=INJECTED_2 diff --git a/device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-D36/0/j2p-a7800r3a-36d-36x400G.config.bcm b/device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-D36/0/j2p-a7800r3a-36d-36x400G.config.bcm index 2b41a32c7778..be5897e0efd4 100644 --- a/device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-D36/0/j2p-a7800r3a-36d-36x400G.config.bcm +++ b/device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-D36/0/j2p-a7800r3a-36d-36x400G.config.bcm @@ -261,6 +261,46 @@ tm_port_header_type_out_50=ETH tm_port_header_type_in_50=ETH port_init_speed_49=400000 port_init_speed_50=400000 +ucode_port_100.BCM8885X=RCY_MIRROR.0:core_0.100 +ucode_port_101.BCM8885X=RCY_MIRROR.1:core_0.101 +ucode_port_102.BCM8885X=RCY_MIRROR.2:core_0.102 +ucode_port_103.BCM8885X=RCY_MIRROR.3:core_0.103 +ucode_port_104.BCM8885X=RCY_MIRROR.4:core_0.104 +ucode_port_105.BCM8885X=RCY_MIRROR.5:core_0.105 +ucode_port_106.BCM8885X=RCY_MIRROR.6:core_0.106 +ucode_port_107.BCM8885X=RCY_MIRROR.7:core_0.107 +ucode_port_108.BCM8885X=RCY_MIRROR.8:core_0.108 +ucode_port_109.BCM8885X=RCY_MIRROR.9:core_0.109 +ucode_port_110.BCM8885X=RCY_MIRROR.10:core_0.110 +ucode_port_111.BCM8885X=RCY_MIRROR.11:core_0.111 +ucode_port_112.BCM8885X=RCY_MIRROR.12:core_0.112 +ucode_port_113.BCM8885X=RCY_MIRROR.13:core_0.113 +ucode_port_114.BCM8885X=RCY_MIRROR.14:core_0.114 +ucode_port_115.BCM8885X=RCY_MIRROR.15:core_0.115 +ucode_port_116.BCM8885X=RCY_MIRROR.16:core_0.116 +ucode_port_117.BCM8885X=RCY_MIRROR.17:core_0.117 +ucode_port_118.BCM8885X=RCY_MIRROR.18:core_0.118 +ucode_port_119.BCM8885X=RCY_MIRROR.19:core_0.119 +ucode_port_120.BCM8885X=RCY_MIRROR.0:core_1.120 +ucode_port_121.BCM8885X=RCY_MIRROR.1:core_1.121 +ucode_port_122.BCM8885X=RCY_MIRROR.2:core_1.122 +ucode_port_123.BCM8885X=RCY_MIRROR.3:core_1.123 +ucode_port_124.BCM8885X=RCY_MIRROR.4:core_1.124 +ucode_port_125.BCM8885X=RCY_MIRROR.5:core_1.125 +ucode_port_126.BCM8885X=RCY_MIRROR.6:core_1.126 +ucode_port_127.BCM8885X=RCY_MIRROR.7:core_1.127 +ucode_port_128.BCM8885X=RCY_MIRROR.8:core_1.128 +ucode_port_129.BCM8885X=RCY_MIRROR.9:core_1.129 +ucode_port_130.BCM8885X=RCY_MIRROR.10:core_1.130 +ucode_port_131.BCM8885X=RCY_MIRROR.11:core_1.131 +ucode_port_132.BCM8885X=RCY_MIRROR.12:core_1.132 +ucode_port_133.BCM8885X=RCY_MIRROR.13:core_1.133 +ucode_port_134.BCM8885X=RCY_MIRROR.14:core_1.134 +ucode_port_135.BCM8885X=RCY_MIRROR.15:core_1.135 +ucode_port_136.BCM8885X=RCY_MIRROR.16:core_1.136 +ucode_port_137.BCM8885X=RCY_MIRROR.17:core_1.137 +ucode_port_138.BCM8885X=RCY_MIRROR.18:core_1.138 +ucode_port_139.BCM8885X=RCY_MIRROR.19:core_1.139 #OLP port tm_port_header_type_in_240=INJECTED_2 diff --git a/device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-D36/1/j2p-a7800r3a-36d-36x400G.config.bcm b/device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-D36/1/j2p-a7800r3a-36d-36x400G.config.bcm index e52350eaa4b1..b197a426eb98 100644 --- a/device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-D36/1/j2p-a7800r3a-36d-36x400G.config.bcm +++ b/device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-D36/1/j2p-a7800r3a-36d-36x400G.config.bcm @@ -261,6 +261,46 @@ tm_port_header_type_out_50=ETH tm_port_header_type_in_50=ETH port_init_speed_49=400000 port_init_speed_50=400000 +ucode_port_100.BCM8885X=RCY_MIRROR.0:core_0.100 +ucode_port_101.BCM8885X=RCY_MIRROR.1:core_0.101 +ucode_port_102.BCM8885X=RCY_MIRROR.2:core_0.102 +ucode_port_103.BCM8885X=RCY_MIRROR.3:core_0.103 +ucode_port_104.BCM8885X=RCY_MIRROR.4:core_0.104 +ucode_port_105.BCM8885X=RCY_MIRROR.5:core_0.105 +ucode_port_106.BCM8885X=RCY_MIRROR.6:core_0.106 +ucode_port_107.BCM8885X=RCY_MIRROR.7:core_0.107 +ucode_port_108.BCM8885X=RCY_MIRROR.8:core_0.108 +ucode_port_109.BCM8885X=RCY_MIRROR.9:core_0.109 +ucode_port_110.BCM8885X=RCY_MIRROR.10:core_0.110 +ucode_port_111.BCM8885X=RCY_MIRROR.11:core_0.111 +ucode_port_112.BCM8885X=RCY_MIRROR.12:core_0.112 +ucode_port_113.BCM8885X=RCY_MIRROR.13:core_0.113 +ucode_port_114.BCM8885X=RCY_MIRROR.14:core_0.114 +ucode_port_115.BCM8885X=RCY_MIRROR.15:core_0.115 +ucode_port_116.BCM8885X=RCY_MIRROR.16:core_0.116 +ucode_port_117.BCM8885X=RCY_MIRROR.17:core_0.117 +ucode_port_118.BCM8885X=RCY_MIRROR.18:core_0.118 +ucode_port_119.BCM8885X=RCY_MIRROR.19:core_0.119 +ucode_port_120.BCM8885X=RCY_MIRROR.0:core_1.120 +ucode_port_121.BCM8885X=RCY_MIRROR.1:core_1.121 +ucode_port_122.BCM8885X=RCY_MIRROR.2:core_1.122 +ucode_port_123.BCM8885X=RCY_MIRROR.3:core_1.123 +ucode_port_124.BCM8885X=RCY_MIRROR.4:core_1.124 +ucode_port_125.BCM8885X=RCY_MIRROR.5:core_1.125 +ucode_port_126.BCM8885X=RCY_MIRROR.6:core_1.126 +ucode_port_127.BCM8885X=RCY_MIRROR.7:core_1.127 +ucode_port_128.BCM8885X=RCY_MIRROR.8:core_1.128 +ucode_port_129.BCM8885X=RCY_MIRROR.9:core_1.129 +ucode_port_130.BCM8885X=RCY_MIRROR.10:core_1.130 +ucode_port_131.BCM8885X=RCY_MIRROR.11:core_1.131 +ucode_port_132.BCM8885X=RCY_MIRROR.12:core_1.132 +ucode_port_133.BCM8885X=RCY_MIRROR.13:core_1.133 +ucode_port_134.BCM8885X=RCY_MIRROR.14:core_1.134 +ucode_port_135.BCM8885X=RCY_MIRROR.15:core_1.135 +ucode_port_136.BCM8885X=RCY_MIRROR.16:core_1.136 +ucode_port_137.BCM8885X=RCY_MIRROR.17:core_1.137 +ucode_port_138.BCM8885X=RCY_MIRROR.18:core_1.138 +ucode_port_139.BCM8885X=RCY_MIRROR.19:core_1.139 #OLP port tm_port_header_type_in_240=INJECTED_2 diff --git a/src/sonic-device-data/tests/config_checker b/src/sonic-device-data/tests/config_checker index 76fdde17d288..f7198bd8febb 100755 --- a/src/sonic-device-data/tests/config_checker +++ b/src/sonic-device-data/tests/config_checker @@ -35,6 +35,8 @@ def check_file(file_name): # Remove trailing chip name "bcm8869x" p = re.sub(r"\.bcm8869x(_adapter|_[a-z]\d)?$", "", p) + # Remove trailing chip name "bcm8885x" + p = re.sub(r"\.bcm8885x(_adapter|_[a-z]\d)?$", "", p) # Remove trailing unit ".$" p = re.sub(r"\.[0-9]+$", '', p) # Remove trailing port name From b41fe29a84225db1d29f04bb5026c2e437da185b Mon Sep 17 00:00:00 2001 From: mssonicbld <79238446+mssonicbld@users.noreply.github.com> Date: Thu, 20 Apr 2023 06:05:31 +0800 Subject: [PATCH 048/193] [Build] Support to use the snapshot mirror for debian base image (#14474) (#14728) Why I did it [Build] Support to use the snapshot mirror for debian base image How I did it If the MIRROR_SNAPSHOT=n, then use the default mirror http://deb.debian.org/debian If the MIRROR_SNAPSHOT=y, then use the snapshot mirror, for instance http://packages.trafficmanager.net/snapshot/debian/20230330T000330Z/. How to verify it + scripts/build_debian_base_system.sh amd64 bullseye ./fsroot-vs I: Target architecture can be executed I: Retrieving InRelease I: Checking Release signature I: Valid Release signature (key id A4285295FC7B1A81600062A9605C66F00D6C9793) I: Retrieving Packages I: Validating Packages I: Resolving dependencies of required packages... I: Resolving dependencies of base packages... I: Checking component main on http://packages.trafficmanager.net/snapshot/debian/20230331T000125Z... I: Retrieving libacl1 2.2.53-10 Co-authored-by: xumia <59720581+xumia@users.noreply.github.com> --- scripts/build_debian_base_system.sh | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/scripts/build_debian_base_system.sh b/scripts/build_debian_base_system.sh index a403791e5242..0bb30581e21e 100755 --- a/scripts/build_debian_base_system.sh +++ b/scripts/build_debian_base_system.sh @@ -21,6 +21,12 @@ generate_version_file() sudo LANG=C chroot $FILESYSTEM_ROOT /bin/bash -c "dpkg-query -W -f '\${Package}==\${Version}\n'" > $TARGET_BASEIMAGE_PATH/versions-deb-${IMAGE_DISTRO}-${CONFIGURED_ARCH} } +MIRROR_URL=http://deb.debian.org/debian +if [ "$MIRROR_SNAPSHOT" == y ]; then + SNAPSHOT_TIMESTAMP=$(grep "^debian==" $TARGET/versions/default/versions-mirror | tail -n 1 | sed 's/.*==//') + MIRROR_URL=http://packages.trafficmanager.net/snapshot/debian/$SNAPSHOT_TIMESTAMP +fi + if [ "$ENABLE_VERSION_CONTROL_DEB" != "y" ] || [ ! -d files/build/versions/host-base-image ]; then if [[ $CONFIGURED_ARCH == armhf || $CONFIGURED_ARCH == arm64 ]]; then if [ $MULTIARCH_QEMU_ENVIRON == "y" ]; then @@ -28,13 +34,13 @@ if [ "$ENABLE_VERSION_CONTROL_DEB" != "y" ] || [ ! -d files/build/versions/host- 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 --foreign --variant=minbase --arch $CONFIGURED_ARCH $IMAGE_DISTRO $FILESYSTEM_ROOT http://deb.debian.org/debian + sudo http_proxy=$HTTP_PROXY SKIP_BUILD_HOOK=y debootstrap --foreign --variant=minbase --arch $CONFIGURED_ARCH $IMAGE_DISTRO $FILESYSTEM_ROOT "$MIRROR_URL" sudo rm $FILESYSTEM_ROOT/proc -rf sudo mkdir $FILESYSTEM_ROOT/proc sudo mount -t proc proc $FILESYSTEM_ROOT/proc sudo LANG=C chroot $FILESYSTEM_ROOT /debootstrap/debootstrap --second-stage 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 + sudo http_proxy=$HTTP_PROXY SKIP_BUILD_HOOK=y debootstrap --variant=minbase --arch $CONFIGURED_ARCH $IMAGE_DISTRO $FILESYSTEM_ROOT "$MIRROR_URL" fi RET=$? if [ $RET -ne 0 ]; then From 4a6322d0ddc9817d05c4f751dedefdd36faf59e2 Mon Sep 17 00:00:00 2001 From: mssonicbld <79238446+mssonicbld@users.noreply.github.com> Date: Thu, 20 Apr 2023 06:06:21 +0800 Subject: [PATCH 049/193] [Ci] Fix the wrong SONIC_BUILD_JOBS build variable used issue in Azp (#14071) (#14729) 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. Co-authored-by: xumia <59720581+xumia@users.noreply.github.com> --- .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 d4d2c96e1c61..1311ab0608c9 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 4b7bd90e47b21c3936661f31e614ed1931633132 Mon Sep 17 00:00:00 2001 From: mssonicbld <79238446+mssonicbld@users.noreply.github.com> Date: Thu, 20 Apr 2023 06:07:16 +0800 Subject: [PATCH 050/193] Fix backend port channels and routes being displayed (#14479) (#14734) --- .../sonic_py_common/multi_asic.py | 19 +++++++++---------- 1 file changed, 9 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 15edeefe5dc0..0dc2ef97682b 100644 --- a/src/sonic-py-common/sonic_py_common/multi_asic.py +++ b/src/sonic-py-common/sonic_py_common/multi_asic.py @@ -18,7 +18,7 @@ INTERNAL_PORT = 'Int' INBAND_PORT = 'Inb' RECIRC_PORT ='Rec' -PORT_CHANNEL_CFG_DB_TABLE = 'PORTCHANNEL' +PORT_CHANNEL_MEMBER_CFG_DB_TABLE = 'PORTCHANNEL_MEMBER' PORT_CFG_DB_TABLE = 'PORT' BGP_NEIGH_CFG_DB_TABLE = 'BGP_NEIGHBOR' BGP_INTERNAL_NEIGH_CFG_DB_TABLE = 'BGP_INTERNAL_NEIGHBOR' @@ -355,13 +355,12 @@ 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_entry(PORT_CHANNEL_CFG_DB_TABLE, port_channel) + port_channel_members = config_db.get_keys(PORT_CHANNEL_MEMBER_CFG_DB_TABLE) - if port_channels: - if 'members' in port_channels: - members = port_channels['members'] - if is_port_internal(members[0], namespace): - return True + for port_channel_member in port_channel_members: + if port_channel_member[0] != port_channel: + continue + return is_port_internal(port_channel_member[1], namespace) return False @@ -381,14 +380,14 @@ def get_back_end_interface_set(namespace=None): ns_list = get_namespace_list(namespace) 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_channel_members = config_db.get_keys(PORT_CHANNEL_MEMBER_CFG_DB_TABLE) # a back-end LAG must be configured with all of its member from back-end interfaces. # mixing back-end and front-end interfaces is miss configuration and not allowed. # To determine if a LAG is back-end LAG, just need to check its first member is back-end or not # is sufficient. Note that a user defined LAG may have empty members so the list expansion logic # need to ensure there are members before inspecting member[0]. - bk_end_intf_list.extend([port_channel for port_channel, lag_info in port_channels.items()\ - if 'members' in lag_info and lag_info['members'][0] in bk_end_intf_list]) + bk_end_intf_list.extend(set([port_channel_member[0] for port_channel_member in port_channel_members\ + if port_channel_member[1] in bk_end_intf_list])) a = set() a.update(bk_end_intf_list) return a From d2f5317c02af4e9821c7bb9de5f7ecff6fb1f633 Mon Sep 17 00:00:00 2001 From: mssonicbld <79238446+mssonicbld@users.noreply.github.com> Date: Thu, 20 Apr 2023 06:43:37 +0800 Subject: [PATCH 051/193] [yang]: Modify yang model to handle subport in PORT table (#14519) (#14727) --- src/sonic-yang-models/doc/Configuration.md | 4 ++-- .../tests/files/sample_config_db.json | 18 +++++++++--------- .../tests/yang_model_tests/tests/port.json | 8 ++++---- .../yang_model_tests/tests_config/port.json | 14 +++++++------- .../yang-models/sonic-port.yang | 4 ++-- 5 files changed, 24 insertions(+), 24 deletions(-) diff --git a/src/sonic-yang-models/doc/Configuration.md b/src/sonic-yang-models/doc/Configuration.md index 5dcb982c06d0..5dc65909c29f 100644 --- a/src/sonic-yang-models/doc/Configuration.md +++ b/src/sonic-yang-models/doc/Configuration.md @@ -1282,7 +1282,7 @@ optional attributes. "mtu": "9100", "alias": "etp1a", "speed": "100000", - "channel": 1 + "subport": 1 }, "Ethernet4": { "admin_status": "up", @@ -1292,7 +1292,7 @@ optional attributes. "mtu": "9100", "alias": "etp1b", "speed": "100000", - "channel": 2 + "subport": 2 }, } } diff --git a/src/sonic-yang-models/tests/files/sample_config_db.json b/src/sonic-yang-models/tests/files/sample_config_db.json index d4f5e9cd6470..a292b8e9193d 100644 --- a/src/sonic-yang-models/tests/files/sample_config_db.json +++ b/src/sonic-yang-models/tests/files/sample_config_db.json @@ -463,7 +463,7 @@ "autoneg": "on", "adv_speeds": "all", "adv_interface_types": "all", - "channel" : "0" + "subport" : "0" }, "Ethernet3": { "alias": "Eth1/4", @@ -472,7 +472,7 @@ "speed": "11100", "tpid": "0x88A8", "admin_status": "up", - "channel": "1" + "subport": "1" }, "Ethernet4": { "alias": "Eth2/1", @@ -481,7 +481,7 @@ "speed": "11100", "tpid": "0x9100", "admin_status": "up", - "channel": "2" + "subport": "2" }, "Ethernet5": { "alias": "Eth2/2", @@ -490,7 +490,7 @@ "speed": "11100", "tpid": "0x9200", "admin_status": "up", - "channel": "3" + "subport": "3" }, "Ethernet6": { "alias": "Eth2/3", @@ -499,7 +499,7 @@ "speed": "11100", "tpid": "0x8100", "admin_status": "up", - "channel": "4" + "subport": "4" }, "Ethernet7": { "alias": "Eth2/4", @@ -508,7 +508,7 @@ "speed": "11100", "tpid": "0x8100", "admin_status": "up", - "channel": "5" + "subport": "5" }, "Ethernet8": { "alias": "Eth3/1", @@ -517,7 +517,7 @@ "speed": "11100", "tpid": "0x8100", "admin_status": "up", - "channel": "6" + "subport": "6" }, "Ethernet9": { "alias": "Eth3/2", @@ -526,7 +526,7 @@ "speed": "11100", "tpid": "0x8100", "admin_status": "up", - "channel": "7" + "subport": "7" }, "Ethernet10": { "alias": "Eth3/3", @@ -535,7 +535,7 @@ "speed": "11100", "tpid": "0x8100", "admin_status": "up", - "channel": "8" + "subport": "8" }, "Ethernet11": { "alias": "Eth3/4", diff --git a/src/sonic-yang-models/tests/yang_model_tests/tests/port.json b/src/sonic-yang-models/tests/yang_model_tests/tests/port.json index a2331f03b8ba..c8a3ce102c25 100644 --- a/src/sonic-yang-models/tests/yang_model_tests/tests/port.json +++ b/src/sonic-yang-models/tests/yang_model_tests/tests/port.json @@ -115,11 +115,11 @@ "desc": "PORT_INVALID_MULTIASIC_TEST invalid role pattern, expect fail", "eStrKey": "Pattern" }, - "PORT_VALID_CHANNEL_NUMBER": { - "desc": "PORT_VALID_CHANNEL_NUMBER no failure." + "PORT_VALID_SUBPORT_NUMBER": { + "desc": "PORT_VALID_SUBPORT_NUMBER no failure." }, - "PORT_INVALID_CHANNEL_NUMBER": { - "desc": "Out of range channel number", + "PORT_INVALID_SUBPORT_NUMBER": { + "desc": "Out of range subport number", "eStrKey": "Range", "eStr": "0..8" } diff --git a/src/sonic-yang-models/tests/yang_model_tests/tests_config/port.json b/src/sonic-yang-models/tests/yang_model_tests/tests_config/port.json index 8b9c7a650bcc..7444040036e9 100644 --- a/src/sonic-yang-models/tests/yang_model_tests/tests_config/port.json +++ b/src/sonic-yang-models/tests/yang_model_tests/tests_config/port.json @@ -486,7 +486,7 @@ } }, - "PORT_INVALID_CHANNEL_NUMBER": { + "PORT_INVALID_SUBPORT_NUMBER": { "sonic-port:sonic-port": { "sonic-port:PORT": { "PORT_LIST": [ @@ -495,14 +495,14 @@ "alias": "etp1a", "lanes": "60, 61", "speed": 100000, - "channel": 9 + "subport": 9 } ] } } }, - "PORT_VALID_CHANNEL_NUMBER": { + "PORT_VALID_SUBPORT_NUMBER": { "sonic-port:sonic-port": { "sonic-port:PORT": { "PORT_LIST": [ @@ -511,28 +511,28 @@ "alias": "etp1a", "lanes": "60, 61", "speed": 100000, - "channel": 1 + "subport": 1 }, { "name": "Ethernet2", "alias": "etp1b", "lanes": "62, 63", "speed": 100000, - "channel": 2 + "subport": 2 }, { "name": "Ethernet4", "alias": "etp1c", "lanes": "64, 65", "speed": 100000, - "channel": 3 + "subport": 3 }, { "name": "Ethernet6", "alias": "etp1d", "lanes": "66, 67", "speed": 100000, - "channel": 4 + "subport": 4 } ] } diff --git a/src/sonic-yang-models/yang-models/sonic-port.yang b/src/sonic-yang-models/yang-models/sonic-port.yang index 6b87d6f839dc..1b9c6b14b5a9 100644 --- a/src/sonic-yang-models/yang-models/sonic-port.yang +++ b/src/sonic-yang-models/yang-models/sonic-port.yang @@ -121,8 +121,8 @@ module sonic-port{ } } - leaf channel { - description "Logical channel(s) for physical port breakout"; + leaf subport { + description "Logical subport(s) for physical port breakout"; type uint8 { range 0..8; } From a0da21f35e1939c8778cb265d98cc72259b7bd89 Mon Sep 17 00:00:00 2001 From: mssonicbld <79238446+mssonicbld@users.noreply.github.com> Date: Thu, 20 Apr 2023 08:45:13 +0800 Subject: [PATCH 052/193] Update golang version for telemetry build in sonic-slave-buster to fix (#14636) (#14735) --- 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 1d98e6d9b6c5..59bc7300dd00 100644 --- a/sonic-slave-jessie/Dockerfile.j2 +++ b/sonic-slave-jessie/Dockerfile.j2 @@ -261,7 +261,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 4cdcda43b81d0e5ad54dc01bb44ccbfd3e52b3f8 Mon Sep 17 00:00:00 2001 From: mssonicbld <79238446+mssonicbld@users.noreply.github.com> Date: Thu, 20 Apr 2023 14:08:03 +0800 Subject: [PATCH 053/193] [devices/arista] Update asic_port_name in Arista LCs (#14234) (#14732) Updated asic_port_names for all Arista LC SKUs to follow latest naming conventions to remove redundant ASICx suffix. For Arista-7800R3-48CQ2-C48, added the asic_port_name mapping. Co-authored-by: kenneth-arista <93353051+kenneth-arista@users.noreply.github.com> --- .../Arista-7800R3-48CQ2-C48/port_config.ini | 102 +++++++++--------- .../Arista-7800R3A-36D2-C36/0/port_config.ini | 40 +++---- .../Arista-7800R3A-36D2-C36/1/port_config.ini | 40 +++---- .../Arista-7800R3A-36D2-C72/0/port_config.ini | 76 ++++++------- .../Arista-7800R3A-36D2-C72/1/port_config.ini | 76 ++++++------- .../Arista-7800R3A-36D2-D36/0/port_config.ini | 40 +++---- .../Arista-7800R3A-36D2-D36/1/port_config.ini | 40 +++---- 7 files changed, 207 insertions(+), 207 deletions(-) diff --git a/device/arista/x86_64-arista_7800r3_48cq2_lc/Arista-7800R3-48CQ2-C48/port_config.ini b/device/arista/x86_64-arista_7800r3_48cq2_lc/Arista-7800R3-48CQ2-C48/port_config.ini index ca11e4c0dd6b..07a78421dd4b 100644 --- a/device/arista/x86_64-arista_7800r3_48cq2_lc/Arista-7800R3-48CQ2-C48/port_config.ini +++ b/device/arista/x86_64-arista_7800r3_48cq2_lc/Arista-7800R3-48CQ2-C48/port_config.ini @@ -1,51 +1,51 @@ -# name lanes alias index role speed coreId corePortId numVoq -Ethernet0 6,7 Ethernet1/1 1 Ext 100000 0 1 8 -Ethernet4 2,3 Ethernet2/1 2 Ext 100000 0 2 8 -Ethernet8 4,5 Ethernet3/1 3 Ext 100000 0 3 8 -Ethernet12 0,1 Ethernet4/1 4 Ext 100000 0 4 8 -Ethernet16 14,15 Ethernet5/1 5 Ext 100000 0 5 8 -Ethernet20 10,11 Ethernet6/1 6 Ext 100000 0 6 8 -Ethernet24 12,13 Ethernet7/1 7 Ext 100000 0 7 8 -Ethernet28 8,9 Ethernet8/1 8 Ext 100000 0 8 8 -Ethernet32 22,23 Ethernet9/1 9 Ext 100000 0 9 8 -Ethernet36 18,19 Ethernet10/1 10 Ext 100000 0 10 8 -Ethernet40 20,21 Ethernet11/1 11 Ext 100000 0 11 8 -Ethernet44 16,17 Ethernet12/1 12 Ext 100000 0 12 8 -Ethernet48 30,31 Ethernet13/1 13 Ext 100000 0 13 8 -Ethernet52 26,27 Ethernet14/1 14 Ext 100000 0 14 8 -Ethernet56 28,29 Ethernet15/1 15 Ext 100000 0 15 8 -Ethernet60 24,25 Ethernet16/1 16 Ext 100000 0 16 8 -Ethernet64 38,39 Ethernet17/1 17 Ext 100000 0 17 8 -Ethernet68 34,35 Ethernet18/1 18 Ext 100000 0 18 8 -Ethernet72 36,37 Ethernet19/1 19 Ext 100000 0 19 8 -Ethernet76 32,33 Ethernet20/1 20 Ext 100000 0 20 8 -Ethernet80 46,47 Ethernet21/1 21 Ext 100000 0 21 8 -Ethernet84 42,43 Ethernet22/1 22 Ext 100000 0 22 8 -Ethernet88 44,45 Ethernet23/1 23 Ext 100000 0 23 8 -Ethernet92 40,41 Ethernet24/1 24 Ext 100000 0 24 8 -Ethernet96 94,95 Ethernet25/1 25 Ext 100000 1 25 8 -Ethernet100 90,91 Ethernet26/1 26 Ext 100000 1 26 8 -Ethernet104 92,93 Ethernet27/1 27 Ext 100000 1 27 8 -Ethernet108 88,89 Ethernet28/1 28 Ext 100000 1 28 8 -Ethernet112 86,87 Ethernet29/1 29 Ext 100000 1 29 8 -Ethernet116 82,83 Ethernet30/1 30 Ext 100000 1 30 8 -Ethernet120 84,85 Ethernet31/1 31 Ext 100000 1 31 8 -Ethernet124 80,81 Ethernet32/1 32 Ext 100000 1 32 8 -Ethernet128 78,79 Ethernet33/1 33 Ext 100000 1 33 8 -Ethernet132 74,75 Ethernet34/1 34 Ext 100000 1 34 8 -Ethernet136 76,77 Ethernet35/1 35 Ext 100000 1 35 8 -Ethernet140 72,73 Ethernet36/1 36 Ext 100000 1 36 8 -Ethernet144 70,71 Ethernet37/1 37 Ext 100000 1 37 8 -Ethernet148 66,67 Ethernet38/1 38 Ext 100000 1 38 8 -Ethernet152 68,69 Ethernet39/1 39 Ext 100000 1 39 8 -Ethernet156 64,65 Ethernet40/1 40 Ext 100000 1 40 8 -Ethernet160 62,63 Ethernet41/1 41 Ext 100000 1 41 8 -Ethernet164 58,59 Ethernet42/1 42 Ext 100000 1 42 8 -Ethernet168 60,61 Ethernet43/1 43 Ext 100000 1 43 8 -Ethernet172 56,57 Ethernet44/1 44 Ext 100000 1 44 8 -Ethernet176 54,55 Ethernet45/1 45 Ext 100000 1 45 8 -Ethernet180 50,51 Ethernet46/1 46 Ext 100000 1 46 8 -Ethernet184 52,53 Ethernet47/1 47 Ext 100000 1 47 8 -Ethernet188 48,49 Ethernet48/1 48 Ext 100000 1 48 8 -Ethernet-Rec0 249 Recirc0/0 51 Rec 400000 0 49 8 -Ethernet-IB0 250 Recirc0/1 52 Inb 400000 1 50 8 +# name lanes alias index role speed asic_port_name coreId corePortId numVoq +Ethernet0 6,7 Ethernet1/1 1 Ext 100000 Eth0 0 1 8 +Ethernet4 2,3 Ethernet2/1 2 Ext 100000 Eth4 0 2 8 +Ethernet8 4,5 Ethernet3/1 3 Ext 100000 Eth8 0 3 8 +Ethernet12 0,1 Ethernet4/1 4 Ext 100000 Eth12 0 4 8 +Ethernet16 14,15 Ethernet5/1 5 Ext 100000 Eth16 0 5 8 +Ethernet20 10,11 Ethernet6/1 6 Ext 100000 Eth20 0 6 8 +Ethernet24 12,13 Ethernet7/1 7 Ext 100000 Eth24 0 7 8 +Ethernet28 8,9 Ethernet8/1 8 Ext 100000 Eth28 0 8 8 +Ethernet32 22,23 Ethernet9/1 9 Ext 100000 Eth32 0 9 8 +Ethernet36 18,19 Ethernet10/1 10 Ext 100000 Eth36 0 10 8 +Ethernet40 20,21 Ethernet11/1 11 Ext 100000 Eth40 0 11 8 +Ethernet44 16,17 Ethernet12/1 12 Ext 100000 Eth44 0 12 8 +Ethernet48 30,31 Ethernet13/1 13 Ext 100000 Eth48 0 13 8 +Ethernet52 26,27 Ethernet14/1 14 Ext 100000 Eth52 0 14 8 +Ethernet56 28,29 Ethernet15/1 15 Ext 100000 Eth56 0 15 8 +Ethernet60 24,25 Ethernet16/1 16 Ext 100000 Eth60 0 16 8 +Ethernet64 38,39 Ethernet17/1 17 Ext 100000 Eth64 0 17 8 +Ethernet68 34,35 Ethernet18/1 18 Ext 100000 Eth68 0 18 8 +Ethernet72 36,37 Ethernet19/1 19 Ext 100000 Eth72 0 19 8 +Ethernet76 32,33 Ethernet20/1 20 Ext 100000 Eth76 0 20 8 +Ethernet80 46,47 Ethernet21/1 21 Ext 100000 Eth80 0 21 8 +Ethernet84 42,43 Ethernet22/1 22 Ext 100000 Eth84 0 22 8 +Ethernet88 44,45 Ethernet23/1 23 Ext 100000 Eth88 0 23 8 +Ethernet92 40,41 Ethernet24/1 24 Ext 100000 Eth92 0 24 8 +Ethernet96 94,95 Ethernet25/1 25 Ext 100000 Eth96 1 25 8 +Ethernet100 90,91 Ethernet26/1 26 Ext 100000 Eth100 1 26 8 +Ethernet104 92,93 Ethernet27/1 27 Ext 100000 Eth104 1 27 8 +Ethernet108 88,89 Ethernet28/1 28 Ext 100000 Eth108 1 28 8 +Ethernet112 86,87 Ethernet29/1 29 Ext 100000 Eth112 1 29 8 +Ethernet116 82,83 Ethernet30/1 30 Ext 100000 Eth116 1 30 8 +Ethernet120 84,85 Ethernet31/1 31 Ext 100000 Eth120 1 31 8 +Ethernet124 80,81 Ethernet32/1 32 Ext 100000 Eth124 1 32 8 +Ethernet128 78,79 Ethernet33/1 33 Ext 100000 Eth128 1 33 8 +Ethernet132 74,75 Ethernet34/1 34 Ext 100000 Eth132 1 34 8 +Ethernet136 76,77 Ethernet35/1 35 Ext 100000 Eth136 1 35 8 +Ethernet140 72,73 Ethernet36/1 36 Ext 100000 Eth140 1 36 8 +Ethernet144 70,71 Ethernet37/1 37 Ext 100000 Eth144 1 37 8 +Ethernet148 66,67 Ethernet38/1 38 Ext 100000 Eth148 1 38 8 +Ethernet152 68,69 Ethernet39/1 39 Ext 100000 Eth152 1 39 8 +Ethernet156 64,65 Ethernet40/1 40 Ext 100000 Eth156 1 40 8 +Ethernet160 62,63 Ethernet41/1 41 Ext 100000 Eth160 1 41 8 +Ethernet164 58,59 Ethernet42/1 42 Ext 100000 Eth164 1 42 8 +Ethernet168 60,61 Ethernet43/1 43 Ext 100000 Eth168 1 43 8 +Ethernet172 56,57 Ethernet44/1 44 Ext 100000 Eth172 1 44 8 +Ethernet176 54,55 Ethernet45/1 45 Ext 100000 Eth176 1 45 8 +Ethernet180 50,51 Ethernet46/1 46 Ext 100000 Eth180 1 46 8 +Ethernet184 52,53 Ethernet47/1 47 Ext 100000 Eth184 1 47 8 +Ethernet188 48,49 Ethernet48/1 48 Ext 100000 Eth188 1 48 8 +Ethernet-Rec0 249 Recirc0/0 51 Rec 400000 Rcy0 0 49 8 +Ethernet-IB0 250 Recirc0/1 52 Inb 400000 Rcy1 1 50 8 diff --git a/device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-C36/0/port_config.ini b/device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-C36/0/port_config.ini index f8448735b26f..a67c9b3f7d2f 100644 --- a/device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-C36/0/port_config.ini +++ b/device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-C36/0/port_config.ini @@ -1,21 +1,21 @@ # name lanes alias index role speed asic_port_name coreId corePortId numVoq -Ethernet0 72,73,74,75 Ethernet1/1 1 Ext 100000 Eth0-ASIC0 1 1 8 -Ethernet8 80,81,82,83 Ethernet2/1 2 Ext 100000 Eth8-ASIC0 1 2 8 -Ethernet16 88,89,90,91 Ethernet3/1 3 Ext 100000 Eth16-ASIC0 1 3 8 -Ethernet24 96,97,98,99 Ethernet4/1 4 Ext 100000 Eth24-ASIC0 1 4 8 -Ethernet32 104,105,106,107 Ethernet5/1 5 Ext 100000 Eth32-ASIC0 1 5 8 -Ethernet40 112,113,114,115 Ethernet6/1 6 Ext 100000 Eth40-ASIC0 1 6 8 -Ethernet48 120,121,122,123 Ethernet7/1 7 Ext 100000 Eth48-ASIC0 1 7 8 -Ethernet56 128,129,130,131 Ethernet8/1 8 Ext 100000 Eth56-ASIC0 1 8 8 -Ethernet64 136,137,138,139 Ethernet9/1 9 Ext 100000 Eth64-ASIC0 1 9 8 -Ethernet72 64,65,66,67 Ethernet10/1 10 Ext 100000 Eth72-ASIC0 0 10 8 -Ethernet80 56,57,58,59 Ethernet11/1 11 Ext 100000 Eth80-ASIC0 0 11 8 -Ethernet88 48,49,50,51 Ethernet12/1 12 Ext 100000 Eth88-ASIC0 0 12 8 -Ethernet96 40,41,42,43 Ethernet13/1 13 Ext 100000 Eth96-ASIC0 0 13 8 -Ethernet104 32,33,34,35 Ethernet14/1 14 Ext 100000 Eth104-ASIC0 0 14 8 -Ethernet112 24,25,26,27 Ethernet15/1 15 Ext 100000 Eth112-ASIC0 0 15 8 -Ethernet120 16,17,18,19 Ethernet16/1 16 Ext 100000 Eth120-ASIC0 0 16 8 -Ethernet128 8,9,10,11 Ethernet17/1 17 Ext 100000 Eth128-ASIC0 0 17 8 -Ethernet136 0,1,2,3 Ethernet18/1 18 Ext 100000 Eth136-ASIC0 0 18 8 -Ethernet-Rec0 249 Recirc0/0 37 Rec 400000 Rcy0-ASIC0 0 49 8 -Ethernet-IB0 250 Recirc0/1 38 Inb 400000 Rcy1-ASIC0 1 50 8 +Ethernet0 72,73,74,75 Ethernet1/1 1 Ext 100000 Eth0 1 1 8 +Ethernet8 80,81,82,83 Ethernet2/1 2 Ext 100000 Eth8 1 2 8 +Ethernet16 88,89,90,91 Ethernet3/1 3 Ext 100000 Eth16 1 3 8 +Ethernet24 96,97,98,99 Ethernet4/1 4 Ext 100000 Eth24 1 4 8 +Ethernet32 104,105,106,107 Ethernet5/1 5 Ext 100000 Eth32 1 5 8 +Ethernet40 112,113,114,115 Ethernet6/1 6 Ext 100000 Eth40 1 6 8 +Ethernet48 120,121,122,123 Ethernet7/1 7 Ext 100000 Eth48 1 7 8 +Ethernet56 128,129,130,131 Ethernet8/1 8 Ext 100000 Eth56 1 8 8 +Ethernet64 136,137,138,139 Ethernet9/1 9 Ext 100000 Eth64 1 9 8 +Ethernet72 64,65,66,67 Ethernet10/1 10 Ext 100000 Eth72 0 10 8 +Ethernet80 56,57,58,59 Ethernet11/1 11 Ext 100000 Eth80 0 11 8 +Ethernet88 48,49,50,51 Ethernet12/1 12 Ext 100000 Eth88 0 12 8 +Ethernet96 40,41,42,43 Ethernet13/1 13 Ext 100000 Eth96 0 13 8 +Ethernet104 32,33,34,35 Ethernet14/1 14 Ext 100000 Eth104 0 14 8 +Ethernet112 24,25,26,27 Ethernet15/1 15 Ext 100000 Eth112 0 15 8 +Ethernet120 16,17,18,19 Ethernet16/1 16 Ext 100000 Eth120 0 16 8 +Ethernet128 8,9,10,11 Ethernet17/1 17 Ext 100000 Eth128 0 17 8 +Ethernet136 0,1,2,3 Ethernet18/1 18 Ext 100000 Eth136 0 18 8 +Ethernet-Rec0 249 Recirc0/0 37 Rec 400000 Rcy0 0 49 8 +Ethernet-IB0 250 Recirc0/1 38 Inb 400000 Rcy1 1 50 8 diff --git a/device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-C36/1/port_config.ini b/device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-C36/1/port_config.ini index b15b00ca0953..4af1dc77b2a6 100644 --- a/device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-C36/1/port_config.ini +++ b/device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-C36/1/port_config.ini @@ -1,21 +1,21 @@ # name lanes alias index role speed asic_port_name coreId corePortId numVoq -Ethernet144 72,73,74,75 Ethernet19/1 19 Ext 100000 Eth0-ASIC1 1 1 8 -Ethernet152 80,81,82,83 Ethernet20/1 20 Ext 100000 Eth8-ASIC1 1 2 8 -Ethernet160 88,89,90,91 Ethernet21/1 21 Ext 100000 Eth16-ASIC1 1 3 8 -Ethernet168 96,97,98,99 Ethernet22/1 22 Ext 100000 Eth24-ASIC1 1 4 8 -Ethernet176 104,105,106,107 Ethernet23/1 23 Ext 100000 Eth32-ASIC1 1 5 8 -Ethernet184 112,113,114,115 Ethernet24/1 24 Ext 100000 Eth40-ASIC1 1 6 8 -Ethernet192 120,121,122,123 Ethernet25/1 25 Ext 100000 Eth48-ASIC1 1 7 8 -Ethernet200 128,129,130,131 Ethernet26/1 26 Ext 100000 Eth56-ASIC1 1 8 8 -Ethernet208 136,137,138,139 Ethernet27/1 27 Ext 100000 Eth64-ASIC1 1 9 8 -Ethernet216 64,65,66,67 Ethernet28/1 28 Ext 100000 Eth72-ASIC1 0 10 8 -Ethernet224 56,57,58,59 Ethernet29/1 29 Ext 100000 Eth80-ASIC1 0 11 8 -Ethernet232 48,49,50,51 Ethernet30/1 30 Ext 100000 Eth88-ASIC1 0 12 8 -Ethernet240 40,41,42,43 Ethernet31/1 31 Ext 100000 Eth96-ASIC1 0 13 8 -Ethernet248 32,33,34,35 Ethernet32/1 32 Ext 100000 Eth104-ASIC1 0 14 8 -Ethernet256 24,25,26,27 Ethernet33/1 33 Ext 100000 Eth112-ASIC1 0 15 8 -Ethernet264 16,17,18,19 Ethernet34/1 34 Ext 100000 Eth120-ASIC1 0 16 8 -Ethernet272 8,9,10,11 Ethernet35/1 35 Ext 100000 Eth128-ASIC1 0 17 8 -Ethernet280 0,1,2,3 Ethernet36/1 36 Ext 100000 Eth136-ASIC1 0 18 8 -Ethernet-Rec1 249 Recirc0/0 39 Rec 400000 Rcy0-ASIC1 0 49 8 -Ethernet-IB1 250 Recirc0/1 40 Inb 400000 Rcy1-ASIC1 1 50 8 +Ethernet144 72,73,74,75 Ethernet19/1 19 Ext 100000 Eth0 1 1 8 +Ethernet152 80,81,82,83 Ethernet20/1 20 Ext 100000 Eth8 1 2 8 +Ethernet160 88,89,90,91 Ethernet21/1 21 Ext 100000 Eth16 1 3 8 +Ethernet168 96,97,98,99 Ethernet22/1 22 Ext 100000 Eth24 1 4 8 +Ethernet176 104,105,106,107 Ethernet23/1 23 Ext 100000 Eth32 1 5 8 +Ethernet184 112,113,114,115 Ethernet24/1 24 Ext 100000 Eth40 1 6 8 +Ethernet192 120,121,122,123 Ethernet25/1 25 Ext 100000 Eth48 1 7 8 +Ethernet200 128,129,130,131 Ethernet26/1 26 Ext 100000 Eth56 1 8 8 +Ethernet208 136,137,138,139 Ethernet27/1 27 Ext 100000 Eth64 1 9 8 +Ethernet216 64,65,66,67 Ethernet28/1 28 Ext 100000 Eth72 0 10 8 +Ethernet224 56,57,58,59 Ethernet29/1 29 Ext 100000 Eth80 0 11 8 +Ethernet232 48,49,50,51 Ethernet30/1 30 Ext 100000 Eth88 0 12 8 +Ethernet240 40,41,42,43 Ethernet31/1 31 Ext 100000 Eth96 0 13 8 +Ethernet248 32,33,34,35 Ethernet32/1 32 Ext 100000 Eth104 0 14 8 +Ethernet256 24,25,26,27 Ethernet33/1 33 Ext 100000 Eth112 0 15 8 +Ethernet264 16,17,18,19 Ethernet34/1 34 Ext 100000 Eth120 0 16 8 +Ethernet272 8,9,10,11 Ethernet35/1 35 Ext 100000 Eth128 0 17 8 +Ethernet280 0,1,2,3 Ethernet36/1 36 Ext 100000 Eth136 0 18 8 +Ethernet-Rec1 249 Recirc0/0 39 Rec 400000 Rcy0 0 49 8 +Ethernet-IB1 250 Recirc0/1 40 Inb 400000 Rcy1 1 50 8 diff --git a/device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-C72/0/port_config.ini b/device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-C72/0/port_config.ini index baa0572b6686..f9f02ffb83a0 100644 --- a/device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-C72/0/port_config.ini +++ b/device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-C72/0/port_config.ini @@ -1,39 +1,39 @@ # name lanes alias index role speed asic_port_name coreId corePortId numVoq -Ethernet0 72,73,74,75 Ethernet1/1 1 Ext 100000 Eth0-ASIC0 1 1 8 -Ethernet4 76,77,78,79 Ethernet1/5 1 Ext 100000 Eth4-ASIC0 1 2 8 -Ethernet8 80,81,82,83 Ethernet2/1 2 Ext 100000 Eth8-ASIC0 1 3 8 -Ethernet12 84,85,86,87 Ethernet2/5 2 Ext 100000 Eth12-ASIC0 1 4 8 -Ethernet16 88,89,90,91 Ethernet3/1 3 Ext 100000 Eth16-ASIC0 1 5 8 -Ethernet20 92,93,94,95 Ethernet3/5 3 Ext 100000 Eth20-ASIC0 1 6 8 -Ethernet24 96,97,98,99 Ethernet4/1 4 Ext 100000 Eth24-ASIC0 1 7 8 -Ethernet28 100,101,102,103 Ethernet4/5 4 Ext 100000 Eth28-ASIC0 1 8 8 -Ethernet32 104,105,106,107 Ethernet5/1 5 Ext 100000 Eth32-ASIC0 1 9 8 -Ethernet36 108,109,110,111 Ethernet5/5 5 Ext 100000 Eth36-ASIC0 1 10 8 -Ethernet40 112,113,114,115 Ethernet6/1 6 Ext 100000 Eth40-ASIC0 1 11 8 -Ethernet44 116,117,118,119 Ethernet6/5 6 Ext 100000 Eth44-ASIC0 1 12 8 -Ethernet48 120,121,122,123 Ethernet7/1 7 Ext 100000 Eth48-ASIC0 1 13 8 -Ethernet52 124,125,126,127 Ethernet7/5 7 Ext 100000 Eth52-ASIC0 1 14 8 -Ethernet56 128,129,130,131 Ethernet8/1 8 Ext 100000 Eth56-ASIC0 1 15 8 -Ethernet60 132,133,134,135 Ethernet8/5 8 Ext 100000 Eth60-ASIC0 1 16 8 -Ethernet64 136,137,138,139 Ethernet9/1 9 Ext 100000 Eth64-ASIC0 1 17 8 -Ethernet68 140,141,142,143 Ethernet9/5 9 Ext 100000 Eth68-ASIC0 1 18 8 -Ethernet72 64,65,66,67 Ethernet10/1 10 Ext 100000 Eth72-ASIC0 0 19 8 -Ethernet76 68,69,70,71 Ethernet10/5 10 Ext 100000 Eth76-ASIC0 0 20 8 -Ethernet80 56,57,58,59 Ethernet11/1 11 Ext 100000 Eth80-ASIC0 0 21 8 -Ethernet84 60,61,62,63 Ethernet11/5 11 Ext 100000 Eth84-ASIC0 0 22 8 -Ethernet88 48,49,50,51 Ethernet12/1 12 Ext 100000 Eth88-ASIC0 0 23 8 -Ethernet92 52,53,54,55 Ethernet12/5 12 Ext 100000 Eth92-ASIC0 0 24 8 -Ethernet96 40,41,42,43 Ethernet13/1 13 Ext 100000 Eth96-ASIC0 0 25 8 -Ethernet100 44,45,46,47 Ethernet13/5 13 Ext 100000 Eth100-ASIC0 0 26 8 -Ethernet104 32,33,34,35 Ethernet14/1 14 Ext 100000 Eth104-ASIC0 0 27 8 -Ethernet108 36,37,38,39 Ethernet14/5 14 Ext 100000 Eth108-ASIC0 0 28 8 -Ethernet112 24,25,26,27 Ethernet15/1 15 Ext 100000 Eth112-ASIC0 0 29 8 -Ethernet116 28,29,30,31 Ethernet15/5 15 Ext 100000 Eth116-ASIC0 0 30 8 -Ethernet120 16,17,18,19 Ethernet16/1 16 Ext 100000 Eth120-ASIC0 0 31 8 -Ethernet124 20,21,22,23 Ethernet16/5 16 Ext 100000 Eth124-ASIC0 0 32 8 -Ethernet128 8,9,10,11 Ethernet17/1 17 Ext 100000 Eth128-ASIC0 0 33 8 -Ethernet132 12,13,14,15 Ethernet17/5 17 Ext 100000 Eth132-ASIC0 0 34 8 -Ethernet136 0,1,2,3 Ethernet18/1 18 Ext 100000 Eth136-ASIC0 0 35 8 -Ethernet140 4,5,6,7 Ethernet18/5 18 Ext 100000 Eth140-ASIC0 0 36 8 -Ethernet-Rec0 221 Recirc0/0 37 Rec 400000 Rcy0-ASIC0 0 221 8 -Ethernet-IB0 222 Recirc0/1 38 Inb 400000 Rcy1-ASIC0 1 222 8 +Ethernet0 72,73,74,75 Ethernet1/1 1 Ext 100000 Eth0 1 1 8 +Ethernet4 76,77,78,79 Ethernet1/5 1 Ext 100000 Eth4 1 2 8 +Ethernet8 80,81,82,83 Ethernet2/1 2 Ext 100000 Eth8 1 3 8 +Ethernet12 84,85,86,87 Ethernet2/5 2 Ext 100000 Eth12 1 4 8 +Ethernet16 88,89,90,91 Ethernet3/1 3 Ext 100000 Eth16 1 5 8 +Ethernet20 92,93,94,95 Ethernet3/5 3 Ext 100000 Eth20 1 6 8 +Ethernet24 96,97,98,99 Ethernet4/1 4 Ext 100000 Eth24 1 7 8 +Ethernet28 100,101,102,103 Ethernet4/5 4 Ext 100000 Eth28 1 8 8 +Ethernet32 104,105,106,107 Ethernet5/1 5 Ext 100000 Eth32 1 9 8 +Ethernet36 108,109,110,111 Ethernet5/5 5 Ext 100000 Eth36 1 10 8 +Ethernet40 112,113,114,115 Ethernet6/1 6 Ext 100000 Eth40 1 11 8 +Ethernet44 116,117,118,119 Ethernet6/5 6 Ext 100000 Eth44 1 12 8 +Ethernet48 120,121,122,123 Ethernet7/1 7 Ext 100000 Eth48 1 13 8 +Ethernet52 124,125,126,127 Ethernet7/5 7 Ext 100000 Eth52 1 14 8 +Ethernet56 128,129,130,131 Ethernet8/1 8 Ext 100000 Eth56 1 15 8 +Ethernet60 132,133,134,135 Ethernet8/5 8 Ext 100000 Eth60 1 16 8 +Ethernet64 136,137,138,139 Ethernet9/1 9 Ext 100000 Eth64 1 17 8 +Ethernet68 140,141,142,143 Ethernet9/5 9 Ext 100000 Eth68 1 18 8 +Ethernet72 64,65,66,67 Ethernet10/1 10 Ext 100000 Eth72 0 19 8 +Ethernet76 68,69,70,71 Ethernet10/5 10 Ext 100000 Eth76 0 20 8 +Ethernet80 56,57,58,59 Ethernet11/1 11 Ext 100000 Eth80 0 21 8 +Ethernet84 60,61,62,63 Ethernet11/5 11 Ext 100000 Eth84 0 22 8 +Ethernet88 48,49,50,51 Ethernet12/1 12 Ext 100000 Eth88 0 23 8 +Ethernet92 52,53,54,55 Ethernet12/5 12 Ext 100000 Eth92 0 24 8 +Ethernet96 40,41,42,43 Ethernet13/1 13 Ext 100000 Eth96 0 25 8 +Ethernet100 44,45,46,47 Ethernet13/5 13 Ext 100000 Eth100 0 26 8 +Ethernet104 32,33,34,35 Ethernet14/1 14 Ext 100000 Eth104 0 27 8 +Ethernet108 36,37,38,39 Ethernet14/5 14 Ext 100000 Eth108 0 28 8 +Ethernet112 24,25,26,27 Ethernet15/1 15 Ext 100000 Eth112 0 29 8 +Ethernet116 28,29,30,31 Ethernet15/5 15 Ext 100000 Eth116 0 30 8 +Ethernet120 16,17,18,19 Ethernet16/1 16 Ext 100000 Eth120 0 31 8 +Ethernet124 20,21,22,23 Ethernet16/5 16 Ext 100000 Eth124 0 32 8 +Ethernet128 8,9,10,11 Ethernet17/1 17 Ext 100000 Eth128 0 33 8 +Ethernet132 12,13,14,15 Ethernet17/5 17 Ext 100000 Eth132 0 34 8 +Ethernet136 0,1,2,3 Ethernet18/1 18 Ext 100000 Eth136 0 35 8 +Ethernet140 4,5,6,7 Ethernet18/5 18 Ext 100000 Eth140 0 36 8 +Ethernet-Rec0 221 Recirc0/0 37 Rec 400000 Rcy0 0 221 8 +Ethernet-IB0 222 Recirc0/1 38 Inb 400000 Rcy1 1 222 8 diff --git a/device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-C72/1/port_config.ini b/device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-C72/1/port_config.ini index 4241f33ca6c1..53988f0b7a26 100644 --- a/device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-C72/1/port_config.ini +++ b/device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-C72/1/port_config.ini @@ -1,39 +1,39 @@ # name lanes alias index role speed asic_port_name coreId corePortId numVoq -Ethernet144 72,73,74,75 Ethernet19/1 19 Ext 100000 Eth144-ASIC1 1 1 8 -Ethernet148 76,77,78,79 Ethernet19/5 19 Ext 100000 Eth148-ASIC1 1 2 8 -Ethernet152 80,81,82,83 Ethernet20/1 20 Ext 100000 Eth152-ASIC1 1 3 8 -Ethernet156 84,85,86,87 Ethernet20/5 20 Ext 100000 Eth156-ASIC1 1 4 8 -Ethernet160 88,89,90,91 Ethernet21/1 21 Ext 100000 Eth160-ASIC1 1 5 8 -Ethernet164 92,93,94,95 Ethernet21/5 21 Ext 100000 Eth164-ASIC1 1 6 8 -Ethernet168 96,97,98,99 Ethernet22/1 22 Ext 100000 Eth168-ASIC1 1 7 8 -Ethernet172 100,101,102,103 Ethernet22/5 22 Ext 100000 Eth172-ASIC1 1 8 8 -Ethernet176 104,105,106,107 Ethernet23/1 23 Ext 100000 Eth176-ASIC1 1 9 8 -Ethernet180 108,109,110,111 Ethernet23/5 23 Ext 100000 Eth180-ASIC1 1 10 8 -Ethernet184 112,113,114,115 Ethernet24/1 24 Ext 100000 Eth184-ASIC1 1 11 8 -Ethernet188 116,117,118,119 Ethernet24/5 24 Ext 100000 Eth188-ASIC1 1 12 8 -Ethernet192 120,121,122,123 Ethernet25/1 25 Ext 100000 Eth192-ASIC1 1 13 8 -Ethernet196 124,125,126,127 Ethernet25/5 25 Ext 100000 Eth196-ASIC1 1 14 8 -Ethernet200 128,129,130,131 Ethernet26/1 26 Ext 100000 Eth200-ASIC1 1 15 8 -Ethernet204 132,133,134,135 Ethernet26/5 26 Ext 100000 Eth204-ASIC1 1 16 8 -Ethernet208 136,137,138,139 Ethernet27/1 27 Ext 100000 Eth208-ASIC1 1 17 8 -Ethernet212 140,141,142,143 Ethernet27/5 27 Ext 100000 Eth212-ASIC1 1 18 8 -Ethernet216 64,65,66,67 Ethernet28/1 28 Ext 100000 Eth216-ASIC1 0 19 8 -Ethernet220 68,69,70,71 Ethernet28/5 28 Ext 100000 Eth220-ASIC1 0 20 8 -Ethernet224 56,57,58,59 Ethernet29/1 29 Ext 100000 Eth224-ASIC1 0 21 8 -Ethernet228 60,61,62,63 Ethernet29/5 29 Ext 100000 Eth228-ASIC1 0 22 8 -Ethernet232 48,49,50,51 Ethernet30/1 30 Ext 100000 Eth232-ASIC1 0 23 8 -Ethernet236 52,53,54,55 Ethernet30/5 30 Ext 100000 Eth236-ASIC1 0 24 8 -Ethernet240 40,41,42,43 Ethernet31/1 31 Ext 100000 Eth240-ASIC1 0 25 8 -Ethernet244 44,45,46,47 Ethernet31/5 31 Ext 100000 Eth244-ASIC1 0 26 8 -Ethernet248 32,33,34,35 Ethernet32/1 32 Ext 100000 Eth248-ASIC1 0 27 8 -Ethernet252 36,37,38,39 Ethernet32/5 32 Ext 100000 Eth252-ASIC1 0 28 8 -Ethernet256 24,25,26,27 Ethernet33/1 33 Ext 100000 Eth256-ASIC1 0 29 8 -Ethernet260 28,29,30,31 Ethernet33/5 33 Ext 100000 Eth260-ASIC1 0 30 8 -Ethernet264 16,17,18,19 Ethernet34/1 34 Ext 100000 Eth264-ASIC1 0 31 8 -Ethernet268 20,21,22,23 Ethernet34/5 34 Ext 100000 Eth268-ASIC1 0 32 8 -Ethernet272 8,9,10,11 Ethernet35/1 35 Ext 100000 Eth272-ASIC1 0 33 8 -Ethernet276 12,13,14,15 Ethernet35/5 35 Ext 100000 Eth276-ASIC1 0 34 8 -Ethernet280 0,1,2,3 Ethernet36/1 36 Ext 100000 Eth280-ASIC1 0 35 8 -Ethernet284 4,5,6,7 Ethernet36/5 36 Ext 100000 Eth284-ASIC1 0 36 8 -Ethernet-Rec1 221 Recirc0/0 39 Rec 400000 Rcy0-ASIC1 0 221 8 -Ethernet-IB1 222 Recirc0/1 40 Inb 400000 Rcy1-ASIC1 1 222 8 +Ethernet144 72,73,74,75 Ethernet19/1 19 Ext 100000 Eth144 1 1 8 +Ethernet148 76,77,78,79 Ethernet19/5 19 Ext 100000 Eth148 1 2 8 +Ethernet152 80,81,82,83 Ethernet20/1 20 Ext 100000 Eth152 1 3 8 +Ethernet156 84,85,86,87 Ethernet20/5 20 Ext 100000 Eth156 1 4 8 +Ethernet160 88,89,90,91 Ethernet21/1 21 Ext 100000 Eth160 1 5 8 +Ethernet164 92,93,94,95 Ethernet21/5 21 Ext 100000 Eth164 1 6 8 +Ethernet168 96,97,98,99 Ethernet22/1 22 Ext 100000 Eth168 1 7 8 +Ethernet172 100,101,102,103 Ethernet22/5 22 Ext 100000 Eth172 1 8 8 +Ethernet176 104,105,106,107 Ethernet23/1 23 Ext 100000 Eth176 1 9 8 +Ethernet180 108,109,110,111 Ethernet23/5 23 Ext 100000 Eth180 1 10 8 +Ethernet184 112,113,114,115 Ethernet24/1 24 Ext 100000 Eth184 1 11 8 +Ethernet188 116,117,118,119 Ethernet24/5 24 Ext 100000 Eth188 1 12 8 +Ethernet192 120,121,122,123 Ethernet25/1 25 Ext 100000 Eth192 1 13 8 +Ethernet196 124,125,126,127 Ethernet25/5 25 Ext 100000 Eth196 1 14 8 +Ethernet200 128,129,130,131 Ethernet26/1 26 Ext 100000 Eth200 1 15 8 +Ethernet204 132,133,134,135 Ethernet26/5 26 Ext 100000 Eth204 1 16 8 +Ethernet208 136,137,138,139 Ethernet27/1 27 Ext 100000 Eth208 1 17 8 +Ethernet212 140,141,142,143 Ethernet27/5 27 Ext 100000 Eth212 1 18 8 +Ethernet216 64,65,66,67 Ethernet28/1 28 Ext 100000 Eth216 0 19 8 +Ethernet220 68,69,70,71 Ethernet28/5 28 Ext 100000 Eth220 0 20 8 +Ethernet224 56,57,58,59 Ethernet29/1 29 Ext 100000 Eth224 0 21 8 +Ethernet228 60,61,62,63 Ethernet29/5 29 Ext 100000 Eth228 0 22 8 +Ethernet232 48,49,50,51 Ethernet30/1 30 Ext 100000 Eth232 0 23 8 +Ethernet236 52,53,54,55 Ethernet30/5 30 Ext 100000 Eth236 0 24 8 +Ethernet240 40,41,42,43 Ethernet31/1 31 Ext 100000 Eth240 0 25 8 +Ethernet244 44,45,46,47 Ethernet31/5 31 Ext 100000 Eth244 0 26 8 +Ethernet248 32,33,34,35 Ethernet32/1 32 Ext 100000 Eth248 0 27 8 +Ethernet252 36,37,38,39 Ethernet32/5 32 Ext 100000 Eth252 0 28 8 +Ethernet256 24,25,26,27 Ethernet33/1 33 Ext 100000 Eth256 0 29 8 +Ethernet260 28,29,30,31 Ethernet33/5 33 Ext 100000 Eth260 0 30 8 +Ethernet264 16,17,18,19 Ethernet34/1 34 Ext 100000 Eth264 0 31 8 +Ethernet268 20,21,22,23 Ethernet34/5 34 Ext 100000 Eth268 0 32 8 +Ethernet272 8,9,10,11 Ethernet35/1 35 Ext 100000 Eth272 0 33 8 +Ethernet276 12,13,14,15 Ethernet35/5 35 Ext 100000 Eth276 0 34 8 +Ethernet280 0,1,2,3 Ethernet36/1 36 Ext 100000 Eth280 0 35 8 +Ethernet284 4,5,6,7 Ethernet36/5 36 Ext 100000 Eth284 0 36 8 +Ethernet-Rec1 221 Recirc0/0 39 Rec 400000 Rcy0 0 221 8 +Ethernet-IB1 222 Recirc0/1 40 Inb 400000 Rcy1 1 222 8 diff --git a/device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-D36/0/port_config.ini b/device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-D36/0/port_config.ini index de840da3eb9a..d6b5da8404dd 100644 --- a/device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-D36/0/port_config.ini +++ b/device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-D36/0/port_config.ini @@ -1,21 +1,21 @@ # name lanes alias index role speed asic_port_name coreId corePortId numVoq -Ethernet0 72,73,74,75,76,77,78,79 Ethernet1/1 1 Ext 400000 Eth0-ASIC0 1 1 8 -Ethernet8 80,81,82,83,84,85,86,87 Ethernet2/1 2 Ext 400000 Eth8-ASIC0 1 2 8 -Ethernet16 88,89,90,91,92,93,94,95 Ethernet3/1 3 Ext 400000 Eth16-ASIC0 1 3 8 -Ethernet24 96,97,98,99,100,101,102,103 Ethernet4/1 4 Ext 400000 Eth24-ASIC0 1 4 8 -Ethernet32 104,105,106,107,108,109,110,111 Ethernet5/1 5 Ext 400000 Eth32-ASIC0 1 5 8 -Ethernet40 112,113,114,115,116,117,118,119 Ethernet6/1 6 Ext 400000 Eth40-ASIC0 1 6 8 -Ethernet48 120,121,122,123,124,125,126,127 Ethernet7/1 7 Ext 400000 Eth48-ASIC0 1 7 8 -Ethernet56 128,129,130,131,132,133,134,135 Ethernet8/1 8 Ext 400000 Eth56-ASIC0 1 8 8 -Ethernet64 136,137,138,139,140,141,142,143 Ethernet9/1 9 Ext 400000 Eth64-ASIC0 1 9 8 -Ethernet72 64,65,66,67,68,69,70,71 Ethernet10/1 10 Ext 400000 Eth72-ASIC0 0 10 8 -Ethernet80 56,57,58,59,60,61,62,63 Ethernet11/1 11 Ext 400000 Eth80-ASIC0 0 11 8 -Ethernet88 48,49,50,51,52,53,54,55 Ethernet12/1 12 Ext 400000 Eth88-ASIC0 0 12 8 -Ethernet96 40,41,42,43,44,45,46,47 Ethernet13/1 13 Ext 400000 Eth96-ASIC0 0 13 8 -Ethernet104 32,33,34,35,36,37,38,39 Ethernet14/1 14 Ext 400000 Eth104-ASIC0 0 14 8 -Ethernet112 24,25,26,27,28,29,30,31 Ethernet15/1 15 Ext 400000 Eth112-ASIC0 0 15 8 -Ethernet120 16,17,18,19,20,21,22,23 Ethernet16/1 16 Ext 400000 Eth120-ASIC0 0 16 8 -Ethernet128 8,9,10,11,12,13,14,15 Ethernet17/1 17 Ext 400000 Eth128-ASIC0 0 17 8 -Ethernet136 0,1,2,3,4,5,6,7 Ethernet18/1 18 Ext 400000 Eth136-ASIC0 0 18 8 -Ethernet-Rec0 249 Recirc0/0 37 Rec 400000 Rcy0-ASIC0 0 49 8 -Ethernet-IB0 250 Recirc0/1 38 Inb 400000 Rcy1-ASIC0 1 50 8 +Ethernet0 72,73,74,75,76,77,78,79 Ethernet1/1 1 Ext 400000 Eth0 1 1 8 +Ethernet8 80,81,82,83,84,85,86,87 Ethernet2/1 2 Ext 400000 Eth8 1 2 8 +Ethernet16 88,89,90,91,92,93,94,95 Ethernet3/1 3 Ext 400000 Eth16 1 3 8 +Ethernet24 96,97,98,99,100,101,102,103 Ethernet4/1 4 Ext 400000 Eth24 1 4 8 +Ethernet32 104,105,106,107,108,109,110,111 Ethernet5/1 5 Ext 400000 Eth32 1 5 8 +Ethernet40 112,113,114,115,116,117,118,119 Ethernet6/1 6 Ext 400000 Eth40 1 6 8 +Ethernet48 120,121,122,123,124,125,126,127 Ethernet7/1 7 Ext 400000 Eth48 1 7 8 +Ethernet56 128,129,130,131,132,133,134,135 Ethernet8/1 8 Ext 400000 Eth56 1 8 8 +Ethernet64 136,137,138,139,140,141,142,143 Ethernet9/1 9 Ext 400000 Eth64 1 9 8 +Ethernet72 64,65,66,67,68,69,70,71 Ethernet10/1 10 Ext 400000 Eth72 0 10 8 +Ethernet80 56,57,58,59,60,61,62,63 Ethernet11/1 11 Ext 400000 Eth80 0 11 8 +Ethernet88 48,49,50,51,52,53,54,55 Ethernet12/1 12 Ext 400000 Eth88 0 12 8 +Ethernet96 40,41,42,43,44,45,46,47 Ethernet13/1 13 Ext 400000 Eth96 0 13 8 +Ethernet104 32,33,34,35,36,37,38,39 Ethernet14/1 14 Ext 400000 Eth104 0 14 8 +Ethernet112 24,25,26,27,28,29,30,31 Ethernet15/1 15 Ext 400000 Eth112 0 15 8 +Ethernet120 16,17,18,19,20,21,22,23 Ethernet16/1 16 Ext 400000 Eth120 0 16 8 +Ethernet128 8,9,10,11,12,13,14,15 Ethernet17/1 17 Ext 400000 Eth128 0 17 8 +Ethernet136 0,1,2,3,4,5,6,7 Ethernet18/1 18 Ext 400000 Eth136 0 18 8 +Ethernet-Rec0 249 Recirc0/0 37 Rec 400000 Rcy0 0 49 8 +Ethernet-IB0 250 Recirc0/1 38 Inb 400000 Rcy1 1 50 8 diff --git a/device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-D36/1/port_config.ini b/device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-D36/1/port_config.ini index 68db8fb44969..6e6b7765b749 100644 --- a/device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-D36/1/port_config.ini +++ b/device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-D36/1/port_config.ini @@ -1,21 +1,21 @@ # name lanes alias index role speed asic_port_name coreId corePortId numVoq -Ethernet144 72,73,74,75,76,77,78,79 Ethernet19/1 19 Ext 400000 Eth0-ASIC1 1 1 8 -Ethernet152 80,81,82,83,84,85,86,87 Ethernet20/1 20 Ext 400000 Eth8-ASIC1 1 2 8 -Ethernet160 88,89,90,91,92,93,94,95 Ethernet21/1 21 Ext 400000 Eth16-ASIC1 1 3 8 -Ethernet168 96,97,98,99,100,101,102,103 Ethernet22/1 22 Ext 400000 Eth24-ASIC1 1 4 8 -Ethernet176 104,105,106,107,108,109,110,111 Ethernet23/1 23 Ext 400000 Eth32-ASIC1 1 5 8 -Ethernet184 112,113,114,115,116,117,118,119 Ethernet24/1 24 Ext 400000 Eth40-ASIC1 1 6 8 -Ethernet192 120,121,122,123,124,125,126,127 Ethernet25/1 25 Ext 400000 Eth48-ASIC1 1 7 8 -Ethernet200 128,129,130,131,132,133,134,135 Ethernet26/1 26 Ext 400000 Eth56-ASIC1 1 8 8 -Ethernet208 136,137,138,139,140,141,142,143 Ethernet27/1 27 Ext 400000 Eth64-ASIC1 1 9 8 -Ethernet216 64,65,66,67,68,69,70,71 Ethernet28/1 28 Ext 400000 Eth72-ASIC1 0 10 8 -Ethernet224 56,57,58,59,60,61,62,63 Ethernet29/1 29 Ext 400000 Eth80-ASIC1 0 11 8 -Ethernet232 48,49,50,51,52,53,54,55 Ethernet30/1 30 Ext 400000 Eth88-ASIC1 0 12 8 -Ethernet240 40,41,42,43,44,45,46,47 Ethernet31/1 31 Ext 400000 Eth96-ASIC1 0 13 8 -Ethernet248 32,33,34,35,36,37,38,39 Ethernet32/1 32 Ext 400000 Eth104-ASIC1 0 14 8 -Ethernet256 24,25,26,27,28,29,30,31 Ethernet33/1 33 Ext 400000 Eth112-ASIC1 0 15 8 -Ethernet264 16,17,18,19,20,21,22,23 Ethernet34/1 34 Ext 400000 Eth120-ASIC1 0 16 8 -Ethernet272 8,9,10,11,12,13,14,15 Ethernet35/1 35 Ext 400000 Eth128-ASIC1 0 17 8 -Ethernet280 0,1,2,3,4,5,6,7 Ethernet36/1 36 Ext 400000 Eth136-ASIC1 0 18 8 -Ethernet-Rec1 249 Recirc0/0 39 Rec 400000 Rcy0-ASIC1 0 49 8 -Ethernet-IB1 250 Recirc0/1 40 Inb 400000 Rcy1-ASIC1 1 50 8 +Ethernet144 72,73,74,75,76,77,78,79 Ethernet19/1 19 Ext 400000 Eth0 1 1 8 +Ethernet152 80,81,82,83,84,85,86,87 Ethernet20/1 20 Ext 400000 Eth8 1 2 8 +Ethernet160 88,89,90,91,92,93,94,95 Ethernet21/1 21 Ext 400000 Eth16 1 3 8 +Ethernet168 96,97,98,99,100,101,102,103 Ethernet22/1 22 Ext 400000 Eth24 1 4 8 +Ethernet176 104,105,106,107,108,109,110,111 Ethernet23/1 23 Ext 400000 Eth32 1 5 8 +Ethernet184 112,113,114,115,116,117,118,119 Ethernet24/1 24 Ext 400000 Eth40 1 6 8 +Ethernet192 120,121,122,123,124,125,126,127 Ethernet25/1 25 Ext 400000 Eth48 1 7 8 +Ethernet200 128,129,130,131,132,133,134,135 Ethernet26/1 26 Ext 400000 Eth56 1 8 8 +Ethernet208 136,137,138,139,140,141,142,143 Ethernet27/1 27 Ext 400000 Eth64 1 9 8 +Ethernet216 64,65,66,67,68,69,70,71 Ethernet28/1 28 Ext 400000 Eth72 0 10 8 +Ethernet224 56,57,58,59,60,61,62,63 Ethernet29/1 29 Ext 400000 Eth80 0 11 8 +Ethernet232 48,49,50,51,52,53,54,55 Ethernet30/1 30 Ext 400000 Eth88 0 12 8 +Ethernet240 40,41,42,43,44,45,46,47 Ethernet31/1 31 Ext 400000 Eth96 0 13 8 +Ethernet248 32,33,34,35,36,37,38,39 Ethernet32/1 32 Ext 400000 Eth104 0 14 8 +Ethernet256 24,25,26,27,28,29,30,31 Ethernet33/1 33 Ext 400000 Eth112 0 15 8 +Ethernet264 16,17,18,19,20,21,22,23 Ethernet34/1 34 Ext 400000 Eth120 0 16 8 +Ethernet272 8,9,10,11,12,13,14,15 Ethernet35/1 35 Ext 400000 Eth128 0 17 8 +Ethernet280 0,1,2,3,4,5,6,7 Ethernet36/1 36 Ext 400000 Eth136 0 18 8 +Ethernet-Rec1 249 Recirc0/0 39 Rec 400000 Rcy0 0 49 8 +Ethernet-IB1 250 Recirc0/1 40 Inb 400000 Rcy1 1 50 8 From 443561b8cac0531d7a2dc9b4af8088dc71863fde Mon Sep 17 00:00:00 2001 From: mssonicbld <79238446+mssonicbld@users.noreply.github.com> Date: Thu, 20 Apr 2023 22:31:31 +0800 Subject: [PATCH 054/193] [submodule] Update submodule linkmgrd to the latest HEAD automatically (#14746) src/linkmgrd * aa1d55f - (HEAD -> 202205, origin/202205) [202205] cherry-pick `azure-pipeline.yml` updates (#200) (8 hours ago) [Jing Zhang] * 2efc130 - Enable debug symbols (#199) (9 hours ago) [Longxiang Lyu] --- src/linkmgrd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/linkmgrd b/src/linkmgrd index 2b81c8301584..aa1d55fc264b 160000 --- a/src/linkmgrd +++ b/src/linkmgrd @@ -1 +1 @@ -Subproject commit 2b81c830158472e344610c0357829fe0d1f20b5b +Subproject commit aa1d55fc264b4accfe2a4440f5c7b224e602ae27 From ec687d1c8c061ceba16a6961cf52fe8fd24e96dc Mon Sep 17 00:00:00 2001 From: mssonicbld <79238446+mssonicbld@users.noreply.github.com> Date: Thu, 20 Apr 2023 22:33:20 +0800 Subject: [PATCH 055/193] [submodule] Update submodule sonic-swss to the latest HEAD automatically (#14750) src/sonic-swss * 96407be - (HEAD -> 202205, origin/202205) sonic-swss: Sync and program remote lag member status. (#2730) (11 hours ago) [Sambath Kumar Balasubramanian] * 6051d33 - Fix race condition in sub-interface handling (#2723) (11 hours ago) [Stephen Sun] * 7b95ec5 - [muxorch] handling multiple mux nexthops for route (#2656) (11 hours ago) [Nikola Dancejic] --- src/sonic-swss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/sonic-swss b/src/sonic-swss index 804e5ac54a0b..96407beeb677 160000 --- a/src/sonic-swss +++ b/src/sonic-swss @@ -1 +1 @@ -Subproject commit 804e5ac54a0bf6594001155b892e81f0869f8eb6 +Subproject commit 96407beeb677c82624af0204172079ffb1493f6d From 70caf151b9c080bcd147602ebf62d7b6afb3516a Mon Sep 17 00:00:00 2001 From: mssonicbld <79238446+mssonicbld@users.noreply.github.com> Date: Thu, 20 Apr 2023 22:34:05 +0800 Subject: [PATCH 056/193] [submodule] Update submodule sonic-py-swsssdk to the latest HEAD automatically (#14749) src/sonic-py-swsssdk * a79fa67 - (HEAD -> 202205, origin/202205) [Security] Fix the redis security issue CVE-2023-28858 and CVE-2023-28859 (#136) (11 hours 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 b654e918f223..a79fa6783a07 160000 --- a/src/sonic-py-swsssdk +++ b/src/sonic-py-swsssdk @@ -1 +1 @@ -Subproject commit b654e918f223eb3f14b9a3f70980e17301c26c1a +Subproject commit a79fa6783a0712f8e09e80f824ffa93a6a77112c From ec6524e28c08ea5e3779319e944ad1ee18c3b360 Mon Sep 17 00:00:00 2001 From: mssonicbld <79238446+mssonicbld@users.noreply.github.com> Date: Thu, 20 Apr 2023 23:01:37 +0800 Subject: [PATCH 057/193] [submodule] Update submodule sonic-swss-common to the latest HEAD automatically (#14751) src/sonic-swss-common * 9569f3a - (HEAD -> 202205, origin/202205) [Azp]: Add a new job for bullseye (#675) (11 hours ago) [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 55fd28a2e18b..9569f3a5007b 160000 --- a/src/sonic-swss-common +++ b/src/sonic-swss-common @@ -1 +1 @@ -Subproject commit 55fd28a2e18bac8fae21b2897b091d758823eaa1 +Subproject commit 9569f3a5007bcc1fc0c4842fc4fd233e6265b1d0 From 54470b6e0f28b3e3b96d3b0e6d499e9649b19256 Mon Sep 17 00:00:00 2001 From: mssonicbld <79238446+mssonicbld@users.noreply.github.com> Date: Fri, 21 Apr 2023 04:20:08 +0800 Subject: [PATCH 058/193] [submodule] Update submodule sonic-platform-common to the latest HEAD automatically (#14748) src/sonic-platform-common * 4080df6 - (HEAD -> 202205, origin/202205) Update host electrical interface for 2x400G breakout cable (#363) (21 hours ago) [mihirpat1] * edcde3a - [CMIS] Add API to get module power up duration (#354) (21 hours ago) [ChiouRung Haung] --- 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 24009de3e95a..4080df6353a2 160000 --- a/src/sonic-platform-common +++ b/src/sonic-platform-common @@ -1 +1 @@ -Subproject commit 24009de3e95a73a70059bc8d714162d5d0d28a0c +Subproject commit 4080df6353a2951d4c92dbf31a9985a1ca09dfd8 From 412b83d0f1c469309294152a5bfc1767a0f2a166 Mon Sep 17 00:00:00 2001 From: mssonicbld <79238446+mssonicbld@users.noreply.github.com> Date: Fri, 21 Apr 2023 04:20:31 +0800 Subject: [PATCH 059/193] [submodule] Update submodule sonic-utilities to the latest HEAD automatically (#14752) src/sonic-utilities * ece22b7d - (HEAD -> 202205, origin/202205) Revert "[GCU] Add PFC_WD RDMA validator (#2781)" (4 minutes ago) [Ying Xie] * 7d16b184 - Remove the no use new line in show version (#2792) (21 hours ago) [xumia] * 3a880a2b - Support to display the SONiC OS Version in the command show version (#2787) (21 hours ago) [xumia] * a5199f75 - [voq][chassis][generate_dump] [BCM] Dump only the relevant BCM commands for fabric cards (#2606) (21 hours ago) [saksarav-nokia] * 2410d364 - Fixed a bug in "show vnet routes all" causing screen overrun. (#2644) (#2801) ( --- src/sonic-utilities | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/sonic-utilities b/src/sonic-utilities index fdea806d0a68..ece22b7d8add 160000 --- a/src/sonic-utilities +++ b/src/sonic-utilities @@ -1 +1 @@ -Subproject commit fdea806d0a68ad8f8aaac670cf4d13f000afa489 +Subproject commit ece22b7d8addb97fd3d911873ee54b88a5549a6f From 36b6d5824cf1c388c85d35f05329b2775ecfac9b Mon Sep 17 00:00:00 2001 From: mssonicbld <79238446+mssonicbld@users.noreply.github.com> Date: Sun, 23 Apr 2023 20:52:29 +0800 Subject: [PATCH 060/193] [ci/build]: Upgrade SONiC package versions (#14812) --- .../versions-deb-bullseye | 1 + .../build-sonic-slave-bullseye/versions-py3 | 2 +- .../versions-py3-all-arm64 | 1 - .../versions-py3-all-armhf | 1 - .../build-sonic-slave-buster/versions-py3 | 2 +- .../versions-py3-all-arm64 | 3 +-- .../versions-py3-all-armhf | 3 +-- files/build/versions/default/versions-git | 6 ++--- files/build/versions/default/versions-mirror | 22 +++++++++---------- files/build/versions/default/versions-web | 2 +- .../docker-base-buster/versions-deb-buster | 4 ++-- .../versions-deb-bullseye-arm64 | 4 ++-- .../versions-deb-bullseye-armhf | 4 ++-- .../versions-py3 | 3 ++- .../docker-config-engine-buster/versions-py3 | 8 +++++-- .../dockers/docker-lldp/versions-deb-bullseye | 2 +- .../versions-deb-bullseye | 2 +- .../dockers/docker-ptf/versions-deb-buster | 6 ++--- .../versions-deb-bullseye | 4 ++-- .../versions-deb-buster | 2 +- .../docker-sonic-mgmt-framework/versions-py3 | 7 ++---- .../dockers/docker-sonic-vs/versions-py3 | 4 ++-- .../docker-syncd-bfn/versions-deb-buster | 4 ++-- .../versions-deb-bullseye | 2 +- .../versions-deb-bullseye | 2 +- .../docker-syncd-mlnx/versions-deb-bullseye | 2 +- .../versions-deb-bullseye | 6 ++--- .../sonic-slave-buster/versions-deb-buster | 18 +++++++-------- .../dockers/sonic-slave-buster/versions-py3 | 2 +- .../host-image/versions-deb-bullseye-arm64 | 4 ++-- .../host-image/versions-deb-bullseye-armhf | 4 ++-- files/build/versions/host-image/versions-py3 | 7 +++--- 32 files changed, 72 insertions(+), 72 deletions(-) diff --git a/files/build/versions/build/build-sonic-slave-bullseye/versions-deb-bullseye b/files/build/versions/build/build-sonic-slave-bullseye/versions-deb-bullseye index 4d7dfd1bcaba..a62518ca04bc 100644 --- a/files/build/versions/build/build-sonic-slave-bullseye/versions-deb-bullseye +++ b/files/build/versions/build/build-sonic-slave-bullseye/versions-deb-bullseye @@ -21,6 +21,7 @@ libsairedis==1.0.0 libsairedis-dev==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 libtac-dev==1.4.1-1 diff --git a/files/build/versions/build/build-sonic-slave-bullseye/versions-py3 b/files/build/versions/build/build-sonic-slave-bullseye/versions-py3 index f70de32e9fa6..89476acaf3c1 100644 --- a/files/build/versions/build/build-sonic-slave-bullseye/versions-py3 +++ b/files/build/versions/build/build-sonic-slave-bullseye/versions-py3 @@ -5,7 +5,7 @@ colorful==0.5.5 docker==6.0.1 docker-image-py==0.1.12 enlighten==1.11.2 -filelock==3.11.0 +filelock==3.12.0 ijson==2.6.1 ipaddress==1.0.23 jsondiff==2.0.0 diff --git a/files/build/versions/build/build-sonic-slave-bullseye/versions-py3-all-arm64 b/files/build/versions/build/build-sonic-slave-bullseye/versions-py3-all-arm64 index 52555db915bc..65fe0150c986 100644 --- a/files/build/versions/build/build-sonic-slave-bullseye/versions-py3-all-arm64 +++ b/files/build/versions/build/build-sonic-slave-bullseye/versions-py3-all-arm64 @@ -1,5 +1,4 @@ bitarray==1.5.3 click==7.0 -redis==3.5.3 requests==2.28.2 zipp==1.2.0 \ No newline at end of file diff --git a/files/build/versions/build/build-sonic-slave-bullseye/versions-py3-all-armhf b/files/build/versions/build/build-sonic-slave-bullseye/versions-py3-all-armhf index 52555db915bc..65fe0150c986 100644 --- a/files/build/versions/build/build-sonic-slave-bullseye/versions-py3-all-armhf +++ b/files/build/versions/build/build-sonic-slave-bullseye/versions-py3-all-armhf @@ -1,5 +1,4 @@ bitarray==1.5.3 click==7.0 -redis==3.5.3 requests==2.28.2 zipp==1.2.0 \ 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 a0bb27cf6517..e87984e0366b 100644 --- a/files/build/versions/build/build-sonic-slave-buster/versions-py3 +++ b/files/build/versions/build/build-sonic-slave-buster/versions-py3 @@ -7,7 +7,7 @@ dbus-python==1.3.2 docker==6.0.1 docker-image-py==0.1.12 enlighten==1.11.2 -filelock==3.11.0 +filelock==3.12.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 index 90c3699131cc..6164e078857b 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 @@ -bitarray==1.5.3 -redis==3.5.3 \ No newline at end of file +bitarray==1.5.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 index 90c3699131cc..6164e078857b 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 @@ -bitarray==1.5.3 -redis==3.5.3 \ No newline at end of file +bitarray==1.5.3 \ No newline at end of file diff --git a/files/build/versions/default/versions-git b/files/build/versions/default/versions-git index 7bdd3d3e3437..ce2601c5e4e8 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==93c715cc646e63c3f976c69098f1b5a76b5619b4 +https://chromium.googlesource.com/chromium/tools/depot_tools.git==b5cec8c8674bbf180cb47a6705cd5f4545fb11a0 https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f https://github.com/CESNET/libyang.git==9a4e5b2ce30b9696116d6e654ee55caab5aafed8 https://github.com/daveolson53/audisp-tacplus.git==559c9f22edd4f2dea0ecedffb3ad9502b12a75b6 https://github.com/daveolson53/libnss-tacplus.git==19008ab68d9d504aa58eb34d5f564755a1613b8b https://github.com/dyninc/OpenBFDD.git==e35f43ad8d2b3f084e96a84c392528a90d05a287 -https://github.com/flashrom/flashrom.git==f3c21c6439f8bbd2911f120c55f301982ecd35bc -https://github.com/FreeRADIUS/freeradius-server.git==6a68530492f1ae437404fe1a8870a8a7ea67a94d +https://github.com/flashrom/flashrom.git==67ca4a71c477320d4b726acd152b7536344e227f +https://github.com/FreeRADIUS/freeradius-server.git==f63e7df7af1a4171d2e0fdac11093c7b2ce041ec https://github.com/FreeRADIUS/pam_radius.git==8d373539bb9f13b0abfe8bcae0095a930a00fad0 https://github.com/jeroennijhof/pam_tacplus.git==4284d9016e64def2bb81d5f50f96dc3b59bfdc39 https://github.com/jpirko/libteam.git==61e27812c1074a865d7e1a778c0ce442837c28d7 diff --git a/files/build/versions/default/versions-mirror b/files/build/versions/default/versions-mirror index 7c7a33ffc453..ed8924a407b7 100644 --- a/files/build/versions/default/versions-mirror +++ b/files/build/versions/default/versions-mirror @@ -1,15 +1,15 @@ deb.nodesource.com_node%5f14.x_dists_bullseye==2023-02-17T00:35:28Z deb.nodesource.com_node%5f14.x_dists_buster==2023-02-17T00:35:28Z -debian==20230418T000224Z -debian-security==20230418T000228Z -download.docker.com_linux_debian_dists_bullseye==2023-04-17T19:08:09Z +debian==20230423T000202Z +debian-security==20230423T000205Z +download.docker.com_linux_debian_dists_bullseye==2023-04-19T12:26:03Z download.docker.com_linux_debian_dists_buster==2023-04-17T19:08:10Z packages.microsoft.com_repos_sonic-dev_dists_jessie==2022-10-31T19:34:29Z -packages.trafficmanager.net_snapshot_debian-security_20230418T000228Z_dists_bullseye-security==2023-04-17T21:55:39Z -packages.trafficmanager.net_snapshot_debian-security_20230418T000228Z_dists_buster_updates==2023-04-17T21:55:38Z -packages.trafficmanager.net_snapshot_debian_20230418T000224Z_dists_bullseye==2022-12-17T10:14:37Z -packages.trafficmanager.net_snapshot_debian_20230418T000224Z_dists_bullseye-backports==2023-04-17T20:10:42Z -packages.trafficmanager.net_snapshot_debian_20230418T000224Z_dists_bullseye-updates==2023-04-17T20:10:42Z -packages.trafficmanager.net_snapshot_debian_20230418T000224Z_dists_buster==2022-09-10T11:30:54Z -packages.trafficmanager.net_snapshot_debian_20230418T000224Z_dists_buster-backports==2023-04-17T20:10:42Z -packages.trafficmanager.net_snapshot_debian_20230418T000224Z_dists_buster-updates==2023-04-17T20:10:42Z \ No newline at end of file +packages.trafficmanager.net_snapshot_debian-security_20230423T000205Z_dists_bullseye-security==2023-04-22T16:05:37Z +packages.trafficmanager.net_snapshot_debian-security_20230423T000205Z_dists_buster_updates==2023-04-22T16:05:37Z +packages.trafficmanager.net_snapshot_debian_20230423T000202Z_dists_bullseye==2022-12-17T10:14:37Z +packages.trafficmanager.net_snapshot_debian_20230423T000202Z_dists_bullseye-backports==2023-04-22T20:09:43Z +packages.trafficmanager.net_snapshot_debian_20230423T000202Z_dists_bullseye-updates==2023-04-22T20:09:44Z +packages.trafficmanager.net_snapshot_debian_20230423T000202Z_dists_buster==2022-09-10T11:30:54Z +packages.trafficmanager.net_snapshot_debian_20230423T000202Z_dists_buster-backports==2023-04-22T20:09:44Z +packages.trafficmanager.net_snapshot_debian_20230423T000202Z_dists_buster-updates==2023-04-22T20:09:44Z \ No newline at end of file diff --git a/files/build/versions/default/versions-web b/files/build/versions/default/versions-web index d6aed35e8429..14da17b47fd2 100644 --- a/files/build/versions/default/versions-web +++ b/files/build/versions/default/versions-web @@ -32,7 +32,7 @@ https://deb.debian.org/debian/pool/main/k/kdump-tools/kdump-tools_1.6.8.4.tar.xz https://deb.nodesource.com/gpgkey/nodesource.gpg.key==003b51a89a133b5db4cca98b2dea3117 https://deb.nodesource.com/node_14.x/dists/bullseye/Release==6b7d50c433d129d4c6fd95bdf56070fa https://deb.nodesource.com/node_14.x/dists/buster/Release==42875141604382f0abb4d047f645dfe1 -https://deb.nodesource.com/setup_14.x==7e3b27b12367cbc79d788cd43bbc917c +https://deb.nodesource.com/setup_14.x==1c9de9348c0acd5f2ee422a6d0c333b3 https://download.docker.com/linux/debian/gpg==1afae06b34a13c1b3d9cb61a26285a15 https://github.com/aristanetworks/sonic-firmware/raw/e89a1696954fd381e1e95edf208cffc97caf15d4/phy/phy-credo_1.0_amd64.deb==fc197598098d030526c08d55cdd3910f https://github.com/barefootnetworks/sonic-release-pkgs/raw/dev/bfnplatform_20220408_sai_1.9.1_deb10.deb==890a53ca1374dfcf8c12091d74fd2ef8 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 dadd4ea88ee7..46757c2935f4 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-config-engine-bullseye/versions-deb-bullseye-arm64 b/files/build/versions/dockers/docker-config-engine-bullseye/versions-deb-bullseye-arm64 index 304462fd3b28..6e30c8c5da45 100644 --- a/files/build/versions/dockers/docker-config-engine-bullseye/versions-deb-bullseye-arm64 +++ b/files/build/versions/dockers/docker-config-engine-bullseye/versions-deb-bullseye-arm64 @@ -2,7 +2,7 @@ binutils-aarch64-linux-gnu==2.35.2-2 icu-devtools==67.1-7 libicu-dev==67.1-7 libicu67==67.1-7 -libxml2==2.9.10+dfsg-6.7+deb11u3 -libxml2-dev==2.9.10+dfsg-6.7+deb11u3 +libxml2==2.9.10+dfsg-6.7+deb11u4 +libxml2-dev==2.9.10+dfsg-6.7+deb11u4 libxslt1-dev==1.1.34-4+deb11u1 libxslt1.1==1.1.34-4+deb11u1 \ No newline at end of file diff --git a/files/build/versions/dockers/docker-config-engine-bullseye/versions-deb-bullseye-armhf b/files/build/versions/dockers/docker-config-engine-bullseye/versions-deb-bullseye-armhf index 166eee84b72c..1263b11abb0e 100644 --- a/files/build/versions/dockers/docker-config-engine-bullseye/versions-deb-bullseye-armhf +++ b/files/build/versions/dockers/docker-config-engine-bullseye/versions-deb-bullseye-armhf @@ -2,7 +2,7 @@ binutils-arm-linux-gnueabihf==2.35.2-2 icu-devtools==67.1-7 libicu-dev==67.1-7 libicu67==67.1-7 -libxml2==2.9.10+dfsg-6.7+deb11u3 -libxml2-dev==2.9.10+dfsg-6.7+deb11u3 +libxml2==2.9.10+dfsg-6.7+deb11u4 +libxml2-dev==2.9.10+dfsg-6.7+deb11u4 libxslt1-dev==1.1.34-4+deb11u1 libxslt1.1==1.1.34-4+deb11u1 \ No newline at end of file diff --git a/files/build/versions/dockers/docker-config-engine-bullseye/versions-py3 b/files/build/versions/dockers/docker-config-engine-bullseye/versions-py3 index 8469236cdf89..e88c5d2c278b 100644 --- a/files/build/versions/dockers/docker-config-engine-bullseye/versions-py3 +++ b/files/build/versions/dockers/docker-config-engine-bullseye/versions-py3 @@ -1,3 +1,4 @@ +async-timeout==4.0.2 bitarray==1.5.3 ijson==2.6.1 ipaddress==1.0.23 @@ -8,7 +9,7 @@ netaddr==0.8.0 pyang==2.5.3 pyangbind==0.8.1 pyyaml==5.4.1 -redis==3.5.3 +redis==4.5.4 redis-dump-load==1.1 regex==2023.3.23 six==1.16.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 bb07d0b1bba8..293cd59cc325 100644 --- a/files/build/versions/dockers/docker-config-engine-buster/versions-py3 +++ b/files/build/versions/dockers/docker-config-engine-buster/versions-py3 @@ -1,5 +1,7 @@ +async-timeout==4.0.2 bitarray==1.5.3 ijson==2.6.1 +importlib-metadata==6.6.0 ipaddress==1.0.23 jsondiff==2.0.0 lxml==4.9.1 @@ -8,8 +10,10 @@ netaddr==0.8.0 pyang==2.5.3 pyangbind==0.8.1 pyyaml==5.4.1 -redis==3.5.3 +redis==4.5.4 redis-dump-load==1.1 regex==2022.10.31 six==1.16.0 -xmltodict==0.12.0 \ No newline at end of file +typing_extensions==4.5.0 +xmltodict==0.12.0 +zipp==3.15.0 \ No newline at end of file diff --git a/files/build/versions/dockers/docker-lldp/versions-deb-bullseye b/files/build/versions/dockers/docker-lldp/versions-deb-bullseye index 0f418b558861..8d2c5ac5e81f 100644 --- a/files/build/versions/dockers/docker-lldp/versions-deb-bullseye +++ b/files/build/versions/dockers/docker-lldp/versions-deb-bullseye @@ -24,7 +24,7 @@ libsource-highlight-common==3.1.9-3 libsource-highlight4v5==3.1.9-3+b1 libswsscommon-dbgsym==1.0.0 libunwind8==1.3.2-2 -libxml2==2.9.10+dfsg-6.7+deb11u3 +libxml2==2.9.10+dfsg-6.7+deb11u4 lldpd==1.0.4-1 lldpd-dbgsym==1.0.4-1 openssh-client==1:8.4p1-5+deb11u1 diff --git a/files/build/versions/dockers/docker-platform-monitor/versions-deb-bullseye b/files/build/versions/dockers/docker-platform-monitor/versions-deb-bullseye index 9b1d7e9e78bc..d56f8b22547f 100644 --- a/files/build/versions/dockers/docker-platform-monitor/versions-deb-bullseye +++ b/files/build/versions/dockers/docker-platform-monitor/versions-deb-bullseye @@ -99,7 +99,7 @@ libxcb-shm0==1.14-3 libxcb1==1.14-3 libxdmcp6==1:1.1.2-3 libxext6==2:1.3.3-1.1 -libxml2==2.9.10+dfsg-6.7+deb11u3 +libxml2==2.9.10+dfsg-6.7+deb11u4 libxrender1==1:0.9.10-1 linux-libc-dev==5.10.162-1 lm-sensors==1:3.6.0-7 diff --git a/files/build/versions/dockers/docker-ptf/versions-deb-buster b/files/build/versions/dockers/docker-ptf/versions-deb-buster index 99f074cf90e2..cc5462b27afd 100644 --- a/files/build/versions/dockers/docker-ptf/versions-deb-buster +++ b/files/build/versions/dockers/docker-ptf/versions-deb-buster @@ -16,7 +16,7 @@ cmake-data==3.13.4-1 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 dh-python==3.20190308 dirmngr==2.2.12-1+deb10u2 @@ -92,8 +92,8 @@ libcryptsetup12==2:2.1.0-5+deb10u2 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 +libcurl3-gnutls==7.64.0-4+deb10u6 +libcurl4==7.64.0-4+deb10u6 libdaemon0==0.14-7 libdata-dump-perl==1.23-1 libdatrie1==0.2.12-2 diff --git a/files/build/versions/dockers/docker-saiserverv2-mlnx/versions-deb-bullseye b/files/build/versions/dockers/docker-saiserverv2-mlnx/versions-deb-bullseye index fcc4c66200ea..28db4b0a0ff4 100644 --- a/files/build/versions/dockers/docker-saiserverv2-mlnx/versions-deb-bullseye +++ b/files/build/versions/dockers/docker-saiserverv2-mlnx/versions-deb-bullseye @@ -86,8 +86,8 @@ libtirpc-dev==1.3.1-1+deb11u1 libtsan0==10.2.1-6 libubsan1==10.2.1-6 libuv1==1.40.0-2 -libxml2==2.9.10+dfsg-6.7+deb11u3 -libxml2-utils==2.9.10+dfsg-6.7+deb11u3 +libxml2==2.9.10+dfsg-6.7+deb11u4 +libxml2-utils==2.9.10+dfsg-6.7+deb11u4 libxslt1.1==1.1.34-4+deb11u1 linux-libc-dev==5.10.162-1 mailcap==3.69 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 ef18d1cefaac..9d5e08dd1b8b 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 libcjson-dev==1.7.10-1.1+deb10u1 libcjson1==1.7.10-1.1+deb10u1 -libcurl3-gnutls==7.64.0-4+deb10u5 +libcurl3-gnutls==7.64.0-4+deb10u6 libdw1==0.176-1.1 libedit2==3.1-20181209-1 libexpat1-dev==2.2.6-2+deb10u6 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 a78c9bccca03..aa7dd414b283 100644 --- a/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3 +++ b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3 @@ -5,10 +5,9 @@ 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-resources==5.12.0 inflection==0.5.1 itsdangerous==2.1.2 @@ -25,7 +24,5 @@ python-dateutil==2.6.0 requests==2.28.2 rfc3339-validator==0.1.4 six==1.11.0 -typing_extensions==4.5.0 urllib3==1.26.5 -werkzeug==2.2.3 -zipp==3.15.0 \ No newline at end of file +werkzeug==2.2.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 8b67de44c697..2fad9f19cd2e 100644 --- a/files/build/versions/dockers/docker-sonic-vs/versions-py3 +++ b/files/build/versions/dockers/docker-sonic-vs/versions-py3 @@ -8,7 +8,7 @@ dbus-python==1.3.2 docker==6.0.1 docker-image-py==0.1.12 enlighten==1.11.2 -filelock==3.11.0 +filelock==3.12.0 idna==3.4 jsonpatch==1.32 jsonpointer==2.3 @@ -21,7 +21,7 @@ prefixed==0.7.0 prettyprinter==0.18.0 ptyprocess==0.7.0 pycairo==1.23.0 -pygments==2.15.0 +pygments==2.15.1 pygobject==3.44.1 pyparsing==3.0.9 pyroute2==0.5.14 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 45d24ae1395d..04e344b8e966 100644 --- a/files/build/versions/dockers/docker-syncd-bfn/versions-deb-buster +++ b/files/build/versions/dockers/docker-syncd-bfn/versions-deb-buster @@ -4,8 +4,8 @@ libbsd0==0.9.1-2+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+deb10u5 -libcurl4-gnutls-dev==7.64.0-4+deb10u5 +libcurl3-gnutls==7.64.0-4+deb10u6 +libcurl4-gnutls-dev==7.64.0-4+deb10u6 libedit2==3.1-20181209-1 libgoogle-perftools4==2.7-1 libicu63==63.1-6+deb10u3 diff --git a/files/build/versions/dockers/docker-syncd-brcm-dnx-rpc/versions-deb-bullseye b/files/build/versions/dockers/docker-syncd-brcm-dnx-rpc/versions-deb-bullseye index 27520ca175c4..9e64141e5920 100644 --- a/files/build/versions/dockers/docker-syncd-brcm-dnx-rpc/versions-deb-bullseye +++ b/files/build/versions/dockers/docker-syncd-brcm-dnx-rpc/versions-deb-bullseye @@ -54,7 +54,7 @@ libtirpc-dev==1.3.1-1+deb11u1 libtsan0==10.2.1-6 libubsan1==10.2.1-6 libuv1==1.40.0-2 -libxml2==2.9.10+dfsg-6.7+deb11u3 +libxml2==2.9.10+dfsg-6.7+deb11u4 linux-libc-dev==5.10.162-1 mailcap==3.69 make==4.3-4.1 diff --git a/files/build/versions/dockers/docker-syncd-brcm-rpc/versions-deb-bullseye b/files/build/versions/dockers/docker-syncd-brcm-rpc/versions-deb-bullseye index 27520ca175c4..9e64141e5920 100644 --- a/files/build/versions/dockers/docker-syncd-brcm-rpc/versions-deb-bullseye +++ b/files/build/versions/dockers/docker-syncd-brcm-rpc/versions-deb-bullseye @@ -54,7 +54,7 @@ libtirpc-dev==1.3.1-1+deb11u1 libtsan0==10.2.1-6 libubsan1==10.2.1-6 libuv1==1.40.0-2 -libxml2==2.9.10+dfsg-6.7+deb11u3 +libxml2==2.9.10+dfsg-6.7+deb11u4 linux-libc-dev==5.10.162-1 mailcap==3.69 make==4.3-4.1 diff --git a/files/build/versions/dockers/docker-syncd-mlnx/versions-deb-bullseye b/files/build/versions/dockers/docker-syncd-mlnx/versions-deb-bullseye index 32141df70ac0..597680a3cc44 100644 --- a/files/build/versions/dockers/docker-syncd-mlnx/versions-deb-bullseye +++ b/files/build/versions/dockers/docker-syncd-mlnx/versions-deb-bullseye @@ -43,7 +43,7 @@ libswsscommon-dbg==1.0.0 libswsscommon-dbgsym==1.0.0 libtirpc-dev==1.3.1-1+deb11u1 libunwind8==1.3.2-2 -libxml2==2.9.10+dfsg-6.7+deb11u3 +libxml2==2.9.10+dfsg-6.7+deb11u4 linux-libc-dev==5.10.162-1 mailcap==3.69 mft==4.22.1-15 diff --git a/files/build/versions/dockers/sonic-slave-bullseye/versions-deb-bullseye b/files/build/versions/dockers/sonic-slave-bullseye/versions-deb-bullseye index fcca1860b914..4a1bdd5785bd 100644 --- a/files/build/versions/dockers/sonic-slave-bullseye/versions-deb-bullseye +++ b/files/build/versions/dockers/sonic-slave-bullseye/versions-deb-bullseye @@ -1324,9 +1324,9 @@ libxml-sax-perl==1.02+dfsg-1 libxml-simple-perl==2.25-1 libxml-twig-perl==1:3.52-1 libxml-xpathengine-perl==0.14-1 -libxml2==2.9.10+dfsg-6.7+deb11u3 -libxml2-dev==2.9.10+dfsg-6.7+deb11u3 -libxml2-utils==2.9.10+dfsg-6.7+deb11u3 +libxml2==2.9.10+dfsg-6.7+deb11u4 +libxml2-dev==2.9.10+dfsg-6.7+deb11u4 +libxml2-utils==2.9.10+dfsg-6.7+deb11u4 libxmlgraphics-commons-java==2.4-2~deb11u1 libxmlrpc-lite-perl==0.717-4 libxmu6==2:1.1.2-2+b3 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 2e2a7d428578..9b857945c282 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 @@ -416,9 +416,9 @@ libcunit1-dev==2.1-3-dfsg-2+b12 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 @@ -949,10 +949,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 @@ -1468,7 +1468,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-py3 b/files/build/versions/dockers/sonic-slave-buster/versions-py3 index 8e653dd7ec8b..23a376c78b53 100644 --- a/files/build/versions/dockers/sonic-slave-buster/versions-py3 +++ b/files/build/versions/dockers/sonic-slave-buster/versions-py3 @@ -20,7 +20,7 @@ gcovr==4.1 gpg==1.12.0 idna==2.6 imagesize==1.0.0 -importlib-metadata==6.4.1 +importlib-metadata==6.6.0 jinja2==3.0.3 keyring==17.1.1 keyrings.alt==3.1.1 diff --git a/files/build/versions/host-image/versions-deb-bullseye-arm64 b/files/build/versions/host-image/versions-deb-bullseye-arm64 index b60fc1dd7aa8..a3d1ce77cb93 100644 --- a/files/build/versions/host-image/versions-deb-bullseye-arm64 +++ b/files/build/versions/host-image/versions-deb-bullseye-arm64 @@ -3,8 +3,8 @@ ebtables==2.0.11-4 icu-devtools==67.1-7 libicu-dev==67.1-7 libicu67==67.1-7 -libxml2==2.9.10+dfsg-6.7+deb11u3 -libxml2-dev==2.9.10+dfsg-6.7+deb11u3 +libxml2==2.9.10+dfsg-6.7+deb11u4 +libxml2-dev==2.9.10+dfsg-6.7+deb11u4 libxslt1-dev==1.1.34-4+deb11u1 libxslt1.1==1.1.34-4+deb11u1 linux-image-5.10.0-18-2-arm64-unsigned==5.10.140-1 diff --git a/files/build/versions/host-image/versions-deb-bullseye-armhf b/files/build/versions/host-image/versions-deb-bullseye-armhf index 5eb240a792fa..4d06f75b128f 100644 --- a/files/build/versions/host-image/versions-deb-bullseye-armhf +++ b/files/build/versions/host-image/versions-deb-bullseye-armhf @@ -5,8 +5,8 @@ libicu-dev==67.1-7 libicu67==67.1-7 libssl-dev==1.1.1n-0+deb11u4 libssl1.1==1.1.1n-0+deb11u4 -libxml2==2.9.10+dfsg-6.7+deb11u3 -libxml2-dev==2.9.10+dfsg-6.7+deb11u3 +libxml2==2.9.10+dfsg-6.7+deb11u4 +libxml2-dev==2.9.10+dfsg-6.7+deb11u4 libxslt1-dev==1.1.34-4+deb11u1 libxslt1.1==1.1.34-4+deb11u1 linux-image-5.10.0-18-2-armmp==5.10.140-1 diff --git a/files/build/versions/host-image/versions-py3 b/files/build/versions/host-image/versions-py3 index 59ea977ae21e..48f1ad74dd7c 100644 --- a/files/build/versions/host-image/versions-py3 +++ b/files/build/versions/host-image/versions-py3 @@ -1,3 +1,4 @@ +async-timeout==4.0.2 azure-common==1.1.28 azure-nspkg==3.0.2 azure-storage==0.36.0 @@ -14,7 +15,7 @@ dbus-python==1.2.16 docker==5.0.3 docker-image-py==0.1.12 enlighten==1.11.2 -filelock==3.11.0 +filelock==3.12.0 grpcio==1.39.0 grpcio-tools==1.39.0 idna==3.4 @@ -47,13 +48,13 @@ pyangbind==0.8.1 pycairo==1.23.0 pycparser==2.21 pycurl==7.43.0.6 -pygments==2.15.0 +pygments==2.15.1 pygobject==3.44.1 pyroute2==0.5.19 python-apt==2.2.1 python-dateutil==2.8.2 pyyaml==5.4.1 -redis==3.5.3 +redis==4.5.4 regex==2023.3.23 requests==2.28.2 scapy==2.4.4 From f2a687b33737df9f8c2ce3f18550e0abdc15620a Mon Sep 17 00:00:00 2001 From: James An <94036556+jamesan47@users.noreply.github.com> Date: Tue, 25 Apr 2023 15:59:25 -0700 Subject: [PATCH 061/193] Update cisco-8000.ini (#14833) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Why I did it Release Notes for Cisco 8101-32FH-O: · Enable CMIS · Enable Subport for Static Breakout How I did it Update platform version to 202205.2.2.2 (equivalent to 202205-v0.16) --- 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 a6ab6a95f841..190fc372457d 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=202205.2.2.1 +ref=202205.2.2.2 From 5d9658f5038507e5a4f37920f813f9f10e768461 Mon Sep 17 00:00:00 2001 From: mssonicbld <79238446+mssonicbld@users.noreply.github.com> Date: Sat, 29 Apr 2023 20:49:34 +0800 Subject: [PATCH 062/193] [ci/build]: Upgrade SONiC package versions (#14839) --- .../versions-deb-bullseye | 1 - .../versions-py3-all-arm64 | 3 +-- .../versions-py3-all-armhf | 2 +- files/build/versions/default/versions-git | 10 ++++---- files/build/versions/default/versions-mirror | 24 +++++++++---------- .../docker-sonic-mgmt-framework/versions-py3 | 4 ++-- .../dockers/docker-sonic-vs/versions-py3 | 2 +- .../versions-deb-bullseye | 2 +- files/build/versions/host-image/versions-py3 | 2 +- 9 files changed, 24 insertions(+), 26 deletions(-) diff --git a/files/build/versions/build/build-sonic-slave-bullseye/versions-deb-bullseye b/files/build/versions/build/build-sonic-slave-bullseye/versions-deb-bullseye index a62518ca04bc..4d7dfd1bcaba 100644 --- a/files/build/versions/build/build-sonic-slave-bullseye/versions-deb-bullseye +++ b/files/build/versions/build/build-sonic-slave-bullseye/versions-deb-bullseye @@ -21,7 +21,6 @@ libsairedis==1.0.0 libsairedis-dev==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 libtac-dev==1.4.1-1 diff --git a/files/build/versions/build/build-sonic-slave-bullseye/versions-py3-all-arm64 b/files/build/versions/build/build-sonic-slave-bullseye/versions-py3-all-arm64 index 65fe0150c986..ef408b5a3f74 100644 --- a/files/build/versions/build/build-sonic-slave-bullseye/versions-py3-all-arm64 +++ b/files/build/versions/build/build-sonic-slave-bullseye/versions-py3-all-arm64 @@ -1,4 +1,3 @@ bitarray==1.5.3 click==7.0 -requests==2.28.2 -zipp==1.2.0 \ No newline at end of file +requests==2.29.0 \ No newline at end of file diff --git a/files/build/versions/build/build-sonic-slave-bullseye/versions-py3-all-armhf b/files/build/versions/build/build-sonic-slave-bullseye/versions-py3-all-armhf index 65fe0150c986..5466f6dff37a 100644 --- a/files/build/versions/build/build-sonic-slave-bullseye/versions-py3-all-armhf +++ b/files/build/versions/build/build-sonic-slave-bullseye/versions-py3-all-armhf @@ -1,4 +1,4 @@ bitarray==1.5.3 click==7.0 -requests==2.28.2 +requests==2.29.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 ce2601c5e4e8..e5d85b1cb263 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==b5cec8c8674bbf180cb47a6705cd5f4545fb11a0 +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/audisp-tacplus.git==559c9f22edd4f2dea0ecedffb3ad9502b12a75b6 https://github.com/daveolson53/libnss-tacplus.git==19008ab68d9d504aa58eb34d5f564755a1613b8b https://github.com/dyninc/OpenBFDD.git==e35f43ad8d2b3f084e96a84c392528a90d05a287 -https://github.com/flashrom/flashrom.git==67ca4a71c477320d4b726acd152b7536344e227f -https://github.com/FreeRADIUS/freeradius-server.git==f63e7df7af1a4171d2e0fdac11093c7b2ce041ec +https://github.com/flashrom/flashrom.git==1776bb46ba6ea3d1ab2ec3f0cd88158aabed7400 +https://github.com/FreeRADIUS/freeradius-server.git==9c146d29e07513ace9db29d197c2596a47986552 https://github.com/FreeRADIUS/pam_radius.git==8d373539bb9f13b0abfe8bcae0095a930a00fad0 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==9dbae444204a2c27b33be698ce497d55926b8893 https://github.com/Mellanox/libpsample.git==62bb27d9a49424e45191eee81df7ce0d8c74e774 -https://github.com/opencomputeproject/SAI.git==3ff228a7e5619a56e3c169966cb1a8631705768a +https://github.com/opencomputeproject/SAI.git==554852e762f07ccb39db88ff2217d9a540db14fa 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 ed8924a407b7..61b77afbe38d 100644 --- a/files/build/versions/default/versions-mirror +++ b/files/build/versions/default/versions-mirror @@ -1,15 +1,15 @@ deb.nodesource.com_node%5f14.x_dists_bullseye==2023-02-17T00:35:28Z deb.nodesource.com_node%5f14.x_dists_buster==2023-02-17T00:35:28Z -debian==20230423T000202Z -debian-security==20230423T000205Z -download.docker.com_linux_debian_dists_bullseye==2023-04-19T12:26:03Z -download.docker.com_linux_debian_dists_buster==2023-04-17T19:08:10Z +debian==20230429T000105Z +debian-security==20230429T000105Z +download.docker.com_linux_debian_dists_bullseye==2023-04-28T15:03:42Z +download.docker.com_linux_debian_dists_buster==2023-04-28T15:03:42Z packages.microsoft.com_repos_sonic-dev_dists_jessie==2022-10-31T19:34:29Z -packages.trafficmanager.net_snapshot_debian-security_20230423T000205Z_dists_bullseye-security==2023-04-22T16:05:37Z -packages.trafficmanager.net_snapshot_debian-security_20230423T000205Z_dists_buster_updates==2023-04-22T16:05:37Z -packages.trafficmanager.net_snapshot_debian_20230423T000202Z_dists_bullseye==2022-12-17T10:14:37Z -packages.trafficmanager.net_snapshot_debian_20230423T000202Z_dists_bullseye-backports==2023-04-22T20:09:43Z -packages.trafficmanager.net_snapshot_debian_20230423T000202Z_dists_bullseye-updates==2023-04-22T20:09:44Z -packages.trafficmanager.net_snapshot_debian_20230423T000202Z_dists_buster==2022-09-10T11:30:54Z -packages.trafficmanager.net_snapshot_debian_20230423T000202Z_dists_buster-backports==2023-04-22T20:09:44Z -packages.trafficmanager.net_snapshot_debian_20230423T000202Z_dists_buster-updates==2023-04-22T20:09:44Z \ No newline at end of file +packages.trafficmanager.net_snapshot_debian-security_20230429T000105Z_dists_bullseye-security==2023-04-24T21:13:10Z +packages.trafficmanager.net_snapshot_debian-security_20230429T000105Z_dists_buster_updates==2023-04-24T21:13:10Z +packages.trafficmanager.net_snapshot_debian_20230429T000105Z_dists_bullseye==2022-12-17T10:14:37Z +packages.trafficmanager.net_snapshot_debian_20230429T000105Z_dists_bullseye-backports==2023-04-28T20:10:36Z +packages.trafficmanager.net_snapshot_debian_20230429T000105Z_dists_bullseye-updates==2023-04-28T20:10:36Z +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 \ 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 aa7dd414b283..bfa8c9e5d03d 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.3 +flask==2.2.4 grpcio==1.54.0 grpcio-tools==1.20.0 idna==3.4 @@ -21,7 +21,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 urllib3==1.26.5 diff --git a/files/build/versions/dockers/docker-sonic-vs/versions-py3 b/files/build/versions/dockers/docker-sonic-vs/versions-py3 index 2fad9f19cd2e..8a04e4c4a524 100644 --- a/files/build/versions/dockers/docker-sonic-vs/versions-py3 +++ b/files/build/versions/dockers/docker-sonic-vs/versions-py3 @@ -25,7 +25,7 @@ pygments==2.15.1 pygobject==3.44.1 pyparsing==3.0.9 pyroute2==0.5.14 -requests==2.28.2 +requests==2.29.0 scapy==2.4.4 semantic-version==2.10.0 systemd-python==235 diff --git a/files/build/versions/dockers/sonic-slave-bullseye/versions-deb-bullseye b/files/build/versions/dockers/sonic-slave-bullseye/versions-deb-bullseye index 4a1bdd5785bd..74d480c158c7 100644 --- a/files/build/versions/dockers/sonic-slave-bullseye/versions-deb-bullseye +++ b/files/build/versions/dockers/sonic-slave-bullseye/versions-deb-bullseye @@ -95,7 +95,7 @@ docbook-utils==0.6.14-3.4 docbook-xml==4.5-9 docker-ce==5:20.10.14~3-0~debian-bullseye docker-ce-cli==5:20.10.14~3-0~debian-bullseye -docker-ce-rootless-extras==5:23.0.4-1~debian.11~bullseye +docker-ce-rootless-extras==5:23.0.5-1~debian.11~bullseye docker-scan-plugin==0.23.0~debian-bullseye docutils-common==0.16+dfsg-4 dosfstools==4.2-1 diff --git a/files/build/versions/host-image/versions-py3 b/files/build/versions/host-image/versions-py3 index 48f1ad74dd7c..a8c6a0e07fbd 100644 --- a/files/build/versions/host-image/versions-py3 +++ b/files/build/versions/host-image/versions-py3 @@ -56,7 +56,7 @@ python-dateutil==2.8.2 pyyaml==5.4.1 redis==4.5.4 regex==2023.3.23 -requests==2.28.2 +requests==2.29.0 scapy==2.4.4 semantic-version==2.10.0 six==1.16.0 From 9ac9908321ef829261ff85c9fc9ff2982a0a4229 Mon Sep 17 00:00:00 2001 From: Ying Xie Date: Mon, 1 May 2023 16:48:56 -0700 Subject: [PATCH 063/193] Revert "Clear DNS configuration received from DHCP during networking reconfiguration in Linux. (#13516) (#13695)" (#14900) This reverts commit d1fa414f1bdc695750d4b8cc6665c0526d3ba1df. --- build_debian.sh | 7 +------ files/image_config/interfaces/interfaces-config.sh | 3 --- files/image_config/resolv-config/resolv.conf | 0 files/image_config/resolv-config/resolv.conf.head | 2 -- 4 files changed, 1 insertion(+), 11 deletions(-) create mode 100644 files/image_config/resolv-config/resolv.conf delete mode 100644 files/image_config/resolv-config/resolv.conf.head diff --git a/build_debian.sh b/build_debian.sh index f94f7347dad7..19bce0ff43b5 100755 --- a/build_debian.sh +++ b/build_debian.sh @@ -387,7 +387,6 @@ sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y in jq \ auditd \ linux-perf \ - resolvconf \ lsof \ sysstat @@ -666,11 +665,7 @@ 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 - -## Clear DNS configuration inherited from the build server -sudo rm -f $FILESYSTEM_ROOT/etc/resolvconf/resolv.conf.d/original -sudo cp files/image_config/resolv-config/resolv.conf.head $FILESYSTEM_ROOT/etc/resolvconf/resolv.conf.d/head - +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/interfaces/interfaces-config.sh b/files/image_config/interfaces/interfaces-config.sh index 961349384692..f6aa4147a4e4 100755 --- a/files/image_config/interfaces/interfaces-config.sh +++ b/files/image_config/interfaces/interfaces-config.sh @@ -60,9 +60,6 @@ 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} done -[[ -f /var/run/resolvconf/interface/eth0.dhclient ]] && rm -f /var/run/resolvconf/interface/eth0.dhclient -[[ -f /var/run/resolvconf/interface/eth0.ip6.dhclient ]] && rm -f /var/run/resolvconf/interface/eth0.ip6.dhclient - # Read sysctl conf files again sysctl -p /etc/sysctl.d/90-dhcp6-systcl.conf 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 diff --git a/files/image_config/resolv-config/resolv.conf.head b/files/image_config/resolv-config/resolv.conf.head deleted file mode 100644 index db81bded75e9..000000000000 --- a/files/image_config/resolv-config/resolv.conf.head +++ /dev/null @@ -1,2 +0,0 @@ -# Dynamic resolv.conf(5) file generated by resolvconf(8) -# The content of this file may be overwritten during a config reload. From 0ed0df6ddb65bb5800b02ab266511adcf8b84d73 Mon Sep 17 00:00:00 2001 From: mssonicbld <79238446+mssonicbld@users.noreply.github.com> Date: Tue, 2 May 2023 20:20:59 +0800 Subject: [PATCH 064/193] [ci/build]: Upgrade SONiC package versions (#14913) --- .../versions-deb-bullseye | 1 + .../versions-py3-all-arm64 | 3 +- files/build/versions/default/versions-git | 4 +- files/build/versions/default/versions-mirror | 20 +-- .../versions-deb-bullseye | 5 +- .../versions-deb-bullseye | 7 +- .../versions-deb-buster | 2 +- .../versions-deb-buster-arm64 | 4 +- .../versions-deb-buster-armhf | 4 +- .../docker-dhcp-relay/versions-deb-bullseye | 2 +- .../docker-fpm-frr/versions-deb-bullseye | 2 +- .../versions-deb-bullseye | 6 +- .../docker-orchagent/versions-deb-bullseye | 6 +- .../versions-deb-bullseye | 9 +- .../dockers/docker-ptf/versions-deb-buster | 4 +- .../versions-deb-bullseye | 6 +- .../dockers/docker-snmp/versions-deb-bullseye | 10 +- .../versions-deb-buster | 4 +- .../docker-sonic-vs/versions-deb-buster | 2 +- .../docker-syncd-bfn/versions-deb-buster | 4 +- .../versions-deb-bullseye | 6 +- .../versions-deb-bullseye | 6 +- .../versions-deb-buster | 4 +- .../docker-syncd-mlnx/versions-deb-bullseye | 6 +- .../versions-deb-bullseye | 126 +++++++++--------- .../versions-deb-bullseye-arm64 | 13 +- .../versions-deb-bullseye-armhf | 15 ++- .../sonic-slave-buster/versions-deb-buster | 14 +- .../versions-deb-buster-armhf | 2 +- .../host-base-image/versions-deb-bullseye | 26 ++-- .../versions/host-image/versions-deb-bullseye | 35 +++-- .../host-image/versions-deb-bullseye-arm64 | 1 - .../host-image/versions-deb-bullseye-armhf | 4 +- 33 files changed, 190 insertions(+), 173 deletions(-) diff --git a/files/build/versions/build/build-sonic-slave-bullseye/versions-deb-bullseye b/files/build/versions/build/build-sonic-slave-bullseye/versions-deb-bullseye index 4d7dfd1bcaba..a62518ca04bc 100644 --- a/files/build/versions/build/build-sonic-slave-bullseye/versions-deb-bullseye +++ b/files/build/versions/build/build-sonic-slave-bullseye/versions-deb-bullseye @@ -21,6 +21,7 @@ libsairedis==1.0.0 libsairedis-dev==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 libtac-dev==1.4.1-1 diff --git a/files/build/versions/build/build-sonic-slave-bullseye/versions-py3-all-arm64 b/files/build/versions/build/build-sonic-slave-bullseye/versions-py3-all-arm64 index ef408b5a3f74..5466f6dff37a 100644 --- a/files/build/versions/build/build-sonic-slave-bullseye/versions-py3-all-arm64 +++ b/files/build/versions/build/build-sonic-slave-bullseye/versions-py3-all-arm64 @@ -1,3 +1,4 @@ bitarray==1.5.3 click==7.0 -requests==2.29.0 \ No newline at end of file +requests==2.29.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 e5d85b1cb263..e3130d82d92e 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==1398e4fc6999ef6423626c782599e88bc7fcb5fb https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f https://github.com/CESNET/libyang.git==9a4e5b2ce30b9696116d6e654ee55caab5aafed8 https://github.com/daveolson53/audisp-tacplus.git==559c9f22edd4f2dea0ecedffb3ad9502b12a75b6 @@ -14,7 +14,7 @@ https://github.com/Marvell-switching/mrvl-prestera.git==9dbae444204a2c27b33be698 https://github.com/Mellanox/libpsample.git==62bb27d9a49424e45191eee81df7ce0d8c74e774 https://github.com/opencomputeproject/SAI.git==554852e762f07ccb39db88ff2217d9a540db14fa https://github.com/p4lang/scapy-vxlan.git==85ffe83da156568ee47a0750f638227e6e1d7479 -https://github.com/sflow/host-sflow==ca2631f867668092c5dc54754581ce2b9da04950 +https://github.com/sflow/host-sflow==71a250f56c6f101d6f3821827e5de19086f00b55 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 61b77afbe38d..78c0a752b8fd 100644 --- a/files/build/versions/default/versions-mirror +++ b/files/build/versions/default/versions-mirror @@ -1,15 +1,15 @@ deb.nodesource.com_node%5f14.x_dists_bullseye==2023-02-17T00:35:28Z deb.nodesource.com_node%5f14.x_dists_buster==2023-02-17T00:35:28Z -debian==20230429T000105Z -debian-security==20230429T000105Z +debian==20230502T000201Z +debian-security==20230502T000201Z download.docker.com_linux_debian_dists_bullseye==2023-04-28T15:03:42Z download.docker.com_linux_debian_dists_buster==2023-04-28T15:03:42Z packages.microsoft.com_repos_sonic-dev_dists_jessie==2022-10-31T19:34:29Z -packages.trafficmanager.net_snapshot_debian-security_20230429T000105Z_dists_bullseye-security==2023-04-24T21:13:10Z -packages.trafficmanager.net_snapshot_debian-security_20230429T000105Z_dists_buster_updates==2023-04-24T21:13:10Z -packages.trafficmanager.net_snapshot_debian_20230429T000105Z_dists_bullseye==2022-12-17T10:14:37Z -packages.trafficmanager.net_snapshot_debian_20230429T000105Z_dists_bullseye-backports==2023-04-28T20:10:36Z -packages.trafficmanager.net_snapshot_debian_20230429T000105Z_dists_bullseye-updates==2023-04-28T20:10:36Z -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 \ No newline at end of file +packages.trafficmanager.net_snapshot_debian-security_20230502T000201Z_dists_bullseye-security==2023-05-01T17:44:43Z +packages.trafficmanager.net_snapshot_debian-security_20230502T000201Z_dists_buster_updates==2023-05-01T17:44:44Z +packages.trafficmanager.net_snapshot_debian_20230502T000201Z_dists_bullseye==2023-04-29T09:31:02Z +packages.trafficmanager.net_snapshot_debian_20230502T000201Z_dists_bullseye-backports==2023-05-01T20:14:55Z +packages.trafficmanager.net_snapshot_debian_20230502T000201Z_dists_bullseye-updates==2023-05-01T20:14:55Z +packages.trafficmanager.net_snapshot_debian_20230502T000201Z_dists_buster==2022-09-10T11:30:54Z +packages.trafficmanager.net_snapshot_debian_20230502T000201Z_dists_buster-backports==2023-05-01T20:14:55Z +packages.trafficmanager.net_snapshot_debian_20230502T000201Z_dists_buster-updates==2023-05-01T20:14:55Z \ No newline at end of file diff --git a/files/build/versions/dockers/docker-base-bullseye/versions-deb-bullseye b/files/build/versions/dockers/docker-base-bullseye/versions-deb-bullseye index 4eb79af4c90e..155d079c9110 100644 --- a/files/build/versions/dockers/docker-base-bullseye/versions-deb-bullseye +++ b/files/build/versions/dockers/docker-base-bullseye/versions-deb-bullseye @@ -28,8 +28,8 @@ liblzf1==3.6-3 libmd0==1.0.3-3 libmnl0==1.0.4-3 libmpdec3==2.5.1-1 -libncurses6==6.2+20201114-2 -libncursesw6==6.2+20201114-2 +libncurses6==6.2+20201114-2+deb11u1 +libncursesw6==6.2+20201114-2+deb11u1 libnghttp2-14==1.43.0-1 libnorm1==1.5.9+dfsg-2 libonig5==6.9.6-1.1 @@ -49,6 +49,7 @@ libsqlite3-0==3.34.1-3 libssh2-1==1.9.0-2 libssl-dev==1.1.1n-0+deb11u4+fips libssl1.1==1.1.1n-0+deb11u4+fips +libtinfo6==6.2+20201114-2+deb11u1 libwrap0==7.6.q-31 libxtables12==1.8.7-1 libzmq5==4.3.4-1 diff --git a/files/build/versions/dockers/docker-config-engine-bullseye/versions-deb-bullseye b/files/build/versions/dockers/docker-config-engine-bullseye/versions-deb-bullseye index 4abe2d73975d..1dbd24b120d5 100644 --- a/files/build/versions/dockers/docker-config-engine-bullseye/versions-deb-bullseye +++ b/files/build/versions/dockers/docker-config-engine-bullseye/versions-deb-bullseye @@ -13,8 +13,9 @@ gcc==4:10.2.1-1 gcc-10==10.2.1-6 libasan6==10.2.1-6 libbinutils==2.35.2-2 -libc-dev-bin==2.31-13+deb11u5 -libc6-dev==2.31-13+deb11u5 +libc-dev-bin==2.31-13+deb11u6 +libc6==2.31-13+deb11u6 +libc6-dev==2.31-13+deb11u6 libcc1-0==10.2.1-6 libcrypt-dev==1:4.4.18-4 libctf-nobfd0==2.35.2-2 @@ -49,7 +50,7 @@ libtsan0==10.2.1-6 libubsan1==10.2.1-6 libyang==1.0.73 libyang-cpp==1.0.73 -linux-libc-dev==5.10.162-1 +linux-libc-dev==5.10.178-3 make==4.3-4.1 patch==2.7.6-7 python3-dev==3.9.2-3 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 19a53096547b..5086f7c7e5ad 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 @@ -44,7 +44,7 @@ libtsan0==8.3.0-6 libubsan1==8.3.0-6 libyang==1.0.73 libyang-cpp==1.0.73 -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-dhcp-relay/versions-deb-bullseye b/files/build/versions/dockers/docker-dhcp-relay/versions-deb-bullseye index 99fb47ac111d..bdc70c7e1d0d 100644 --- a/files/build/versions/dockers/docker-dhcp-relay/versions-deb-bullseye +++ b/files/build/versions/dockers/docker-dhcp-relay/versions-deb-bullseye @@ -12,7 +12,7 @@ libdns-export1110==1:9.11.19+dfsg-2.1 libdw1==0.183-1 libedit2==3.1-20191231-2+b1 libevent-2.1-7==2.1.12-stable-1 -libexplain51==1.4.D001-11 +libexplain51==1.4.D001-11+deb11u1 libfido2-1==1.6.0-2 libglib2.0-0==2.66.8-1 libgpm2==1.20.7-8 diff --git a/files/build/versions/dockers/docker-fpm-frr/versions-deb-bullseye b/files/build/versions/dockers/docker-fpm-frr/versions-deb-bullseye index 56f4f3045831..479f7e112a22 100644 --- a/files/build/versions/dockers/docker-fpm-frr/versions-deb-bullseye +++ b/files/build/versions/dockers/docker-fpm-frr/versions-deb-bullseye @@ -7,7 +7,7 @@ gdb==10.1-1.7 gdbserver==10.1-1.7 libbabeltrace1==1.5.8-1+b3 libboost-regex1.74.0==1.74.0-9 -libc-ares2==1.17.1-1+deb11u1 +libc-ares2==1.17.1-1+deb11u2 libcbor0==0.5.0+dfsg-2 libcurl3-gnutls==7.74.0-1.3+deb11u7 libdebuginfod1==0.183-1 diff --git a/files/build/versions/dockers/docker-gbsyncd-broncos/versions-deb-bullseye b/files/build/versions/dockers/docker-gbsyncd-broncos/versions-deb-bullseye index 11871bc77364..97b52d50f8d9 100644 --- a/files/build/versions/dockers/docker-gbsyncd-broncos/versions-deb-bullseye +++ b/files/build/versions/dockers/docker-gbsyncd-broncos/versions-deb-bullseye @@ -2,8 +2,8 @@ gdb==10.1-1.7 gdbserver==10.1-1.7 libbabeltrace1==1.5.8-1+b3 libboost-regex1.74.0==1.74.0-9 -libc-dev-bin==2.31-13+deb11u5 -libc6-dev==2.31-13+deb11u5 +libc-dev-bin==2.31-13+deb11u6 +libc6-dev==2.31-13+deb11u6 libcbor0==0.5.0+dfsg-2 libcrypt-dev==1:4.4.18-4 libcurl3-gnutls==7.74.0-1.3+deb11u7 @@ -29,7 +29,7 @@ libsource-highlight4v5==3.1.9-3+b1 libswsscommon-dbgsym==1.0.0 libtirpc-dev==1.3.1-1+deb11u1 libunwind8==1.3.2-2 -linux-libc-dev==5.10.162-1 +linux-libc-dev==5.10.178-3 openssh-client==1:8.4p1-5+deb11u1 sshpass==1.09-1+b1 strace==5.10-1 diff --git a/files/build/versions/dockers/docker-orchagent/versions-deb-bullseye b/files/build/versions/dockers/docker-orchagent/versions-deb-bullseye index f19b8913e5e1..841f33da39e2 100644 --- a/files/build/versions/dockers/docker-orchagent/versions-deb-bullseye +++ b/files/build/versions/dockers/docker-orchagent/versions-deb-bullseye @@ -19,8 +19,8 @@ libasan6==10.2.1-6 libbabeltrace1==1.5.8-1+b3 libbinutils==2.35.2-2 libboost-regex1.74.0==1.74.0-9 -libc-dev-bin==2.31-13+deb11u5 -libc6-dev==2.31-13+deb11u5 +libc-dev-bin==2.31-13+deb11u6 +libc6-dev==2.31-13+deb11u6 libcbor0==0.5.0+dfsg-2 libcc1-0==10.2.1-6 libcrypt-dev==1:4.4.18-4 @@ -66,7 +66,7 @@ libtirpc-dev==1.3.1-1+deb11u1 libtsan0==10.2.1-6 libubsan1==10.2.1-6 libunwind8==1.3.2-2 -linux-libc-dev==5.10.162-1 +linux-libc-dev==5.10.178-3 make==4.3-4.1 ndisc6==1.0.4-2 ndppd==0.2.5-6 diff --git a/files/build/versions/dockers/docker-platform-monitor/versions-deb-bullseye b/files/build/versions/dockers/docker-platform-monitor/versions-deb-bullseye index d56f8b22547f..1ecedb66cb69 100644 --- a/files/build/versions/dockers/docker-platform-monitor/versions-deb-bullseye +++ b/files/build/versions/dockers/docker-platform-monitor/versions-deb-bullseye @@ -27,8 +27,8 @@ libasan6==10.2.1-6 libbabeltrace1==1.5.8-1+b3 libbinutils==2.35.2-2 libboost-regex1.74.0==1.74.0-9 -libc-dev-bin==2.31-13+deb11u5 -libc6-dev==2.31-13+deb11u5 +libc-dev-bin==2.31-13+deb11u6 +libc6-dev==2.31-13+deb11u6 libcairo2==1.16.0-5 libcbor0==0.5.0+dfsg-2 libcc1-0==10.2.1-6 @@ -90,6 +90,7 @@ libthai0==0.1.28-3 libtirpc-dev==1.3.1-1+deb11u1 libtsan0==10.2.1-6 libubsan1==10.2.1-6 +libudev1==247.3-7+deb11u2 libunwind8==1.3.2-2 libx11-6==2:1.7.2-1 libx11-data==2:1.7.2-1 @@ -101,7 +102,7 @@ libxdmcp6==1:1.1.2-3 libxext6==2:1.3.3-1.1 libxml2==2.9.10+dfsg-6.7+deb11u4 libxrender1==1:0.9.10-1 -linux-libc-dev==5.10.162-1 +linux-libc-dev==5.10.178-3 lm-sensors==1:3.6.0-7 lm-sensors-dbgsym==1:3.6.0-7 make==4.3-4.1 @@ -138,7 +139,7 @@ sx-gen-utils-dev==1.mlnx.4.5.4206 sxd-libs==1.mlnx.4.5.4206 sxd-libs-dev==1.mlnx.4.5.4206 ucf==3.0043 -udev==247.3-7+deb11u1 +udev==247.3-7+deb11u2 vim==2:8.2.2434-3+deb11u1 vim-runtime==2:8.2.2434-3+deb11u1 xz-utils==5.2.5-2.1~deb11u1 diff --git a/files/build/versions/dockers/docker-ptf/versions-deb-buster b/files/build/versions/dockers/docker-ptf/versions-deb-buster index cc5462b27afd..21e127d24279 100644 --- a/files/build/versions/dockers/docker-ptf/versions-deb-buster +++ b/files/build/versions/dockers/docker-ptf/versions-deb-buster @@ -352,7 +352,7 @@ libxinerama1==2:1.1.4-2 libxml-parser-perl==2.44-4 libxml-twig-perl==1:3.50-1.1 libxml-xpathengine-perl==0.14-1 -libxml2==2.9.4+dfsg1-7+deb10u5 +libxml2==2.9.4+dfsg1-7+deb10u6 libxmu6==2:1.1.2-2+b3 libxmuu1==2:1.1.2-2+b3 libxpm4==1:3.5.12-1 @@ -367,7 +367,7 @@ libxxf86dga1==2:1.1.4-1+b3 libxxf86vm1==1:1.1.4-1+b2 libxxhash0==0.6.5-2 libzzip-0-13==0.13.62-3.2+deb10u1 -linux-libc-dev==4.19.269-1 +linux-libc-dev==4.19.282-1 lmodern==2.004.5-6 logrotate==3.14.0-4 lsb-base==10.2019051400 diff --git a/files/build/versions/dockers/docker-saiserverv2-mlnx/versions-deb-bullseye b/files/build/versions/dockers/docker-saiserverv2-mlnx/versions-deb-bullseye index 28db4b0a0ff4..6d15f2127efe 100644 --- a/files/build/versions/dockers/docker-saiserverv2-mlnx/versions-deb-bullseye +++ b/files/build/versions/dockers/docker-saiserverv2-mlnx/versions-deb-bullseye @@ -27,8 +27,8 @@ libbabeltrace1==1.5.8-1+b3 libbinutils==2.35.2-2 libboost-atomic1.74.0==1.74.0-9 libboost-regex1.74.0==1.74.0-9 -libc-dev-bin==2.31-13+deb11u5 -libc6-dev==2.31-13+deb11u5 +libc-dev-bin==2.31-13+deb11u6 +libc6-dev==2.31-13+deb11u6 libcc1-0==10.2.1-6 libcrypt-dev==1:4.4.18-4 libctf-nobfd0==2.35.2-2 @@ -89,7 +89,7 @@ libuv1==1.40.0-2 libxml2==2.9.10+dfsg-6.7+deb11u4 libxml2-utils==2.9.10+dfsg-6.7+deb11u4 libxslt1.1==1.1.34-4+deb11u1 -linux-libc-dev==5.10.162-1 +linux-libc-dev==5.10.178-3 mailcap==3.69 make==4.3-4.1 mft==4.22.1-15 diff --git a/files/build/versions/dockers/docker-snmp/versions-deb-bullseye b/files/build/versions/dockers/docker-snmp/versions-deb-bullseye index 44b375fa23c9..1493028db842 100644 --- a/files/build/versions/dockers/docker-snmp/versions-deb-bullseye +++ b/files/build/versions/dockers/docker-snmp/versions-deb-bullseye @@ -13,9 +13,9 @@ libasan6==10.2.1-6 libbabeltrace1==1.5.8-1+b3 libbinutils==2.35.2-2 libboost-regex1.74.0==1.74.0-9 -libc-dev-bin==2.31-13+deb11u5 -libc-l10n==2.31-13+deb11u5 -libc6-dev==2.31-13+deb11u5 +libc-dev-bin==2.31-13+deb11u6 +libc-l10n==2.31-13+deb11u6 +libc6-dev==2.31-13+deb11u6 libcbor0==0.5.0+dfsg-2 libcc1-0==10.2.1-6 libcrypt-dev==1:4.4.18-4 @@ -59,8 +59,8 @@ libtirpc-dev==1.3.1-1+deb11u1 libtsan0==10.2.1-6 libubsan1==10.2.1-6 libunwind8==1.3.2-2 -linux-libc-dev==5.10.162-1 -locales==2.31-13+deb11u5 +linux-libc-dev==5.10.178-3 +locales==2.31-13+deb11u6 make==4.3-4.1 openssh-client==1:8.4p1-5+deb11u1 pci.ids==0.0~2021.02.08-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 9d5e08dd1b8b..74a4b2dedb41 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 @@ -45,8 +45,8 @@ libswsscommon-dbgsym==1.0.0 libtsan0==8.3.0-6 libubsan1==8.3.0-6 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 openssh-client==1:7.9p1-10+deb10u2 python3-dev==3.7.3-1 python3.7-dev==3.7.3-2+deb10u4 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 93475b460da8..a35226470813 100644 --- a/files/build/versions/dockers/docker-sonic-vs/versions-deb-buster +++ b/files/build/versions/dockers/docker-sonic-vs/versions-deb-buster @@ -166,7 +166,7 @@ libxext6==2:1.3.3-1+b2 libxrender-dev==1:0.9.10-1 libxrender1==1:0.9.10-1 libyang2==2.0.112-6 -linux-libc-dev==4.19.269-1 +linux-libc-dev==4.19.282-1 logrotate==3.14.0-4 lsof==4.91+dfsg-1 make==4.2.1-1.2 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 04e344b8e966..1fd8470433a5 100644 --- a/files/build/versions/dockers/docker-syncd-bfn/versions-deb-buster +++ b/files/build/versions/dockers/docker-syncd-bfn/versions-deb-buster @@ -20,6 +20,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-dnx-rpc/versions-deb-bullseye b/files/build/versions/dockers/docker-syncd-brcm-dnx-rpc/versions-deb-bullseye index 9e64141e5920..6856113e7bfc 100644 --- a/files/build/versions/dockers/docker-syncd-brcm-dnx-rpc/versions-deb-bullseye +++ b/files/build/versions/dockers/docker-syncd-brcm-dnx-rpc/versions-deb-bullseye @@ -15,8 +15,8 @@ libarchive13==3.4.3-2+deb11u1 libasan6==10.2.1-6 libbinutils==2.35.2-2 libboost-atomic1.74.0==1.74.0-9 -libc-dev-bin==2.31-13+deb11u5 -libc6-dev==2.31-13+deb11u5 +libc-dev-bin==2.31-13+deb11u6 +libc6-dev==2.31-13+deb11u6 libcc1-0==10.2.1-6 libcrypt-dev==1:4.4.18-4 libctf-nobfd0==2.35.2-2 @@ -55,7 +55,7 @@ libtsan0==10.2.1-6 libubsan1==10.2.1-6 libuv1==1.40.0-2 libxml2==2.9.10+dfsg-6.7+deb11u4 -linux-libc-dev==5.10.162-1 +linux-libc-dev==5.10.178-3 mailcap==3.69 make==4.3-4.1 mime-support==3.66 diff --git a/files/build/versions/dockers/docker-syncd-brcm-rpc/versions-deb-bullseye b/files/build/versions/dockers/docker-syncd-brcm-rpc/versions-deb-bullseye index 9e64141e5920..6856113e7bfc 100644 --- a/files/build/versions/dockers/docker-syncd-brcm-rpc/versions-deb-bullseye +++ b/files/build/versions/dockers/docker-syncd-brcm-rpc/versions-deb-bullseye @@ -15,8 +15,8 @@ libarchive13==3.4.3-2+deb11u1 libasan6==10.2.1-6 libbinutils==2.35.2-2 libboost-atomic1.74.0==1.74.0-9 -libc-dev-bin==2.31-13+deb11u5 -libc6-dev==2.31-13+deb11u5 +libc-dev-bin==2.31-13+deb11u6 +libc6-dev==2.31-13+deb11u6 libcc1-0==10.2.1-6 libcrypt-dev==1:4.4.18-4 libctf-nobfd0==2.35.2-2 @@ -55,7 +55,7 @@ libtsan0==10.2.1-6 libubsan1==10.2.1-6 libuv1==1.40.0-2 libxml2==2.9.10+dfsg-6.7+deb11u4 -linux-libc-dev==5.10.162-1 +linux-libc-dev==5.10.178-3 mailcap==3.69 make==4.3-4.1 mime-support==3.66 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 7b55d8b98d22..063b20d55a05 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 @@ -55,8 +55,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-bullseye b/files/build/versions/dockers/docker-syncd-mlnx/versions-deb-bullseye index 597680a3cc44..9ea0234fe0c7 100644 --- a/files/build/versions/dockers/docker-syncd-mlnx/versions-deb-bullseye +++ b/files/build/versions/dockers/docker-syncd-mlnx/versions-deb-bullseye @@ -5,8 +5,8 @@ gdbserver==10.1-1.7 iproute2-dev==1.mlnx.4.5.4206 libbabeltrace1==1.5.8-1+b3 libboost-regex1.74.0==1.74.0-9 -libc-dev-bin==2.31-13+deb11u5 -libc6-dev==2.31-13+deb11u5 +libc-dev-bin==2.31-13+deb11u6 +libc6-dev==2.31-13+deb11u6 libcbor0==0.5.0+dfsg-2 libcrypt-dev==1:4.4.18-4 libcurl3-gnutls==7.74.0-1.3+deb11u7 @@ -44,7 +44,7 @@ libswsscommon-dbgsym==1.0.0 libtirpc-dev==1.3.1-1+deb11u1 libunwind8==1.3.2-2 libxml2==2.9.10+dfsg-6.7+deb11u4 -linux-libc-dev==5.10.162-1 +linux-libc-dev==5.10.178-3 mailcap==3.69 mft==4.22.1-15 mime-support==3.66 diff --git a/files/build/versions/dockers/sonic-slave-bullseye/versions-deb-bullseye b/files/build/versions/dockers/sonic-slave-bullseye/versions-deb-bullseye index 74d480c158c7..2375edc180d4 100644 --- a/files/build/versions/dockers/sonic-slave-bullseye/versions-deb-bullseye +++ b/files/build/versions/dockers/sonic-slave-bullseye/versions-deb-bullseye @@ -11,7 +11,7 @@ arch-test==0.17-1 asciidoctor==2.0.12-2 aspell==0.60.8-3 aspell-en==2018.04.16-0-1 -at-spi2-core==2.38.0-4 +at-spi2-core==2.38.0-4+deb11u1 auditd==1:3.0-2 augeas-lenses==1.12.0-2 augeas-tools==1.12.0-2 @@ -145,11 +145,11 @@ gettext==0.21-4 gettext-base==0.21-4 ghostscript==9.53.3~dfsg-7+deb11u4 gir1.2-atk-1.0==2.36.0-2 -gir1.2-atspi-2.0==2.38.0-4 +gir1.2-atspi-2.0==2.38.0-4+deb11u1 gir1.2-freedesktop==1.66.1-1+b1 gir1.2-gdkpixbuf-2.0==2.42.2+dfsg-1+deb11u1 gir1.2-glib-2.0==1.66.1-1+b1 -gir1.2-gtk-3.0==3.24.24-4+deb11u2 +gir1.2-gtk-3.0==3.24.24-4+deb11u3 gir1.2-harfbuzz-0.0==2.7.4-1 gir1.2-packagekitglib-1.0==1.2.2-2 gir1.2-pango-1.0==1.46.2-3 @@ -185,7 +185,7 @@ gstreamer1.0-libav==1.18.4-3 gstreamer1.0-plugins-base==1.18.4-2 gstreamer1.0-plugins-good==1.18.4-2+deb11u1 gstreamer1.0-x==1.18.4-2 -gtk-update-icon-cache==3.24.24-4+deb11u2 +gtk-update-icon-cache==3.24.24-4+deb11u3 guile-2.2-libs==2.2.7+1-6 hicolor-icon-theme==0.17-2 i965-va-driver==2.4.1+dfsg1-1 @@ -266,22 +266,22 @@ libatk1.0-dev==2.36.0-2 libatm1==1:2.5.1-4 libatm1-dev==1:2.5.1-4 libatomic1==10.2.1-6 -libatspi2.0-0==2.38.0-4 -libatspi2.0-dev==2.38.0-4 +libatspi2.0-0==2.38.0-4+deb11u1 +libatspi2.0-dev==2.38.0-4+deb11u1 libattr1-dev==1:2.4.48-6 libaudit-dev==1:3.0-2 libaugeas0==1.12.0-2 libauparse-dev==1:3.0-2 libauparse0==1:3.0-2 libauthen-sasl-perl==2.1600-1.1 -libavahi-client3==0.8-5+deb11u1 -libavahi-common-data==0.8-5+deb11u1 -libavahi-common3==0.8-5+deb11u1 +libavahi-client3==0.8-5+deb11u2 +libavahi-common-data==0.8-5+deb11u2 +libavahi-common3==0.8-5+deb11u2 libavc1394-0==0.5.4-5 -libavcodec58==7:4.3.5-0+deb11u1 -libavfilter7==7:4.3.5-0+deb11u1 -libavformat58==7:4.3.5-0+deb11u1 -libavutil56==7:4.3.5-0+deb11u1 +libavcodec58==7:4.3.6-0+deb11u1 +libavfilter7==7:4.3.6-0+deb11u1 +libavformat58==7:4.3.6-0+deb11u1 +libavutil56==7:4.3.6-0+deb11u1 libb-hooks-endofscope-perl==0.24-1.1 libb-hooks-op-check-perl==0.22-1+b3 libbabeltrace-dev==1.5.8-1+b3 @@ -355,17 +355,18 @@ libbsd-dev==0.11.3-1 libbsd0==0.11.3-1 libbsh-java==2.0b4-20 libbz2-dev==1.0.8-4 -libc-ares-dev==1.17.1-1+deb11u1 -libc-ares2==1.17.1-1+deb11u1 -libc-dev-bin==2.31-13+deb11u5 -libc-devtools==2.31-13+deb11u5 -libc-l10n==2.31-13+deb11u5 -libc6-dbg==2.31-13+deb11u5 -libc6-dev==2.31-13+deb11u5 -libc6-dev-i386==2.31-13+deb11u5 -libc6-dev-x32==2.31-13+deb11u5 -libc6-i386==2.31-13+deb11u5 -libc6-x32==2.31-13+deb11u5 +libc-ares-dev==1.17.1-1+deb11u2 +libc-ares2==1.17.1-1+deb11u2 +libc-dev-bin==2.31-13+deb11u6 +libc-devtools==2.31-13+deb11u6 +libc-l10n==2.31-13+deb11u6 +libc6==2.31-13+deb11u6 +libc6-dbg==2.31-13+deb11u6 +libc6-dev==2.31-13+deb11u6 +libc6-dev-i386==2.31-13+deb11u6 +libc6-dev-x32==2.31-13+deb11u6 +libc6-i386==2.31-13+deb11u6 +libc6-x32==2.31-13+deb11u6 libcaca0==0.99.beta19-2.2 libcacard0==1:2.8.0-3 libcairo-gobject2==1.16.0-5 @@ -518,8 +519,8 @@ libexception-class-perl==1.44-1 libexecs0==1.3-1 libexpat1==2.2.10-2+deb11u5 libexpat1-dev==2.2.10-2+deb11u5 -libexplain-dev==1.4.D001-11 -libexplain51==1.4.D001-11 +libexplain-dev==1.4.D001-11+deb11u1 +libexplain51==1.4.D001-11+deb11u1 libexporter-tiny-perl==1.002002-1 libfabric1==1.11.0-2 libfakeroot==1.25.3-1.1 @@ -625,10 +626,10 @@ libgssrpc4==1.18.3-6+deb11u3 libgstreamer-plugins-base1.0-0==1.18.4-2 libgstreamer1.0-0==1.18.4-2.1 libgtest-dev==1.10.0.20201025-1.1 -libgtk-3-0==3.24.24-4+deb11u2 -libgtk-3-bin==3.24.24-4+deb11u2 -libgtk-3-common==3.24.24-4+deb11u2 -libgtk-3-dev==3.24.24-4+deb11u2 +libgtk-3-0==3.24.24-4+deb11u3 +libgtk-3-bin==3.24.24-4+deb11u3 +libgtk-3-common==3.24.24-4+deb11u3 +libgtk-3-dev==3.24.24-4+deb11u3 libgts-0.7-5==0.7.6+darcs121130-4+b1 libgts-bin==0.7.6+darcs121130-4+b1 libguava-java==29.0-6 @@ -788,9 +789,9 @@ libmagickwand-6.q16-6==8:6.9.11.60+dfsg-1.3+deb11u1 libmail-sendmail-perl==0.80-1.1 libmailtools-perl==2.21-1 libmailutils7==1:3.10-3+b1 -libmariadb-dev==1:10.5.18-0+deb11u1 -libmariadb-dev-compat==1:10.5.18-0+deb11u1 -libmariadb3==1:10.5.18-0+deb11u1 +libmariadb-dev==1:10.5.19-0+deb11u2 +libmariadb-dev-compat==1:10.5.19-0+deb11u2 +libmariadb3==1:10.5.19-0+deb11u2 libmarkdown2==2.2.6-1 libmaven-archiver-java==3.2.0-2.1 libmaven-clean-plugin-java==3.1.0-1 @@ -841,10 +842,10 @@ libnamespace-autoclean-perl==0.29-1 libnamespace-clean-perl==0.27-1 libnanomsg-dev==1.1.5+dfsg-1+b2 libnanomsg5==1.1.5+dfsg-1+b2 -libncurses-dev==6.2+20201114-2 -libncurses5-dev==6.2+20201114-2 -libncurses6==6.2+20201114-2 -libncursesw6==6.2+20201114-2 +libncurses-dev==6.2+20201114-2+deb11u1 +libncurses5-dev==6.2+20201114-2+deb11u1 +libncurses6==6.2+20201114-2+deb11u1 +libncursesw6==6.2+20201114-2+deb11u1 libndctl6==71.1-1 libnet-dbus-perl==1.2.0-1+b1 libnet-domain-tld-perl==1.75-1.1 @@ -870,7 +871,7 @@ libnorm1==1.5.9+dfsg-2 libnpth0==1.6-3 libnsl-dev==1.3.0-2 libnspr4==2:4.29-1 -libnss-systemd==247.3-7+deb11u1 +libnss-systemd==247.3-7+deb11u2 libnss3==2:3.61-1+deb11u3 libntlm0==1.6-3 libnuma-dev==2.0.12-1+b1 @@ -908,7 +909,7 @@ libpackage-stash-xs-perl==0.29-1+b2 libpackagekit-glib2-18==1.2.2-2 libpadwalker-perl==2.5-1+b1 libpam-cap==1:2.44-1 -libpam-systemd==247.3-7+deb11u1 +libpam-systemd==247.3-7+deb11u2 libpam0g-dev==1.4.0-9+deb11u1 libpango-1.0-0==1.46.2-3 libpango1.0-dev==1.46.2-3 @@ -979,7 +980,7 @@ libpod-parser-perl==1.63-2 libpolkit-agent-1-0==0.105-31+deb11u1 libpolkit-gobject-1-0==0.105-31+deb11u1 libpopt0==1.18-2 -libpostproc55==7:4.3.5-0+deb11u1 +libpostproc55==7:4.3.6-0+deb11u1 libproc-processtable-perl==0.59-2+b1 libprocps8==2:3.3.17-5 libprotobuf-c1==1.3.3-1+b2 @@ -1122,12 +1123,13 @@ libsubunit-dev==1.4.0-3 libsubunit0==1.4.0-3 libsurefire-java==2.22.3-1 libswitch-perl==2.17-2.1 -libswresample3==7:4.3.5-0+deb11u1 -libswscale5==7:4.3.5-0+deb11u1 +libswresample3==7:4.3.6-0+deb11u1 +libswscale5==7:4.3.6-0+deb11u1 libsynctex2==2020.20200327.54578-7 libsys-cpuaffinity-perl==1.13~03-1 libsys-hostname-long-perl==1.5-2 -libsystemd-dev==247.3-7+deb11u1 +libsystemd-dev==247.3-7+deb11u2 +libsystemd0==247.3-7+deb11u2 libtag1v5==1.11.1+dfsg.1-3 libtag1v5-vanilla==1.11.1+dfsg.1-3 libtask-weaken-perl==1.06-1 @@ -1157,6 +1159,7 @@ libtiff5==4.2.0-1+deb11u4 libtime-duration-perl==1.21-1 libtime-moment-perl==0.44-1+b3 libtimedate-perl==2.3300-2 +libtinfo6==6.2+20201114-2+deb11u1 libtinyxml2-8==8.0.0+dfsg-2 libtinyxml2-dev==8.0.0+dfsg-2 libtirpc-dev==1.3.1-1+deb11u1 @@ -1172,9 +1175,10 @@ libtypes-serialiser-perl==1.01-1 libubsan1==10.2.1-6 libuchardet0==0.0.7-1 libucx0==1.10.1~rc1+really.1.10.0-1 -libudev-dev==247.3-7+deb11u1 +libudev-dev==247.3-7+deb11u2 +libudev1==247.3-7+deb11u2 libudfread0==1.1.1-1 -libunbound8==1.13.1-1 +libunbound8==1.13.1-1+deb11u1 libunicode-utf8-perl==0.62-1+b2 libunivocity-parsers-java==2.8.3-2 libunwind-dev==1.3.2-2 @@ -1200,8 +1204,8 @@ libvdpau1==1.4-3 libvelocity-tools-java==2.0-8 libvidstab1.1==1.1.0-2+b1 libvirglrenderer1==0.8.2-5+deb11u1 -libvirt-clients==7.0.0-3 -libvirt0==7.0.0-3 +libvirt-clients==7.0.0-3+deb11u2 +libvirt0==7.0.0-3+deb11u2 libvisual-0.4-0==0.4.0-17 libvorbis0a==1.3.7-1 libvorbisenc2==1.3.7-1 @@ -1252,7 +1256,7 @@ libx32quadmath0==10.2.1-6 libx32stdc++6==10.2.1-6 libx32ubsan1==10.2.1-6 libxalan2-java==2.7.2-4 -libxapian30==1.4.18-3 +libxapian30==1.4.18-3+deb11u1 libxau-dev==1:1.0.9-1 libxau6==1:1.0.9-1 libxaw7==2:1.0.13-1.1 @@ -1332,7 +1336,7 @@ libxmlrpc-lite-perl==0.717-4 libxmu6==2:1.1.2-2+b3 libxmuu1==2:1.1.2-2+b3 libxnvctrl0==470.141.03-1~deb11u1 -libxpm4==1:3.5.12-1 +libxpm4==1:3.5.12-1.1~deb11u1 libxrandr-dev==2:1.5.1-1 libxrandr2==2:1.5.1-1 libxrender-dev==1:0.9.10-1 @@ -1364,19 +1368,19 @@ libzvbi0==0.2.35-18 libzzip-0-13==0.13.62-3.3+deb11u1 licensecheck==3.1.1-2 lintian==2.104.0 -linux-compiler-gcc-10-x86==5.10.162-1 -linux-headers-5.10.0-21-amd64==5.10.162-1 -linux-headers-5.10.0-21-common==5.10.162-1 -linux-headers-amd64==5.10.162-1 -linux-kbuild-5.10==5.10.162-1 -linux-libc-dev==5.10.162-1 +linux-compiler-gcc-10-x86==5.10.178-3 +linux-headers-5.10.0-22-amd64==5.10.178-3 +linux-headers-5.10.0-22-common==5.10.178-3 +linux-headers-amd64==5.10.178-3 +linux-kbuild-5.10==5.10.178-3 +linux-libc-dev==5.10.178-3 linuxdoc-tools==0.9.82-1 llvm-11==1:11.0.1-2 llvm-11-dev==1:11.0.1-2 llvm-11-runtime==1:11.0.1-2 llvm-11-tools==1:11.0.1-2 lmodern==2.004.5-6.1 -locales==2.31-13+deb11u5 +locales==2.31-13+deb11u6 logrotate==3.18.0-2+deb11u1 lsb-release==11.1.0 lsof==4.93.2+dfsg-1.1 @@ -1399,7 +1403,7 @@ man-db==2.9.4-2 man2html-base==1.6g-14 manpages==5.10-1 manpages-dev==5.10-1 -mariadb-common==1:10.5.18-0+deb11u1 +mariadb-common==1:10.5.19-0+deb11u2 maven==3.6.3-5 maven-debian-helper==2.6 maven-repo-helper==1.10 @@ -1410,7 +1414,7 @@ mesa-vulkan-drivers==20.3.5-1 mime-support==3.66 module-assistant==0.11.10 mysql-common==5.8+1.0.7 -ncurses-term==6.2+20201114-2 +ncurses-term==6.2+20201114-2+deb11u1 netbase==6.3 netpbm==2:10.0-15.4 nftables==0.9.8-3.1+deb11u1 @@ -1669,9 +1673,9 @@ strace==5.10-1 sudo==1.9.5p2-3+deb11u1 swig==4.0.2-1 swig4.0==4.0.2-1 -systemd==247.3-7+deb11u1 -systemd-sysv==247.3-7+deb11u1 -systemd-timesyncd==247.3-7+deb11u1 +systemd==247.3-7+deb11u2 +systemd-sysv==247.3-7+deb11u2 +systemd-timesyncd==247.3-7+deb11u2 t1utils==1.41-4 tcl==8.6.11+1 tcl8.6==8.6.11+dfsg-1 diff --git a/files/build/versions/dockers/sonic-slave-bullseye/versions-deb-bullseye-arm64 b/files/build/versions/dockers/sonic-slave-bullseye/versions-deb-bullseye-arm64 index 2b165604932b..470ad88a9a5d 100644 --- a/files/build/versions/dockers/sonic-slave-bullseye/versions-deb-bullseye-arm64 +++ b/files/build/versions/dockers/sonic-slave-bullseye/versions-deb-bullseye-arm64 @@ -1,15 +1,19 @@ +base-files==11.1+deb11u7 binutils-aarch64-linux-gnu==2.35.2-2 binutils-arm-linux-gnueabihf==2.35.2-2 cpp-10-arm-linux-gnueabihf==10.2.1-6cross1 cpp-arm-linux-gnueabihf==4:10.2.1-1 dctrl-tools==2.24-3 +debian-archive-keyring==2021.1.1+deb11u1 dvipng==1.15-1.1 gcc-10-arm-linux-gnueabihf==10.2.1-6cross1 gcc-10-arm-linux-gnueabihf-base==10.2.1-6cross1 gcc-10-cross-base==10.2.1-6cross1 gcc-arm-linux-gnueabihf==4:10.2.1-1 +grep==3.6-1+deb11u1 libasan6-armhf-cross==10.2.1-6cross1 libatomic1-armhf-cross==10.2.1-6cross1 +libc-bin==2.31-13+deb11u6 libc6-armhf-cross==2.31-9cross4 libgcc-10-dev-armhf-cross==10.2.1-6cross1 libgcc-s1-armhf-cross==10.2.1-6cross1 @@ -17,6 +21,9 @@ libgomp1-armhf-cross==10.2.1-6cross1 libstdc++6-armhf-cross==10.2.1-6cross1 libubsan1-armhf-cross==10.2.1-6cross1 libxslt1-dev==1.1.34-4+deb11u1 -linux-headers-5.10.0-21-arm64==5.10.162-1 -linux-headers-arm64==5.10.162-1 -nodejs==14.21.3-deb-1nodesource1 \ No newline at end of file +linux-headers-5.10.0-22-arm64==5.10.178-3 +linux-headers-arm64==5.10.178-3 +ncurses-base==6.2+20201114-2+deb11u1 +ncurses-bin==6.2+20201114-2+deb11u1 +nodejs==14.21.3-deb-1nodesource1 +tzdata==2021a-1+deb11u10 \ No newline at end of file diff --git a/files/build/versions/dockers/sonic-slave-bullseye/versions-deb-bullseye-armhf b/files/build/versions/dockers/sonic-slave-bullseye/versions-deb-bullseye-armhf index b2ce3312f7ed..1a99d2f7582d 100644 --- a/files/build/versions/dockers/sonic-slave-bullseye/versions-deb-bullseye-armhf +++ b/files/build/versions/dockers/sonic-slave-bullseye/versions-deb-bullseye-armhf @@ -1,6 +1,8 @@ +base-files==11.1+deb11u7 binutils-arm-linux-gnueabihf==2.35.2-2 bubblewrap==0.4.1-3 dctrl-tools==2.24-3 +debian-archive-keyring==2021.1.1+deb11u1 doxygen==1.9.1-2 dvipng==1.15-1.1 faketime==0.9.8-9 @@ -9,6 +11,8 @@ gir1.2-poppler-0.18==20.09.0-3.1+deb11u1 gir1.2-rsvg-2.0==2.50.3+dfsg-1 golang-1.15-go==1.15.15-1~deb11u4 golang-1.15-src==1.15.15-1~deb11u4 +grep==3.6-1+deb11u1 +libc-bin==2.31-13+deb11u6 libclang-11-dev==1:11.0.1-2 libemail-date-format-perl==1.005-1.1 libfaketime==0.9.8-9 @@ -31,15 +35,17 @@ libsass1==3.6.4+20201122-1 libsombok3==2.4.0-2+b1 libspecio-perl==0.47-1 libunicode-linebreak-perl==0.0.20190101-1+b2 -libxapian-dev==1.4.18-3 +libxapian-dev==1.4.18-3+deb11u1 libxslt1-dev==1.1.34-4+deb11u1 libxstring-perl==0.005-1+b1 libyaml-tiny-perl==1.73-1 -linux-compiler-gcc-10-arm==5.10.162-1 -linux-headers-5.10.0-21-armmp==5.10.162-1 -linux-headers-armmp==5.10.162-1 +linux-compiler-gcc-10-arm==5.10.178-3 +linux-headers-5.10.0-22-armmp==5.10.178-3 +linux-headers-armmp==5.10.178-3 mat2==0.12.1-2+deb11u1 nasm==2.15.05-1 +ncurses-base==6.2+20201114-2+deb11u1 +ncurses-bin==6.2+20201114-2+deb11u1 nodejs==14.21.3-deb-1nodesource1 ps2eps==1.68+binaryfree-3 python3-cairo==1.16.2-4+b2 @@ -51,4 +57,5 @@ sassc==3.6.1+20201027-1 texlive-extra-utils==2020.20210202-3 texlive-font-utils==2020.20210202-3 texlive-luatex==2020.20210202-3 +tzdata==2021a-1+deb11u10 yui-compressor==2.4.8-2.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 9b857945c282..76bac1f4b499 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+deb10u6 +distro-info-data==0.41+deb10u7 dkms==2.6.1-4 dmeventd==2:1.02.155-3 dmsetup==2:1.02.155-3 @@ -1310,9 +1310,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 @@ -1349,12 +1349,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-compiler-gcc-8-x86==4.19.282-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-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 4800331c866b..54af3306d1a9 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 @@ -101,7 +101,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/host-base-image/versions-deb-bullseye b/files/build/versions/host-base-image/versions-deb-bullseye index ac0f59561db9..0b5524f8523e 100644 --- a/files/build/versions/host-base-image/versions-deb-bullseye +++ b/files/build/versions/host-base-image/versions-deb-bullseye @@ -1,13 +1,13 @@ adduser==3.118 apt==2.2.4 -base-files==11.1+deb11u6 +base-files==11.1+deb11u7 base-passwd==3.5.51 bash==5.1-2+deb11u1 bsdutils==1:2.36.1-8+deb11u1 coreutils==8.32-4+b1 dash==0.5.11+git20200708+dd9ef66-5 debconf==1.5.77 -debian-archive-keyring==2021.1.1 +debian-archive-keyring==2021.1.1+deb11u1 debianutils==4.11.2 diffutils==1:3.7-5 dpkg==1.20.12 @@ -16,7 +16,7 @@ findutils==4.8.0-1 gcc-10-base==10.2.1-6 gcc-9-base==9.3.0-22 gpgv==2.2.27-2+deb11u2 -grep==3.6-1 +grep==3.6-1+deb11u1 gzip==1.10-4+deb11u1 hostname==3.23 init-system-helpers==1.60 @@ -27,8 +27,8 @@ libaudit-common==1:3.0-2 libaudit1==1:3.0-2 libblkid1==2.36.1-8+deb11u1 libbz2-1.0==1.0.8-4 -libc-bin==2.31-13+deb11u5 -libc6==2.31-13+deb11u5 +libc-bin==2.31-13+deb11u6 +libc6==2.31-13+deb11u6 libcap-ng0==0.7.9-2.2+b1 libcom-err2==1.46.2-2 libcrypt1==1:4.4.18-4 @@ -39,7 +39,7 @@ libffi7==3.3-6 libgcc-s1==10.2.1-6 libgcrypt20==1.8.7-6 libgmp10==2:6.2.1+dfsg-1+deb11u1 -libgnutls30==3.7.1-5+deb11u2 +libgnutls30==3.7.1-5+deb11u3 libgpg-error0==1.38-2 libgssapi-krb5-2==1.18.3-6+deb11u3 libhogweed6==3.7.3-1 @@ -67,14 +67,14 @@ libsemanage1==3.1-1+b2 libsepol1==3.1-1 libsmartcols1==2.36.1-8+deb11u1 libss2==1.46.2-2 -libssl1.1==1.1.1n-0+deb11u3 +libssl1.1==1.1.1n-0+deb11u4 libstdc++6==10.2.1-6 -libsystemd0==247.3-7+deb11u1 +libsystemd0==247.3-7+deb11u2 libtasn1-6==4.16.0-2+deb11u1 -libtinfo6==6.2+20201114-2 +libtinfo6==6.2+20201114-2+deb11u1 libtirpc-common==1.3.1-1+deb11u1 libtirpc3==1.3.1-1+deb11u1 -libudev1==247.3-7+deb11u1 +libudev1==247.3-7+deb11u2 libunistring2==0.9.10-4 libuuid1==2.36.1-8+deb11u1 libxxhash0==0.8.0-2 @@ -84,13 +84,13 @@ logsave==1.46.2-2 lsb-base==11.1.0 mawk==1.3.4.20200120-2 mount==2.36.1-8+deb11u1 -ncurses-base==6.2+20201114-2 -ncurses-bin==6.2+20201114-2 +ncurses-base==6.2+20201114-2+deb11u1 +ncurses-bin==6.2+20201114-2+deb11u1 passwd==1:4.8.1-1 perl-base==5.32.1-4+deb11u2 sed==4.7-1 sysvinit-utils==2.96-7+deb11u1 tar==1.34+dfsg-1 -tzdata==2021a-1+deb11u8 +tzdata==2021a-1+deb11u10 util-linux==2.36.1-8+deb11u1 zlib1g==1:1.2.11.dfsg-2+deb11u2 \ No newline at end of file diff --git a/files/build/versions/host-image/versions-deb-bullseye b/files/build/versions/host-image/versions-deb-bullseye index c46a9a1bba53..67dcd810658b 100644 --- a/files/build/versions/host-image/versions-deb-bullseye +++ b/files/build/versions/host-image/versions-deb-bullseye @@ -83,7 +83,7 @@ iproute2==5.10.0-4 iptables==1.8.7-1 iptables-persistent==1.0.15 iputils-ping==3:20210202-1 -isc-dhcp-client==4.4.1-2.3+deb11u1 +isc-dhcp-client==4.4.1-2.3+deb11u2 iso-codes==4.6.0-1 jq==1.6-2.1 kdump-tools==1:1.6.8.4 @@ -106,10 +106,10 @@ libbpf0==1:0.3-2 libbrotli-dev==1.0.9-2+b2 libbrotli1==1.0.9-2+b2 libbsd0==0.11.3-1 -libc-ares2==1.17.1-1+deb11u1 -libc-dev-bin==2.31-13+deb11u5 -libc-l10n==2.31-13+deb11u5 -libc6-dev==2.31-13+deb11u5 +libc-ares2==1.17.1-1+deb11u2 +libc-dev-bin==2.31-13+deb11u6 +libc-l10n==2.31-13+deb11u6 +libc6-dev==2.31-13+deb11u6 libcairo-gobject2==1.16.0-5 libcairo-script-interpreter2==1.16.0-5 libcairo2==1.16.0-5 @@ -165,7 +165,6 @@ libglib2.0-bin==2.66.8-1 libglib2.0-data==2.66.8-1 libglib2.0-dev==2.66.8-1 libglib2.0-dev-bin==2.66.8-1 -libgnutls30==3.7.1-5+deb11u3 libgomp1==10.2.1-6 libgpm2==1.20.7-8 libgrpc++1==1.30.2-3 @@ -202,8 +201,8 @@ libmount-dev==2.36.1-8+deb11u1 libmpc3==1.2.0-1 libmpdec3==2.5.1-1 libmpfr6==4.1.0-3 -libncurses6==6.2+20201114-2 -libncursesw6==6.2+20201114-2 +libncurses6==6.2+20201114-2+deb11u1 +libncursesw6==6.2+20201114-2+deb11u1 libnet1==1.1.6+dfsg-3.1 libnetfilter-conntrack3==1.0.8-3 libnfnetlink0==1.0.1-3+b1 @@ -271,7 +270,7 @@ libssl1.1==1.1.1n-0+deb11u4+fips libstdc++-10-dev==10.2.1-6 libswsscommon==1.0.0 libsysfs2==2.1.0+repack-7 -libsystemd-dev==247.3-7+deb11u1 +libsystemd-dev==247.3-7+deb11u2 libtac2==1.4.1-1 libtcl8.6==8.6.11+dfsg-1 libtirpc-dev==1.3.1-1+deb11u1 @@ -306,10 +305,10 @@ libyang==1.0.73 libyang-cpp==1.0.73 linux-base==4.6 linux-image-5.10.0-18-2-amd64-unsigned==5.10.140-1 -linux-libc-dev==5.10.162-1 -linux-perf==5.10.162-1 -linux-perf-5.10==5.10.162-1 -locales==2.31-13+deb11u5 +linux-libc-dev==5.10.178-3 +linux-perf==5.10.178-3 +linux-perf-5.10==5.10.178-3 +locales==2.31-13+deb11u6 logrotate==3.18.0-2+deb11u1 lsb-release==11.1.0 lsof==4.93.2+dfsg-1.1 @@ -371,7 +370,6 @@ python3.9-dev==3.9.2-1 python3.9-minimal==3.9.2-1 rasdaemon==0.6.6-2 readline-common==8.1-1 -resolvconf==1.87 rsyslog==8.2102.0-2+deb11u1 runit-helper==2.10.3 screen==4.8.0-6 @@ -392,16 +390,15 @@ sx-kernel==1.mlnx.4.5.4206 symcrypt-openssl==0.1 sysfsutils==2.1.0+repack-7 sysstat==12.5.2-2 -systemd==247.3-7+deb11u1 +systemd==247.3-7+deb11u2 systemd-sonic-generator==1.0.0 -systemd-sysv==247.3-7+deb11u1 +systemd-sysv==247.3-7+deb11u2 tcpdump==4.99.0-2+deb11u1 tcptraceroute==1.5beta7+debian-4.1+b1 -traceroute==1:2.1.0-2+b1 -tzdata==2021a-1+deb11u9 +traceroute==1:2.1.0-2+deb11u1 u-boot-tools==2021.01+dfsg-5 ucf==3.0043 -udev==247.3-7+deb11u1 +udev==247.3-7+deb11u2 unzip==6.0-26+deb11u1 usbutils==1:013-3 uuid-dev==2.36.1-8+deb11u1 diff --git a/files/build/versions/host-image/versions-deb-bullseye-arm64 b/files/build/versions/host-image/versions-deb-bullseye-arm64 index a3d1ce77cb93..f689d9d3d249 100644 --- a/files/build/versions/host-image/versions-deb-bullseye-arm64 +++ b/files/build/versions/host-image/versions-deb-bullseye-arm64 @@ -10,5 +10,4 @@ libxslt1.1==1.1.34-4+deb11u1 linux-image-5.10.0-18-2-arm64-unsigned==5.10.140-1 ntpstat==0.0.0.1-2 picocom==3.1-2 -traceroute==1:2.1.0-2 tsingma-bsp==1.0 \ No newline at end of file diff --git a/files/build/versions/host-image/versions-deb-bullseye-armhf b/files/build/versions/host-image/versions-deb-bullseye-armhf index 4d06f75b128f..d55ee678551b 100644 --- a/files/build/versions/host-image/versions-deb-bullseye-armhf +++ b/files/build/versions/host-image/versions-deb-bullseye-armhf @@ -4,7 +4,6 @@ icu-devtools==67.1-7 libicu-dev==67.1-7 libicu67==67.1-7 libssl-dev==1.1.1n-0+deb11u4 -libssl1.1==1.1.1n-0+deb11u4 libxml2==2.9.10+dfsg-6.7+deb11u4 libxml2-dev==2.9.10+dfsg-6.7+deb11u4 libxslt1-dev==1.1.34-4+deb11u1 @@ -16,5 +15,4 @@ openssh-client==1:8.4p1-5+deb11u1 openssh-server==1:8.4p1-5+deb11u1 openssh-sftp-server==1:8.4p1-5+deb11u1 openssl==1.1.1n-0+deb11u4 -picocom==3.1-2 -traceroute==1:2.1.0-2 \ No newline at end of file +picocom==3.1-2 \ No newline at end of file From 9ca6b9cb6cb88421bee11fcf44a4c4d541ab0d1d Mon Sep 17 00:00:00 2001 From: abdosi <58047199+abdosi@users.noreply.github.com> Date: Tue, 2 May 2023 10:55:17 -0700 Subject: [PATCH 065/193] Added changes for chassis: (#14816) What/Why I did: Allow traffic with source and destination as chassis eth1-midplane ip. Needed for Supervisor Redis-db connection (Redis packet has source and destination ip as eth1-midpane) after we load acl.json that has catch-all drop rule. Changes are generic and not specific to supervisor and applies on LC also. Made multi_asic_ns_to_host_fwd as False for ACL service for External Client. This flag is needed for service SSH and SNMP where traffic can come in namespace over front-panel ports and we need to send the traffic in host where corresponding docker/service are running. There is no use-case of External client service for multi-asic as of now. Having flag as True creates failure when we try to load acl.json. --- src/sonic-host-services/scripts/caclmgrd | 23 +++++++++++++------ .../caclmgrd/cacl_external_client_acl_test.py | 2 +- .../caclmgrd_chassis_midplane_test.py | 4 +++- .../caclmgrd/test_chassis_midplane_vectors.py | 1 + 4 files changed, 21 insertions(+), 9 deletions(-) diff --git a/src/sonic-host-services/scripts/caclmgrd b/src/sonic-host-services/scripts/caclmgrd index a28a41a0326e..b82ae5113349 100755 --- a/src/sonic-host-services/scripts/caclmgrd +++ b/src/sonic-host-services/scripts/caclmgrd @@ -102,7 +102,7 @@ class ControlPlaneAclManager(daemon_base.DaemonBase): }, "EXTERNAL_CLIENT": { "ip_protocols": ["tcp"], - "multi_asic_ns_to_host_fwd":True + "multi_asic_ns_to_host_fwd":False }, "ANY": { "ip_protocols": ["any"], @@ -275,14 +275,23 @@ class ControlPlaneAclManager(daemon_base.DaemonBase): return block_ip2me_cmds - def check_chassis_midplane_interface_exist(self): - return self.run_commands(["ip link show" + " | grep -w 'eth1-midplane'" ], ignore_error=True) + def get_chassis_midplane_interface_ip(self): + + chassis_midplane_ip_command = "ip -4 -o addr show " + "eth1-midplane" +\ + " | awk '{print $4}' | cut -d'/' -f1 | head -1" + return self.run_commands([chassis_midplane_ip_command]) + def generate_allow_internal_chasis_midplane_traffic(self, namespace): - if not namespace and self.check_chassis_midplane_interface_exist(): - return ["iptables -A INPUT -i eth1-midplane -j ACCEPT"] - else: - return [] + allow_internal_chassis_midplane_traffic = [] + if not namespace: + chassis_midplane_ip = self.get_chassis_midplane_interface_ip() + if not chassis_midplane_ip: + return allow_internal_chassis_midplane_traffic + allow_internal_chassis_midplane_traffic.append("iptables -A INPUT -s {} -d {} -j ACCEPT".format(chassis_midplane_ip, chassis_midplane_ip)) + allow_internal_chassis_midplane_traffic.append("iptables -A INPUT -i eth1-midplane -j ACCEPT") + + return allow_internal_chassis_midplane_traffic def generate_allow_internal_docker_ip_traffic_commands(self, namespace): allow_internal_docker_ip_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 80cac4a83d81..33c1b76be7f1 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 @@ -38,7 +38,7 @@ def test_caclmgrd_external_client_acl(self, test_name, test_data, fs): 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"]) - self.caclmgrd.ControlPlaneAclManager.check_chassis_midplane_interface_exist = mock.MagicMock(return_value=False) + self.caclmgrd.ControlPlaneAclManager.get_chassis_midplane_interface_ip = mock.MagicMock(return_value='') caclmgrd_daemon = self.caclmgrd.ControlPlaneAclManager("caclmgrd") iptables_rules_ret, _ = caclmgrd_daemon.get_acl_rules_and_translate_to_iptables_commands('') diff --git a/src/sonic-host-services/tests/caclmgrd/caclmgrd_chassis_midplane_test.py b/src/sonic-host-services/tests/caclmgrd/caclmgrd_chassis_midplane_test.py index b28a3209bcf8..6eb903e794d0 100644 --- a/src/sonic-host-services/tests/caclmgrd/caclmgrd_chassis_midplane_test.py +++ b/src/sonic-host-services/tests/caclmgrd/caclmgrd_chassis_midplane_test.py @@ -36,7 +36,9 @@ def test_caclmgrd_chassis_midplane(self, test_name, test_data, fs): self.caclmgrd.ControlPlaneAclManager.get_namespace_mgmt_ip = mock.MagicMock() self.caclmgrd.ControlPlaneAclManager.get_namespace_mgmt_ipv6 = mock.MagicMock() - self.caclmgrd.ControlPlaneAclManager.check_chassis_midplane_interface_exist = mock.MagicMock(return_value=True) + self.caclmgrd.ControlPlaneAclManager.get_chassis_midplane_interface_ip = mock.MagicMock(return_value="1.0.0.33") caclmgrd_daemon = self.caclmgrd.ControlPlaneAclManager("caclmgrd") ret = caclmgrd_daemon.generate_allow_internal_chasis_midplane_traffic('') self.assertListEqual(test_data["return"], ret) + ret = caclmgrd_daemon.generate_allow_internal_chasis_midplane_traffic('asic0') + self.assertListEqual([], ret) diff --git a/src/sonic-host-services/tests/caclmgrd/test_chassis_midplane_vectors.py b/src/sonic-host-services/tests/caclmgrd/test_chassis_midplane_vectors.py index 806a4b75eb7b..68422c647b1e 100644 --- a/src/sonic-host-services/tests/caclmgrd/test_chassis_midplane_vectors.py +++ b/src/sonic-host-services/tests/caclmgrd/test_chassis_midplane_vectors.py @@ -8,6 +8,7 @@ "Allow chassis midlane traffic", { "return": [ + "iptables -A INPUT -s 1.0.0.33 -d 1.0.0.33 -j ACCEPT", "iptables -A INPUT -i eth1-midplane -j ACCEPT" ] } From 2e26d965b99f1c1d6d0ec9fcd941b2a996d2e1d7 Mon Sep 17 00:00:00 2001 From: Samuel Angebault Date: Wed, 3 May 2023 17:08:55 -0700 Subject: [PATCH 066/193] [202205][Arista] Update platform library submodules (#14829) Fix watchdog reboot cause for wolverine linecard Fix PSU fan speed of 0% by adding max RPM to most psu descriptions Add product DCS-7060DX5-64 Add product DCS-7060DX5-32 --- 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 c9888bb086c4..818cebb5c93d 160000 --- a/platform/barefoot/sonic-platform-modules-arista +++ b/platform/barefoot/sonic-platform-modules-arista @@ -1 +1 @@ -Subproject commit c9888bb086c4c528b8ae41a0e2089c57204742b6 +Subproject commit 818cebb5c93d88e8b4d504e18a5f1198ca974153 diff --git a/platform/broadcom/sonic-platform-modules-arista b/platform/broadcom/sonic-platform-modules-arista index c9888bb086c4..818cebb5c93d 160000 --- a/platform/broadcom/sonic-platform-modules-arista +++ b/platform/broadcom/sonic-platform-modules-arista @@ -1 +1 @@ -Subproject commit c9888bb086c4c528b8ae41a0e2089c57204742b6 +Subproject commit 818cebb5c93d88e8b4d504e18a5f1198ca974153 From a3a041a3cd054add15c0d098983138cbc3709177 Mon Sep 17 00:00:00 2001 From: Tejaswini Chadaga <85581939+tjchadaga@users.noreply.github.com> Date: Wed, 3 May 2023 17:10:15 -0700 Subject: [PATCH 067/193] Revert "Add load_minigraph option to include traffic-shift-away during config migration (#11403)" (#14881) This reverts commit 0c7f0aa9b7a35e3a873809fa6ebd24f7226dbdff. --- 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 7ddf4530fe5d..b151437b9e25 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 0e70aba6ce85306b0dc8f0505f17b9232ffd056a Mon Sep 17 00:00:00 2001 From: Liu Shilong Date: Thu, 4 May 2023 08:16:07 +0800 Subject: [PATCH 068/193] [build] Fix reproducible build version issue when failed to download web file (#14587) (#14780) Why I did it refine reproducible build. How I did it Fix reset map variable in bash. Ignore empty web file md5sum value. If web file didn't backup in azure storage, use file on web. How to verify i --- src/sonic-build-hooks/scripts/buildinfo_base.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/sonic-build-hooks/scripts/buildinfo_base.sh b/src/sonic-build-hooks/scripts/buildinfo_base.sh index 6130e125f4b3..5e68af91e411 100755 --- a/src/sonic-build-hooks/scripts/buildinfo_base.sh +++ b/src/sonic-build-hooks/scripts/buildinfo_base.sh @@ -111,7 +111,6 @@ set_reproducible_mirrors() download_packages() { local parameters=("$@") - local filenames= declare -A filenames for (( i=0; i<${#parameters[@]}; i++ )) do @@ -131,7 +130,7 @@ 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 "Warning: Failed to verify the package: $url, the version is not specified" 1>&2 + log_err "Warning: Failed to verify the package: $url, the version is not specified" continue fi @@ -145,15 +144,16 @@ download_packages() else real_version=$(get_url_version $url) if [ "$real_version" != "$version" ]; then - echo "Failed to verify url: $url, real hash value: $real_version, expected value: $version_filename" 1>&2 - exit 1 + log_err "Warning: Failed to verify url: $url, real hash value: $real_version, expected value: $version_filename" + continue fi fi else real_version=$(get_url_version $url) fi - - echo "$url==$real_version" >> ${BUILD_WEB_VERSION_FILE} + # ignore md5sum for string "" + # echo -n "" | md5sum == d41d8cd98f00b204e9800998ecf8427e + [[ $real_version == "d41d8cd98f00b204e9800998ecf8427e" ]] || echo "$url==$real_version" >> ${BUILD_WEB_VERSION_FILE} fi done From a06a9dcaac05bfadb169de56aa76b27e579cc77f Mon Sep 17 00:00:00 2001 From: mssonicbld <79238446+mssonicbld@users.noreply.github.com> Date: Thu, 4 May 2023 09:20:14 +0800 Subject: [PATCH 069/193] [submodule] Update submodule sonic-utilities to the latest HEAD automatically (#14848) src/sonic-utilities * 6c400c48 - (HEAD -> 202205, origin/202205) [GCU] protect loopback0 from deletion (#2638) (#2813) (35 hours ago) [jingwenxie] * 506dd7a2 - [GCU] Add PFC_WD RDMA validator (#2810) (6 days ago) [isabelmsft] * 47f84994 - [202205][DBMigrator] Update db_migrator to support EdgeZoneAggregator Buffer Config for T0s (#2769) (7 days a --- src/sonic-utilities | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/sonic-utilities b/src/sonic-utilities index ece22b7d8add..6c400c484419 160000 --- a/src/sonic-utilities +++ b/src/sonic-utilities @@ -1 +1 @@ -Subproject commit ece22b7d8addb97fd3d911873ee54b88a5549a6f +Subproject commit 6c400c4844191a50b8074b4ab38fd2aa3a546ffd From 1c3cab115aa3c053224f503cc0fe31adb178d001 Mon Sep 17 00:00:00 2001 From: mssonicbld <79238446+mssonicbld@users.noreply.github.com> Date: Thu, 4 May 2023 10:06:26 +0800 Subject: [PATCH 070/193] [submodule] Update submodule sonic-sairedis to the latest HEAD automatically (#14835) src/sonic-sairedis * 7f6abdd - (HEAD -> 202205, origin/202205) Revert "Ignore removing switch for mellanox platform due to known limitation (#1216)" (#1231) (8 days ago) [Junchao-Mellanox] --- src/sonic-sairedis | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/sonic-sairedis b/src/sonic-sairedis index 10f37ef48f21..7f6abdd8045a 160000 --- a/src/sonic-sairedis +++ b/src/sonic-sairedis @@ -1 +1 @@ -Subproject commit 10f37ef48f21f350cb44e2734f9e807bb916121e +Subproject commit 7f6abdd8045afae2de6a86c332aed680a71adecc From 055c4d37e32248120531ed71e8944a5625b6c8d7 Mon Sep 17 00:00:00 2001 From: mssonicbld <79238446+mssonicbld@users.noreply.github.com> Date: Thu, 4 May 2023 10:07:07 +0800 Subject: [PATCH 071/193] [submodule] Update submodule sonic-swss to the latest HEAD automatically (#14796) src/sonic-swss * 113cadd - (HEAD -> 202205, origin/202205) [portsorch]: Set default hostif TX queue (#2697) (11 days ago) [prabhataravind] --- src/sonic-swss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/sonic-swss b/src/sonic-swss index 96407beeb677..113cadd9f8a5 160000 --- a/src/sonic-swss +++ b/src/sonic-swss @@ -1 +1 @@ -Subproject commit 96407beeb677c82624af0204172079ffb1493f6d +Subproject commit 113cadd9f8a5debe0066c1e1ef7fc2aa10b7ad93 From 441b5ad3fc7a1f7e6314b85fa9ce71f600bf1ee6 Mon Sep 17 00:00:00 2001 From: mssonicbld <79238446+mssonicbld@users.noreply.github.com> Date: Fri, 5 May 2023 14:35:52 +0800 Subject: [PATCH 072/193] [submodule] Update submodule sonic-swss to the latest HEAD automatically (#14942) src/sonic-swss * f977724 - (HEAD -> 202205, origin/202205) [bugfix] vnet ping missing with secondary endpoints empty in priority routes. (#2736) (2 hours ago) [siqbal1986] * a723a99 - Fix orchagent missing request when logrotate happens. (#2712) (2 hours ago) [mint570] * 24db6da - Handle duplicate routes in a graceful manner (#2688) (2 hours ago) [prabhataravind] --- src/sonic-swss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/sonic-swss b/src/sonic-swss index 113cadd9f8a5..f977724b9364 160000 --- a/src/sonic-swss +++ b/src/sonic-swss @@ -1 +1 @@ -Subproject commit 113cadd9f8a5debe0066c1e1ef7fc2aa10b7ad93 +Subproject commit f977724b9364fb45def63aa96dd50445e88a2acd From b1f73ff05a6399a83022f5ded261ff09437a3df4 Mon Sep 17 00:00:00 2001 From: mssonicbld <79238446+mssonicbld@users.noreply.github.com> Date: Fri, 5 May 2023 14:45:29 +0800 Subject: [PATCH 073/193] [submodule] Update submodule sonic-platform-daemons to the latest HEAD automatically (#14940) src/sonic-platform-daemons * f913e9c - (HEAD -> 202205, origin/202205) [CMIS] Add power up duration for power up timeout (#345) (2 hours ago) [ChiouRung Haung] --- 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 cc3249375904..f913e9c13701 160000 --- a/src/sonic-platform-daemons +++ b/src/sonic-platform-daemons @@ -1 +1 @@ -Subproject commit cc3249375904518f8878e1fc95b2b4189eb8cca0 +Subproject commit f913e9c137012a8b1c31124c08e2c3b450f57833 From 9bfce31ccb33ed045184e2f762c9271dcb990a73 Mon Sep 17 00:00:00 2001 From: mssonicbld <79238446+mssonicbld@users.noreply.github.com> Date: Fri, 5 May 2023 22:48:56 +0800 Subject: [PATCH 074/193] [submodule] Update submodule sonic-utilities to the latest HEAD automatically (#14943) src/sonic-utilities * b49d78c4 - (HEAD -> 202205, origin/202205) Change default CDB run mode to non-hitless (#2817) (2 hours ago) [mihirpat1] * 2e9c99e8 - [show][muxcable] fix `show mux hwmode muxdirection` RC (#2812) (2 hours ago) [Jing Zhang] * 6b5bf990 - [config]config reload should generate sysinfo if missing (#2778) (2 hours ago) [jingwenxie] * a8455fd3 - Fix bug in GCU vlanintf_validator (#2765) (2 hours ago) [jingwenxie] * 79c99718 - [GCU] Add vlanintf-validator (#2697) (2 hours ago) [jingwenxie] --- src/sonic-utilities | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/sonic-utilities b/src/sonic-utilities index 6c400c484419..b49d78c41329 160000 --- a/src/sonic-utilities +++ b/src/sonic-utilities @@ -1 +1 @@ -Subproject commit 6c400c4844191a50b8074b4ab38fd2aa3a546ffd +Subproject commit b49d78c4132915d0cccbd2e6f27acf259bfc641c From 9e6a6d84d2a2273dd75f48bd68aa0f501d90a156 Mon Sep 17 00:00:00 2001 From: mssonicbld <79238446+mssonicbld@users.noreply.github.com> Date: Sat, 6 May 2023 03:56:16 +0800 Subject: [PATCH 075/193] [submodule] Update submodule linkmgrd to the latest HEAD automatically (#14939) src/linkmgrd * 700939c - (HEAD -> 202205, origin/202205) [codeql] remove hard coded line numbers in sed commands (#203) (27 hours ago) [Jing Zhang] * 71a2a3c - [active-standby][bsl] fix no mux probe issue (#201) (27 hours ago) [Jing Zhang] * 32720cf - Support linking to swss logger (#182) (27 hours ago) [Longxiang Lyu] --- src/linkmgrd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/linkmgrd b/src/linkmgrd index aa1d55fc264b..700939c51b6a 160000 --- a/src/linkmgrd +++ b/src/linkmgrd @@ -1 +1 @@ -Subproject commit aa1d55fc264b4accfe2a4440f5c7b224e602ae27 +Subproject commit 700939c51b6ac909f41f77e15a61fcbcf343b4dc From 9397d06dc8ba753ad51f6a8d20d2a229bfb75927 Mon Sep 17 00:00:00 2001 From: mssonicbld <79238446+mssonicbld@users.noreply.github.com> Date: Sun, 7 May 2023 03:54:51 +0800 Subject: [PATCH 076/193] [submodule] Update submodule sonic-platform-common to the latest HEAD automatically (#14945) src/sonic-platform-common * c97af3c - (HEAD -> 202205, origin/202205) Modify sfputil show fwversion to include build version for active/inactive FW version fields (#367) (2 days ago) [mihirpat1] * 7705a20 - Adding electrical for 800G and 100G (#365) (2 days ago) [mihirpat1] * d0038fc - SFF-8472: Fix tx_disable_channel to avoid write to read-only bit (#364) (2 days ago) [mihirpat1] * 518a471 - fix get module hardware minor revision (#361) (2 days ago) [Qingxiao Ren] --- 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 4080df6353a2..c97af3c9815b 160000 --- a/src/sonic-platform-common +++ b/src/sonic-platform-common @@ -1 +1 @@ -Subproject commit 4080df6353a2951d4c92dbf31a9985a1ca09dfd8 +Subproject commit c97af3c9815b794d2fad48f652d27d9892834382 From 7ff5fdfcff824a34eec74fc801880299c700f025 Mon Sep 17 00:00:00 2001 From: mssonicbld <79238446+mssonicbld@users.noreply.github.com> Date: Mon, 8 May 2023 23:32:04 +0800 Subject: [PATCH 077/193] [submodule] Update submodule sonic-utilities to the latest HEAD automatically (#14968) src/sonic-utilities * f6359bcc - (HEAD -> 202205, origin/202205) [acl-loader] Only add default deny rule when table is L3 or L3V6 (#2796) (#2826) (3 days ago) [Zhijian Li] --- src/sonic-utilities | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/sonic-utilities b/src/sonic-utilities index b49d78c41329..f6359bccc74b 160000 --- a/src/sonic-utilities +++ b/src/sonic-utilities @@ -1 +1 @@ -Subproject commit b49d78c4132915d0cccbd2e6f27acf259bfc641c +Subproject commit f6359bccc74bb1ed1c570de4e50b555b77923e16 From 83ee249e9fd979f4809b82752cf9518d2c088f71 Mon Sep 17 00:00:00 2001 From: Ye Jianquan Date: Mon, 8 May 2023 23:33:04 +0800 Subject: [PATCH 078/193] Refine test job definition and assert logic (#14960) 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 Work item tracking Microsoft ADO (number only): 21199881 --- azure-pipelines.yml | 78 ++++----------------------------------------- 1 file changed, 7 insertions(+), 71 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index c5cf387a4bc9..b3248b1329b8 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -170,8 +170,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')) @@ -185,8 +184,7 @@ stages: MGMT_BRANCH: 202205 - 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')) @@ -201,37 +199,6 @@ stages: DEPLOY_MG_EXTRA_PARAMS: "-e vlan_config=two_vlan_a" MGMT_BRANCH: 202205 - - 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" @@ -247,8 +214,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')) @@ -261,39 +227,12 @@ stages: MAX_WORKER: $(T1_LAG_INSTANCE_NUM) MGMT_BRANCH: 202205 - - 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: pool: sonictest-sonic-t0 displayName: "kvmtest-t0-sonic" timeoutInMinutes: 360 condition: and(succeeded(), eq(variables.BUILD_IMG_RUN_CLASSICAL_TEST, 'YES')) - + continueOnError: false steps: - template: .azure-pipelines/run-test-template.yml parameters: @@ -304,9 +243,8 @@ stages: vmtype: vsonic - job: sonic_t0_testbedv2 + pool: ubuntu-20.04 displayName: "kvmtest-t0-sonic by TestbedV2" - pool: - vmImage: 'ubuntu-20.04' timeoutInMinutes: 240 condition: and(succeeded(), eq(variables.BUILD_IMG_RUN_TESTBEDV2_TEST, 'YES')) continueOnError: false @@ -323,8 +261,7 @@ stages: MGMT_BRANCH: 202205 - 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')) @@ -339,9 +276,8 @@ stages: MGMT_BRANCH: 202205 - job: multi_asic_testbedv2 + pool: ubuntu-20.04 displayName: "kvmtest-multi-asic-t1-lag by TestbedV2" - pool: - vmImage: 'ubuntu-20.04' timeoutInMinutes: 1080 condition: and(succeeded(), eq(variables.BUILD_IMG_RUN_TESTBEDV2_TEST, 'YES')) continueOnError: false From b8d44e6fb8a179022f44789693e76aff299d81de Mon Sep 17 00:00:00 2001 From: Justin Sherman Date: Mon, 8 May 2023 08:33:58 -0700 Subject: [PATCH 079/193] [build] SONIC_ONLINE_DEBS no longer overwrites local build outputs (#14822) Manual double commit of #14698 --- slave.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/slave.mk b/slave.mk index 3d3b0b721640..cdae1b4cf720 100644 --- a/slave.mk +++ b/slave.mk @@ -488,8 +488,8 @@ $(addprefix $(DEBS_PATH)/, $(SONIC_ONLINE_DEBS)) : $(DEBS_PATH)/% : .platform \ # Load the target deb from DPKG cache $(call LOAD_CACHE,$*,$@) - # Skip building the target if it is already loaded from cache - if [ -z '$($*_CACHE_LOADED)' ] ; then + # Skip building the target if it is already loaded from cache or exists in target/ directory + if [ -z '$($*_CACHE_LOADED)' ] && [ ! -e $(DEBS_PATH)/$* ] ; then $(foreach deb,$* $($*_DERIVED_DEBS), \ { curl -L -f -o $(DEBS_PATH)/$(deb) $($(deb)_CURL_OPTIONS) $($(deb)_URL) $(LOG) || { exit 1 ; } } ; ) From 3ef3593132260221fe3d2aabf38246c87058d619 Mon Sep 17 00:00:00 2001 From: vdahiya12 <67608553+vdahiya12@users.noreply.github.com> Date: Tue, 9 May 2023 15:07:21 -0700 Subject: [PATCH 080/193] [minigraph] add support for changing T1 ports speed from 400G to 100G and vice-versa (#14505) (#14977) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * [minigraph] add support for changing T1 ports speed from 400G to 100G and vice-versa (#14505) Open [minigraph] add support for changing T1 ports speed from 400G to 100G and vice-versa vdahiya12 wants to merge 9 commits into sonic-net:master from vdahiya12:dev/vdahiya/minigraph_parser Conversation 10 Commits 9 Checks 18 Files changed 5 Conversation vdahiya12 @vdahiya12 vdahiya12 commented 2 weeks ago • On SONiC T1 cisco 8101 HwSku, the speed changes are done from 400G to 100G needs to be supported on 400G ports. To enable this, along with speed change the port lanes need to be changed. This PR has the changes to update the port lanes when such speed change happens. Basically if Banwidth in minigraph.xml intends to enable a 100G speed on a 400G port, then the appropriate lane change and speed change needs to be invoked in mingraph parser Example if port_config.ini dicatates the speed to be 400G and minigraph has 100G speed, then this changeneeds to be accommodated Ethernet96 1536,1537,1538,1539,1540,1541,1542,1543 etp12 12 400000 0 DeviceInterfaceLink ARISTA01T2 Ethernet1 Device-8101-01 etp12 100000 These platforms today have 400g port with 8 serdes lines, and 100g will operate with 4 serdes lane. When the port speed changes from 400G to 100G the first 4 lanes will be used for 100G port. Signed-off-by: vaibhav-dahiya * add all Signed-off-by: vaibhav-dahiya * fix unit Signed-off-by: vaibhav-dahiya --------- Signed-off-by: vaibhav-dahiya --- src/sonic-config-engine/minigraph.py | 5 +- .../sample-cisco-8101-t1-100-minigraph.xml | 2389 +++++++++++++++++ .../sample-cisco-8101-t1-400-minigraph.xml | 2389 +++++++++++++++++ .../sample-cisco-8101-t1-port-config.ini | 57 + src/sonic-config-engine/tests/test_cfggen.py | 27 +- 5 files changed, 4864 insertions(+), 3 deletions(-) create mode 100755 src/sonic-config-engine/tests/sample-cisco-8101-t1-100-minigraph.xml create mode 100755 src/sonic-config-engine/tests/sample-cisco-8101-t1-400-minigraph.xml create mode 100644 src/sonic-config-engine/tests/sample-cisco-8101-t1-port-config.ini diff --git a/src/sonic-config-engine/minigraph.py b/src/sonic-config-engine/minigraph.py index e2e10e33795a..32a56be76fb2 100644 --- a/src/sonic-config-engine/minigraph.py +++ b/src/sonic-config-engine/minigraph.py @@ -1656,7 +1656,8 @@ def parse_xml(filename, platform=None, port_config_file=None, asic_name=None, hw port_default_speed = port_speeds_default.get(port_name, None) port_png_speed = port_speed_png[port_name] - if switch_type == 'voq': + # Add a check for for voq, T1 + if results['DEVICE_METADATA']['localhost']['type'].lower() == 'leafrouter' or switch_type == 'voq': # when the port speed is changes from 400g to 100g # update the port lanes, use the first 4 lanes of the 400G port to support 100G port if port_default_speed == '400000' and port_png_speed == '100000': @@ -1666,7 +1667,7 @@ def parse_xml(filename, platform=None, port_config_file=None, asic_name=None, hw continue updated_lanes = ",".join(port_lanes[:4]) ports[port_name]['lanes'] = updated_lanes - + 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-cisco-8101-t1-100-minigraph.xml b/src/sonic-config-engine/tests/sample-cisco-8101-t1-100-minigraph.xml new file mode 100755 index 000000000000..7283dc78db25 --- /dev/null +++ b/src/sonic-config-engine/tests/sample-cisco-8101-t1-100-minigraph.xml @@ -0,0 +1,2389 @@ + + + + + + false + Device-8101-01 + 10.0.0.32 + ARISTA01T0 + 10.0.0.33 + 1 + 10 + 3 + + + Device-8101-01 + FC00::41 + ARISTA01T0 + FC00::42 + 1 + 10 + 3 + + + false + Device-8101-01 + 10.0.0.0 + ARISTA01T2 + 10.0.0.1 + 1 + 10 + 3 + + + Device-8101-01 + FC00::1 + ARISTA01T2 + FC00::2 + 1 + 10 + 3 + + + false + Device-8101-01 + 10.0.0.34 + ARISTA02T0 + 10.0.0.35 + 1 + 10 + 3 + + + Device-8101-01 + FC00::45 + ARISTA02T0 + FC00::46 + 1 + 10 + 3 + + + false + Device-8101-01 + 10.0.0.36 + ARISTA03T0 + 10.0.0.37 + 1 + 10 + 3 + + + Device-8101-01 + FC00::49 + ARISTA03T0 + FC00::4A + 1 + 10 + 3 + + + false + Device-8101-01 + 10.0.0.4 + ARISTA03T2 + 10.0.0.5 + 1 + 10 + 3 + + + Device-8101-01 + FC00::5 + ARISTA03T2 + FC00::6 + 1 + 10 + 3 + + + false + Device-8101-01 + 10.0.0.38 + ARISTA04T0 + 10.0.0.39 + 1 + 10 + 3 + + + Device-8101-01 + FC00::4D + ARISTA04T0 + FC00::4E + 1 + 10 + 3 + + + false + Device-8101-01 + 10.0.0.40 + ARISTA05T0 + 10.0.0.41 + 1 + 10 + 3 + + + Device-8101-01 + FC00::51 + ARISTA05T0 + FC00::52 + 1 + 10 + 3 + + + false + Device-8101-01 + 10.0.0.8 + ARISTA05T2 + 10.0.0.9 + 1 + 10 + 3 + + + Device-8101-01 + FC00::9 + ARISTA05T2 + FC00::A + 1 + 10 + 3 + + + false + Device-8101-01 + 10.0.0.42 + ARISTA06T0 + 10.0.0.43 + 1 + 10 + 3 + + + Device-8101-01 + FC00::55 + ARISTA06T0 + FC00::56 + 1 + 10 + 3 + + + false + Device-8101-01 + 10.0.0.44 + ARISTA07T0 + 10.0.0.45 + 1 + 10 + 3 + + + Device-8101-01 + FC00::59 + ARISTA07T0 + FC00::5A + 1 + 10 + 3 + + + false + Device-8101-01 + 10.0.0.12 + ARISTA07T2 + 10.0.0.13 + 1 + 10 + 3 + + + Device-8101-01 + FC00::D + ARISTA07T2 + FC00::E + 1 + 10 + 3 + + + false + Device-8101-01 + 10.0.0.46 + ARISTA08T0 + 10.0.0.47 + 1 + 10 + 3 + + + Device-8101-01 + FC00::5D + ARISTA08T0 + FC00::5E + 1 + 10 + 3 + + + false + Device-8101-01 + 10.0.0.48 + ARISTA09T0 + 10.0.0.49 + 1 + 10 + 3 + + + Device-8101-01 + FC00::61 + ARISTA09T0 + FC00::62 + 1 + 10 + 3 + + + false + Device-8101-01 + 10.0.0.50 + ARISTA10T0 + 10.0.0.51 + 1 + 10 + 3 + + + Device-8101-01 + FC00::65 + ARISTA10T0 + FC00::66 + 1 + 10 + 3 + + + false + Device-8101-01 + 10.0.0.52 + ARISTA11T0 + 10.0.0.53 + 1 + 10 + 3 + + + Device-8101-01 + FC00::69 + ARISTA11T0 + FC00::6A + 1 + 10 + 3 + + + false + Device-8101-01 + 10.0.0.54 + ARISTA12T0 + 10.0.0.55 + 1 + 10 + 3 + + + Device-8101-01 + FC00::6D + ARISTA12T0 + FC00::6E + 1 + 10 + 3 + + + false + Device-8101-01 + 10.0.0.56 + ARISTA13T0 + 10.0.0.57 + 1 + 10 + 3 + + + Device-8101-01 + FC00::71 + ARISTA13T0 + FC00::72 + 1 + 10 + 3 + + + false + Device-8101-01 + 10.0.0.58 + ARISTA14T0 + 10.0.0.59 + 1 + 10 + 3 + + + Device-8101-01 + FC00::75 + ARISTA14T0 + FC00::76 + 1 + 10 + 3 + + + false + Device-8101-01 + 10.0.0.60 + ARISTA15T0 + 10.0.0.61 + 1 + 10 + 3 + + + Device-8101-01 + FC00::79 + ARISTA15T0 + FC00::7A + 1 + 10 + 3 + + + false + Device-8101-01 + 10.0.0.62 + ARISTA16T0 + 10.0.0.63 + 1 + 10 + 3 + + + Device-8101-01 + FC00::7D + ARISTA16T0 + FC00::7E + 1 + 10 + 3 + + + false + Device-8101-01 + 10.0.0.64 + ARISTA17T0 + 10.0.0.65 + 1 + 10 + 3 + + + Device-8101-01 + FC00::81 + ARISTA17T0 + FC00::82 + 1 + 10 + 3 + + + false + Device-8101-01 + 10.0.0.66 + ARISTA18T0 + 10.0.0.67 + 1 + 10 + 3 + + + Device-8101-01 + FC00::85 + ARISTA18T0 + FC00::86 + 1 + 10 + 3 + + + false + Device-8101-01 + 10.0.0.68 + ARISTA19T0 + 10.0.0.69 + 1 + 10 + 3 + + + Device-8101-01 + FC00::89 + ARISTA19T0 + FC00::8A + 1 + 10 + 3 + + + false + Device-8101-01 + 10.0.0.70 + ARISTA20T0 + 10.0.0.71 + 1 + 10 + 3 + + + Device-8101-01 + FC00::8D + ARISTA20T0 + FC00::8E + 1 + 10 + 3 + + + + + 65100 + Device-8101-01 + + +
10.0.0.33
+ + + + + +
10.0.0.1
+ + + + + +
10.0.0.35
+ + + + + +
10.0.0.37
+ + + + + +
10.0.0.5
+ + + + + +
10.0.0.39
+ + + + + +
10.0.0.41
+ + + + + +
10.0.0.9
+ + + + + +
10.0.0.43
+ + + + + +
10.0.0.45
+ + + + + +
10.0.0.13
+ + + + + +
10.0.0.47
+ + + + + +
10.0.0.49
+ + + + + +
10.0.0.51
+ + + + + +
10.0.0.53
+ + + + + +
10.0.0.55
+ + + + + +
10.0.0.57
+ + + + + +
10.0.0.59
+ + + + + +
10.0.0.61
+ + + + + +
10.0.0.63
+ + + + + +
10.0.0.65
+ + + + + +
10.0.0.67
+ + + + + +
10.0.0.69
+ + + + + +
10.0.0.71
+ + + + + + + + + 64001 + ARISTA01T0 + + + + 65200 + ARISTA01T2 + + + + 64002 + ARISTA02T0 + + + + 64003 + ARISTA03T0 + + + + 65200 + ARISTA03T2 + + + + 64004 + ARISTA04T0 + + + + 64005 + ARISTA05T0 + + + + 65200 + ARISTA05T2 + + + + 64006 + ARISTA06T0 + + + + 64007 + ARISTA07T0 + + + + 65200 + ARISTA07T2 + + + + 64008 + ARISTA08T0 + + + + 64009 + ARISTA09T0 + + + + 64010 + ARISTA10T0 + + + + 64011 + ARISTA11T0 + + + + 64012 + ARISTA12T0 + + + + 64013 + ARISTA13T0 + + + + 64014 + ARISTA14T0 + + + + 64015 + ARISTA15T0 + + + + 64016 + ARISTA16T0 + + + + 64017 + ARISTA17T0 + + + + 64018 + ARISTA18T0 + + + + 64019 + ARISTA19T0 + + + + 64020 + ARISTA20T0 + + + + + + + + + + HostIP + Loopback0 + + 10.1.0.32/32 + + 10.1.0.32/32 + + + HostIP1 + Loopback0 + + FC00:1::32/128 + + FC00:1::32/128 + + + + + HostIP + eth0 + + 1.1.1.1/23 + + 1.1.1.1/23 + + + V6HostIP + eth0 + + FC00:2::32/64 + + FC00:2::32/64 + + + + + + + Device-8101-01 + + + PortChannel101 + etp0a + + + + PortChannel102 + etp12;etp13 + + + + PortChannel103 + etp0b + + + + PortChannel104 + etp2a + + + + PortChannel105 + etp14;etp15 + + + + PortChannel106 + etp2b + + + + PortChannel107 + etp8a + + + + PortChannel108 + etp16;etp17 + + + + PortChannel109 + etp8b + + + + PortChannel1010 + etp10a + + + + PortChannel1011 + etp18;etp19 + + + + PortChannel1012 + etp10b + + + + PortChannel1013 + etp21a + + + + PortChannel1014 + etp22b + + + + PortChannel1015 + etp25a + + + + PortChannel1016 + etp25b + + + + PortChannel1017 + etp26b + + + + PortChannel1018 + etp27a + + + + PortChannel1019 + etp27b + + + + PortChannel1020 + etp29a + + + + PortChannel1021 + etp30a + + + + PortChannel1022 + etp30b + + + + PortChannel1023 + etp31a + + + + PortChannel1024 + etp31b + + + + + + + + + PortChannel101 + 10.0.0.32/31 + + + + PortChannel101 + FC00::41/126 + + + + PortChannel102 + 10.0.0.0/31 + + + + PortChannel102 + FC00::1/126 + + + + PortChannel103 + 10.0.0.34/31 + + + + PortChannel103 + FC00::45/126 + + + + PortChannel104 + 10.0.0.36/31 + + + + PortChannel104 + FC00::49/126 + + + + PortChannel105 + 10.0.0.4/31 + + + + PortChannel105 + FC00::5/126 + + + + PortChannel106 + 10.0.0.38/31 + + + + PortChannel106 + FC00::4D/126 + + + + PortChannel107 + 10.0.0.40/31 + + + + PortChannel107 + FC00::51/126 + + + + PortChannel108 + 10.0.0.8/31 + + + + PortChannel108 + FC00::9/126 + + + + PortChannel109 + 10.0.0.42/31 + + + + PortChannel109 + FC00::55/126 + + + + PortChannel1010 + 10.0.0.44/31 + + + + PortChannel1010 + FC00::59/126 + + + + PortChannel1011 + 10.0.0.12/31 + + + + PortChannel1011 + FC00::D/126 + + + + PortChannel1012 + 10.0.0.46/31 + + + + PortChannel1012 + FC00::5D/126 + + + + PortChannel1013 + 10.0.0.48/31 + + + + PortChannel1013 + FC00::61/126 + + + + PortChannel1014 + 10.0.0.50/31 + + + + PortChannel1014 + FC00::65/126 + + + + PortChannel1015 + 10.0.0.52/31 + + + + PortChannel1015 + FC00::69/126 + + + + PortChannel1016 + 10.0.0.54/31 + + + + PortChannel1016 + FC00::6D/126 + + + + PortChannel1017 + 10.0.0.56/31 + + + + PortChannel1017 + FC00::71/126 + + + + PortChannel1018 + 10.0.0.58/31 + + + + PortChannel1018 + FC00::75/126 + + + + PortChannel1019 + 10.0.0.60/31 + + + + PortChannel1019 + FC00::79/126 + + + + PortChannel1020 + 10.0.0.62/31 + + + + PortChannel1020 + FC00::7D/126 + + + + PortChannel1021 + 10.0.0.64/31 + + + + PortChannel1021 + FC00::81/126 + + + + PortChannel1022 + 10.0.0.66/31 + + + + PortChannel1022 + FC00::85/126 + + + + PortChannel1023 + 10.0.0.68/31 + + + + PortChannel1023 + FC00::89/126 + + + + PortChannel1024 + 10.0.0.70/31 + + + + PortChannel1024 + FC00::8D/126 + + + + + + NTP_ACL + NTP + NTP + + + SNMP_ACL + SNMP + SNMP + + + VTY_LINE + ssh-only + SSH + + + ERSPAN + Everflow + Everflow + + + ERSPANV6 + EverflowV6 + EverflowV6 + + + PortChannel101;PortChannel102;PortChannel103;PortChannel104;PortChannel105;PortChannel106;PortChannel107;PortChannel108;PortChannel109;PortChannel1010;PortChannel1011;PortChannel1012;PortChannel1013;PortChannel1014;PortChannel1015;PortChannel1016;PortChannel1017;PortChannel1018;PortChannel1019;PortChannel1020;PortChannel1021;PortChannel1022;PortChannel1023;PortChannel1024 + DataAcl + DataPlane + + + + + + + + + + DeviceInterfaceLink + ARISTA01T0 + Ethernet1 + Device-8101-01 + etp0a + 100000 + + + DeviceInterfaceLink + ARISTA01T2 + Ethernet1 + Device-8101-01 + etp12 + 100000 + + + DeviceInterfaceLink + ARISTA01T2 + Ethernet2 + Device-8101-01 + etp13 + 100000 + + + DeviceInterfaceLink + ARISTA02T0 + Ethernet1 + Device-8101-01 + etp0b + 100000 + + + DeviceInterfaceLink + ARISTA03T0 + Ethernet1 + Device-8101-01 + etp2a + 100000 + + + DeviceInterfaceLink + ARISTA03T2 + Ethernet1 + Device-8101-01 + etp14 + 100000 + + + DeviceInterfaceLink + ARISTA03T2 + Ethernet2 + Device-8101-01 + etp15 + 100000 + + + DeviceInterfaceLink + ARISTA04T0 + Ethernet1 + Device-8101-01 + etp2b + 100000 + + + DeviceInterfaceLink + ARISTA05T0 + Ethernet1 + Device-8101-01 + etp8a + 100000 + + + DeviceInterfaceLink + ARISTA05T2 + Ethernet1 + Device-8101-01 + etp16 + 100000 + + + DeviceInterfaceLink + ARISTA05T2 + Ethernet2 + Device-8101-01 + etp17 + 100000 + + + DeviceInterfaceLink + ARISTA06T0 + Ethernet1 + Device-8101-01 + etp8b + 100000 + + + DeviceInterfaceLink + ARISTA07T0 + Ethernet1 + Device-8101-01 + etp10a + 100000 + + + DeviceInterfaceLink + ARISTA07T2 + Ethernet1 + Device-8101-01 + etp18 + 100000 + + + DeviceInterfaceLink + ARISTA07T2 + Ethernet2 + Device-8101-01 + etp19 + 100000 + + + DeviceInterfaceLink + ARISTA08T0 + Ethernet1 + Device-8101-01 + etp10b + 100000 + + + DeviceInterfaceLink + ARISTA09T0 + Ethernet1 + Device-8101-01 + etp21a + 100000 + + + DeviceInterfaceLink + ARISTA10T0 + Ethernet1 + Device-8101-01 + etp22b + 100000 + + + DeviceInterfaceLink + ARISTA11T0 + Ethernet1 + Device-8101-01 + etp25a + 100000 + + + DeviceInterfaceLink + ARISTA12T0 + Ethernet1 + Device-8101-01 + etp25b + 100000 + + + DeviceInterfaceLink + ARISTA13T0 + Ethernet1 + Device-8101-01 + etp26b + 100000 + + + DeviceInterfaceLink + ARISTA14T0 + Ethernet1 + Device-8101-01 + etp27a + 100000 + + + DeviceInterfaceLink + ARISTA15T0 + Ethernet1 + Device-8101-01 + etp27b + 100000 + + + DeviceInterfaceLink + ARISTA16T0 + Ethernet1 + Device-8101-01 + etp29a + 100000 + + + DeviceInterfaceLink + ARISTA17T0 + Ethernet1 + Device-8101-01 + etp30a + 100000 + + + DeviceInterfaceLink + ARISTA18T0 + Ethernet1 + Device-8101-01 + etp30b + 100000 + + + DeviceInterfaceLink + ARISTA19T0 + Ethernet1 + Device-8101-01 + etp31a + 100000 + + + DeviceInterfaceLink + ARISTA20T0 + Ethernet1 + Device-8101-01 + etp31b + 100000 + + + + + Device-8101-01 + Cisco-8101-O8C48 + + 1.1.1.1 + + + + ARISTA16T0 + + 172.16.134.203 + + Arista-VM + + + ARISTA11T0 + + 172.16.134.198 + + Arista-VM + + + ARISTA10T0 + + 172.16.134.197 + + Arista-VM + + + ARISTA17T0 + + 172.16.134.204 + + Arista-VM + + + ARISTA09T0 + + 172.16.134.196 + + Arista-VM + + + ARISTA20T0 + + 172.16.134.207 + + Arista-VM + + + ARISTA08T0 + + 172.16.134.191 + + Arista-VM + + + ARISTA07T0 + + 172.16.134.190 + + Arista-VM + + + ARISTA07T2 + + 172.16.134.195 + + Arista-VM + + + ARISTA01T2 + + 172.16.134.192 + + Arista-VM + + + ARISTA01T0 + + 172.16.134.184 + + Arista-VM + + + ARISTA05T2 + + 172.16.134.194 + + Arista-VM + + + ARISTA05T0 + + 172.16.134.188 + + Arista-VM + + + ARISTA02T0 + + 172.16.134.185 + + Arista-VM + + + ARISTA03T0 + + 172.16.134.186 + + Arista-VM + + + ARISTA03T2 + + 172.16.134.193 + + Arista-VM + + + ARISTA04T0 + + 172.16.134.187 + + Arista-VM + + + ARISTA18T0 + + 172.16.134.205 + + Arista-VM + + + ARISTA15T0 + + 172.16.134.202 + + Arista-VM + + + ARISTA19T0 + + 172.16.134.206 + + Arista-VM + + + ARISTA14T0 + + 172.16.134.201 + + Arista-VM + + + ARISTA12T0 + + 172.16.134.199 + + Arista-VM + + + ARISTA13T0 + + 172.16.134.200 + + Arista-VM + + + ARISTA06T0 + + 172.16.134.189 + + Arista-VM + + + + + + true + + + DeviceInterface + + true + true + 1 + etp0a + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + true + 1 + etp0b + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + true + 1 + etp1a + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + true + 1 + etp1b + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + true + 1 + etp2a + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + true + 1 + etp2b + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + true + 1 + etp3a + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + true + 1 + etp3b + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + true + 1 + etp4a + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + true + 1 + etp4b + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + true + 1 + etp5a + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + true + 1 + etp5b + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + true + 1 + etp6a + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + true + 1 + etp6b + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + true + 1 + etp7a + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + true + 1 + etp7b + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + true + 1 + etp8a + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + true + 1 + etp8b + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + true + 1 + etp9a + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + true + 1 + etp9b + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + true + 1 + etp10a + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + true + 1 + etp10b + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + true + 1 + etp11a + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + true + 1 + etp11b + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + true + 1 + etp12 + + false + 0 + 0 + 400000 + + + DeviceInterface + + true + true + 1 + etp13 + + false + 0 + 0 + 400000 + + + DeviceInterface + + true + true + 1 + etp14 + + false + 0 + 0 + 400000 + + + DeviceInterface + + true + true + 1 + etp15 + + false + 0 + 0 + 400000 + + + DeviceInterface + + true + true + 1 + etp16 + + false + 0 + 0 + 400000 + + + DeviceInterface + + true + true + 1 + etp17 + + false + 0 + 0 + 400000 + + + DeviceInterface + + true + true + 1 + etp18 + + false + 0 + 0 + 400000 + + + DeviceInterface + + true + true + 1 + etp19 + + false + 0 + 0 + 400000 + + + DeviceInterface + + true + true + 1 + etp20a + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + true + 1 + etp20b + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + true + 1 + etp21a + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + true + 1 + etp21b + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + true + 1 + etp22a + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + true + 1 + etp22b + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + true + 1 + etp23a + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + true + 1 + etp23b + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + true + 1 + etp24a + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + true + 1 + etp24b + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + true + 1 + etp25a + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + true + 1 + etp25b + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + true + 1 + etp26a + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + true + 1 + etp26b + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + true + 1 + etp27a + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + true + 1 + etp27b + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + true + 1 + etp28a + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + true + 1 + etp28b + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + true + 1 + etp29a + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + true + 1 + etp29b + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + true + 1 + etp30a + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + true + 1 + etp30b + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + true + 1 + etp31a + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + true + 1 + etp31b + + false + 0 + 0 + 100000 + + + true + 0 + Cisco-8101-O8C48 + + + + + + + Device-8101-01 + + + DeploymentId + + 1 + + + QosProfile + + Profile0 + + + DhcpResources + + 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 + + + NtpResources + + 10.20.8.129;10.20.8.130 + + + SnmpResources + + 10.3.145.98 + + + SyslogResources + + 10.64.246.95 + + + TacacsGroup + + Starlab + + + TacacsServer + + 10.3.145.14;10.3.145.15 + + + ForcedMgmtRoutes + + 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.64.246.0/23;10.3.146.0/23;10.64.5.5;10.201.148.32/28 + + + ErspanDestinationIpv4 + + 10.20.6.16 + + + + + + + Device-8101-01 + Cisco-8101-O8C48 + diff --git a/src/sonic-config-engine/tests/sample-cisco-8101-t1-400-minigraph.xml b/src/sonic-config-engine/tests/sample-cisco-8101-t1-400-minigraph.xml new file mode 100755 index 000000000000..2bea4f2710fd --- /dev/null +++ b/src/sonic-config-engine/tests/sample-cisco-8101-t1-400-minigraph.xml @@ -0,0 +1,2389 @@ + + + + + + false + Device-8101-01 + 10.0.0.32 + ARISTA01T0 + 10.0.0.33 + 1 + 10 + 3 + + + Device-8101-01 + FC00::41 + ARISTA01T0 + FC00::42 + 1 + 10 + 3 + + + false + Device-8101-01 + 10.0.0.0 + ARISTA01T2 + 10.0.0.1 + 1 + 10 + 3 + + + Device-8101-01 + FC00::1 + ARISTA01T2 + FC00::2 + 1 + 10 + 3 + + + false + Device-8101-01 + 10.0.0.34 + ARISTA02T0 + 10.0.0.35 + 1 + 10 + 3 + + + Device-8101-01 + FC00::45 + ARISTA02T0 + FC00::46 + 1 + 10 + 3 + + + false + Device-8101-01 + 10.0.0.36 + ARISTA03T0 + 10.0.0.37 + 1 + 10 + 3 + + + Device-8101-01 + FC00::49 + ARISTA03T0 + FC00::4A + 1 + 10 + 3 + + + false + Device-8101-01 + 10.0.0.4 + ARISTA03T2 + 10.0.0.5 + 1 + 10 + 3 + + + Device-8101-01 + FC00::5 + ARISTA03T2 + FC00::6 + 1 + 10 + 3 + + + false + Device-8101-01 + 10.0.0.38 + ARISTA04T0 + 10.0.0.39 + 1 + 10 + 3 + + + Device-8101-01 + FC00::4D + ARISTA04T0 + FC00::4E + 1 + 10 + 3 + + + false + Device-8101-01 + 10.0.0.40 + ARISTA05T0 + 10.0.0.41 + 1 + 10 + 3 + + + Device-8101-01 + FC00::51 + ARISTA05T0 + FC00::52 + 1 + 10 + 3 + + + false + Device-8101-01 + 10.0.0.8 + ARISTA05T2 + 10.0.0.9 + 1 + 10 + 3 + + + Device-8101-01 + FC00::9 + ARISTA05T2 + FC00::A + 1 + 10 + 3 + + + false + Device-8101-01 + 10.0.0.42 + ARISTA06T0 + 10.0.0.43 + 1 + 10 + 3 + + + Device-8101-01 + FC00::55 + ARISTA06T0 + FC00::56 + 1 + 10 + 3 + + + false + Device-8101-01 + 10.0.0.44 + ARISTA07T0 + 10.0.0.45 + 1 + 10 + 3 + + + Device-8101-01 + FC00::59 + ARISTA07T0 + FC00::5A + 1 + 10 + 3 + + + false + Device-8101-01 + 10.0.0.12 + ARISTA07T2 + 10.0.0.13 + 1 + 10 + 3 + + + Device-8101-01 + FC00::D + ARISTA07T2 + FC00::E + 1 + 10 + 3 + + + false + Device-8101-01 + 10.0.0.46 + ARISTA08T0 + 10.0.0.47 + 1 + 10 + 3 + + + Device-8101-01 + FC00::5D + ARISTA08T0 + FC00::5E + 1 + 10 + 3 + + + false + Device-8101-01 + 10.0.0.48 + ARISTA09T0 + 10.0.0.49 + 1 + 10 + 3 + + + Device-8101-01 + FC00::61 + ARISTA09T0 + FC00::62 + 1 + 10 + 3 + + + false + Device-8101-01 + 10.0.0.50 + ARISTA10T0 + 10.0.0.51 + 1 + 10 + 3 + + + Device-8101-01 + FC00::65 + ARISTA10T0 + FC00::66 + 1 + 10 + 3 + + + false + Device-8101-01 + 10.0.0.52 + ARISTA11T0 + 10.0.0.53 + 1 + 10 + 3 + + + Device-8101-01 + FC00::69 + ARISTA11T0 + FC00::6A + 1 + 10 + 3 + + + false + Device-8101-01 + 10.0.0.54 + ARISTA12T0 + 10.0.0.55 + 1 + 10 + 3 + + + Device-8101-01 + FC00::6D + ARISTA12T0 + FC00::6E + 1 + 10 + 3 + + + false + Device-8101-01 + 10.0.0.56 + ARISTA13T0 + 10.0.0.57 + 1 + 10 + 3 + + + Device-8101-01 + FC00::71 + ARISTA13T0 + FC00::72 + 1 + 10 + 3 + + + false + Device-8101-01 + 10.0.0.58 + ARISTA14T0 + 10.0.0.59 + 1 + 10 + 3 + + + Device-8101-01 + FC00::75 + ARISTA14T0 + FC00::76 + 1 + 10 + 3 + + + false + Device-8101-01 + 10.0.0.60 + ARISTA15T0 + 10.0.0.61 + 1 + 10 + 3 + + + Device-8101-01 + FC00::79 + ARISTA15T0 + FC00::7A + 1 + 10 + 3 + + + false + Device-8101-01 + 10.0.0.62 + ARISTA16T0 + 10.0.0.63 + 1 + 10 + 3 + + + Device-8101-01 + FC00::7D + ARISTA16T0 + FC00::7E + 1 + 10 + 3 + + + false + Device-8101-01 + 10.0.0.64 + ARISTA17T0 + 10.0.0.65 + 1 + 10 + 3 + + + Device-8101-01 + FC00::81 + ARISTA17T0 + FC00::82 + 1 + 10 + 3 + + + false + Device-8101-01 + 10.0.0.66 + ARISTA18T0 + 10.0.0.67 + 1 + 10 + 3 + + + Device-8101-01 + FC00::85 + ARISTA18T0 + FC00::86 + 1 + 10 + 3 + + + false + Device-8101-01 + 10.0.0.68 + ARISTA19T0 + 10.0.0.69 + 1 + 10 + 3 + + + Device-8101-01 + FC00::89 + ARISTA19T0 + FC00::8A + 1 + 10 + 3 + + + false + Device-8101-01 + 10.0.0.70 + ARISTA20T0 + 10.0.0.71 + 1 + 10 + 3 + + + Device-8101-01 + FC00::8D + ARISTA20T0 + FC00::8E + 1 + 10 + 3 + + + + + 65100 + Device-8101-01 + + +
10.0.0.33
+ + + + + +
10.0.0.1
+ + + + + +
10.0.0.35
+ + + + + +
10.0.0.37
+ + + + + +
10.0.0.5
+ + + + + +
10.0.0.39
+ + + + + +
10.0.0.41
+ + + + + +
10.0.0.9
+ + + + + +
10.0.0.43
+ + + + + +
10.0.0.45
+ + + + + +
10.0.0.13
+ + + + + +
10.0.0.47
+ + + + + +
10.0.0.49
+ + + + + +
10.0.0.51
+ + + + + +
10.0.0.53
+ + + + + +
10.0.0.55
+ + + + + +
10.0.0.57
+ + + + + +
10.0.0.59
+ + + + + +
10.0.0.61
+ + + + + +
10.0.0.63
+ + + + + +
10.0.0.65
+ + + + + +
10.0.0.67
+ + + + + +
10.0.0.69
+ + + + + +
10.0.0.71
+ + + + + + + + + 64001 + ARISTA01T0 + + + + 65200 + ARISTA01T2 + + + + 64002 + ARISTA02T0 + + + + 64003 + ARISTA03T0 + + + + 65200 + ARISTA03T2 + + + + 64004 + ARISTA04T0 + + + + 64005 + ARISTA05T0 + + + + 65200 + ARISTA05T2 + + + + 64006 + ARISTA06T0 + + + + 64007 + ARISTA07T0 + + + + 65200 + ARISTA07T2 + + + + 64008 + ARISTA08T0 + + + + 64009 + ARISTA09T0 + + + + 64010 + ARISTA10T0 + + + + 64011 + ARISTA11T0 + + + + 64012 + ARISTA12T0 + + + + 64013 + ARISTA13T0 + + + + 64014 + ARISTA14T0 + + + + 64015 + ARISTA15T0 + + + + 64016 + ARISTA16T0 + + + + 64017 + ARISTA17T0 + + + + 64018 + ARISTA18T0 + + + + 64019 + ARISTA19T0 + + + + 64020 + ARISTA20T0 + + + + + + + + + + HostIP + Loopback0 + + 10.1.0.32/32 + + 10.1.0.32/32 + + + HostIP1 + Loopback0 + + FC00:1::32/128 + + FC00:1::32/128 + + + + + HostIP + eth0 + + 1.1.1.1/23 + + 1.1.1.1/23 + + + V6HostIP + eth0 + + FC00:2::32/64 + + FC00:2::32/64 + + + + + + + Device-8101-01 + + + PortChannel101 + etp0a + + + + PortChannel102 + etp12;etp13 + + + + PortChannel103 + etp0b + + + + PortChannel104 + etp2a + + + + PortChannel105 + etp14;etp15 + + + + PortChannel106 + etp2b + + + + PortChannel107 + etp8a + + + + PortChannel108 + etp16;etp17 + + + + PortChannel109 + etp8b + + + + PortChannel1010 + etp10a + + + + PortChannel1011 + etp18;etp19 + + + + PortChannel1012 + etp10b + + + + PortChannel1013 + etp21a + + + + PortChannel1014 + etp22b + + + + PortChannel1015 + etp25a + + + + PortChannel1016 + etp25b + + + + PortChannel1017 + etp26b + + + + PortChannel1018 + etp27a + + + + PortChannel1019 + etp27b + + + + PortChannel1020 + etp29a + + + + PortChannel1021 + etp30a + + + + PortChannel1022 + etp30b + + + + PortChannel1023 + etp31a + + + + PortChannel1024 + etp31b + + + + + + + + + PortChannel101 + 10.0.0.32/31 + + + + PortChannel101 + FC00::41/126 + + + + PortChannel102 + 10.0.0.0/31 + + + + PortChannel102 + FC00::1/126 + + + + PortChannel103 + 10.0.0.34/31 + + + + PortChannel103 + FC00::45/126 + + + + PortChannel104 + 10.0.0.36/31 + + + + PortChannel104 + FC00::49/126 + + + + PortChannel105 + 10.0.0.4/31 + + + + PortChannel105 + FC00::5/126 + + + + PortChannel106 + 10.0.0.38/31 + + + + PortChannel106 + FC00::4D/126 + + + + PortChannel107 + 10.0.0.40/31 + + + + PortChannel107 + FC00::51/126 + + + + PortChannel108 + 10.0.0.8/31 + + + + PortChannel108 + FC00::9/126 + + + + PortChannel109 + 10.0.0.42/31 + + + + PortChannel109 + FC00::55/126 + + + + PortChannel1010 + 10.0.0.44/31 + + + + PortChannel1010 + FC00::59/126 + + + + PortChannel1011 + 10.0.0.12/31 + + + + PortChannel1011 + FC00::D/126 + + + + PortChannel1012 + 10.0.0.46/31 + + + + PortChannel1012 + FC00::5D/126 + + + + PortChannel1013 + 10.0.0.48/31 + + + + PortChannel1013 + FC00::61/126 + + + + PortChannel1014 + 10.0.0.50/31 + + + + PortChannel1014 + FC00::65/126 + + + + PortChannel1015 + 10.0.0.52/31 + + + + PortChannel1015 + FC00::69/126 + + + + PortChannel1016 + 10.0.0.54/31 + + + + PortChannel1016 + FC00::6D/126 + + + + PortChannel1017 + 10.0.0.56/31 + + + + PortChannel1017 + FC00::71/126 + + + + PortChannel1018 + 10.0.0.58/31 + + + + PortChannel1018 + FC00::75/126 + + + + PortChannel1019 + 10.0.0.60/31 + + + + PortChannel1019 + FC00::79/126 + + + + PortChannel1020 + 10.0.0.62/31 + + + + PortChannel1020 + FC00::7D/126 + + + + PortChannel1021 + 10.0.0.64/31 + + + + PortChannel1021 + FC00::81/126 + + + + PortChannel1022 + 10.0.0.66/31 + + + + PortChannel1022 + FC00::85/126 + + + + PortChannel1023 + 10.0.0.68/31 + + + + PortChannel1023 + FC00::89/126 + + + + PortChannel1024 + 10.0.0.70/31 + + + + PortChannel1024 + FC00::8D/126 + + + + + + NTP_ACL + NTP + NTP + + + SNMP_ACL + SNMP + SNMP + + + VTY_LINE + ssh-only + SSH + + + ERSPAN + Everflow + Everflow + + + ERSPANV6 + EverflowV6 + EverflowV6 + + + PortChannel101;PortChannel102;PortChannel103;PortChannel104;PortChannel105;PortChannel106;PortChannel107;PortChannel108;PortChannel109;PortChannel1010;PortChannel1011;PortChannel1012;PortChannel1013;PortChannel1014;PortChannel1015;PortChannel1016;PortChannel1017;PortChannel1018;PortChannel1019;PortChannel1020;PortChannel1021;PortChannel1022;PortChannel1023;PortChannel1024 + DataAcl + DataPlane + + + + + + + + + + DeviceInterfaceLink + ARISTA01T0 + Ethernet1 + Device-8101-01 + etp0a + 100000 + + + DeviceInterfaceLink + ARISTA01T2 + Ethernet1 + Device-8101-01 + etp12 + 400000 + + + DeviceInterfaceLink + ARISTA01T2 + Ethernet2 + Device-8101-01 + etp13 + 400000 + + + DeviceInterfaceLink + ARISTA02T0 + Ethernet1 + Device-8101-01 + etp0b + 100000 + + + DeviceInterfaceLink + ARISTA03T0 + Ethernet1 + Device-8101-01 + etp2a + 100000 + + + DeviceInterfaceLink + ARISTA03T2 + Ethernet1 + Device-8101-01 + etp14 + 400000 + + + DeviceInterfaceLink + ARISTA03T2 + Ethernet2 + Device-8101-01 + etp15 + 400000 + + + DeviceInterfaceLink + ARISTA04T0 + Ethernet1 + Device-8101-01 + etp2b + 100000 + + + DeviceInterfaceLink + ARISTA05T0 + Ethernet1 + Device-8101-01 + etp8a + 100000 + + + DeviceInterfaceLink + ARISTA05T2 + Ethernet1 + Device-8101-01 + etp16 + 400000 + + + DeviceInterfaceLink + ARISTA05T2 + Ethernet2 + Device-8101-01 + etp17 + 400000 + + + DeviceInterfaceLink + ARISTA06T0 + Ethernet1 + Device-8101-01 + etp8b + 100000 + + + DeviceInterfaceLink + ARISTA07T0 + Ethernet1 + Device-8101-01 + etp10a + 100000 + + + DeviceInterfaceLink + ARISTA07T2 + Ethernet1 + Device-8101-01 + etp18 + 400000 + + + DeviceInterfaceLink + ARISTA07T2 + Ethernet2 + Device-8101-01 + etp19 + 400000 + + + DeviceInterfaceLink + ARISTA08T0 + Ethernet1 + Device-8101-01 + etp10b + 100000 + + + DeviceInterfaceLink + ARISTA09T0 + Ethernet1 + Device-8101-01 + etp21a + 100000 + + + DeviceInterfaceLink + ARISTA10T0 + Ethernet1 + Device-8101-01 + etp22b + 100000 + + + DeviceInterfaceLink + ARISTA11T0 + Ethernet1 + Device-8101-01 + etp25a + 100000 + + + DeviceInterfaceLink + ARISTA12T0 + Ethernet1 + Device-8101-01 + etp25b + 100000 + + + DeviceInterfaceLink + ARISTA13T0 + Ethernet1 + Device-8101-01 + etp26b + 100000 + + + DeviceInterfaceLink + ARISTA14T0 + Ethernet1 + Device-8101-01 + etp27a + 100000 + + + DeviceInterfaceLink + ARISTA15T0 + Ethernet1 + Device-8101-01 + etp27b + 100000 + + + DeviceInterfaceLink + ARISTA16T0 + Ethernet1 + Device-8101-01 + etp29a + 100000 + + + DeviceInterfaceLink + ARISTA17T0 + Ethernet1 + Device-8101-01 + etp30a + 100000 + + + DeviceInterfaceLink + ARISTA18T0 + Ethernet1 + Device-8101-01 + etp30b + 100000 + + + DeviceInterfaceLink + ARISTA19T0 + Ethernet1 + Device-8101-01 + etp31a + 100000 + + + DeviceInterfaceLink + ARISTA20T0 + Ethernet1 + Device-8101-01 + etp31b + 100000 + + + + + Device-8101-01 + Cisco-8101-O8C48 + + 1.1.1.1 + + + + ARISTA16T0 + + 172.16.134.203 + + Arista-VM + + + ARISTA11T0 + + 172.16.134.198 + + Arista-VM + + + ARISTA10T0 + + 172.16.134.197 + + Arista-VM + + + ARISTA17T0 + + 172.16.134.204 + + Arista-VM + + + ARISTA09T0 + + 172.16.134.196 + + Arista-VM + + + ARISTA20T0 + + 172.16.134.207 + + Arista-VM + + + ARISTA08T0 + + 172.16.134.191 + + Arista-VM + + + ARISTA07T0 + + 172.16.134.190 + + Arista-VM + + + ARISTA07T2 + + 172.16.134.195 + + Arista-VM + + + ARISTA01T2 + + 172.16.134.192 + + Arista-VM + + + ARISTA01T0 + + 172.16.134.184 + + Arista-VM + + + ARISTA05T2 + + 172.16.134.194 + + Arista-VM + + + ARISTA05T0 + + 172.16.134.188 + + Arista-VM + + + ARISTA02T0 + + 172.16.134.185 + + Arista-VM + + + ARISTA03T0 + + 172.16.134.186 + + Arista-VM + + + ARISTA03T2 + + 172.16.134.193 + + Arista-VM + + + ARISTA04T0 + + 172.16.134.187 + + Arista-VM + + + ARISTA18T0 + + 172.16.134.205 + + Arista-VM + + + ARISTA15T0 + + 172.16.134.202 + + Arista-VM + + + ARISTA19T0 + + 172.16.134.206 + + Arista-VM + + + ARISTA14T0 + + 172.16.134.201 + + Arista-VM + + + ARISTA12T0 + + 172.16.134.199 + + Arista-VM + + + ARISTA13T0 + + 172.16.134.200 + + Arista-VM + + + ARISTA06T0 + + 172.16.134.189 + + Arista-VM + + + + + + true + + + DeviceInterface + + true + true + 1 + etp0a + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + true + 1 + etp0b + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + true + 1 + etp1a + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + true + 1 + etp1b + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + true + 1 + etp2a + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + true + 1 + etp2b + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + true + 1 + etp3a + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + true + 1 + etp3b + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + true + 1 + etp4a + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + true + 1 + etp4b + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + true + 1 + etp5a + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + true + 1 + etp5b + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + true + 1 + etp6a + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + true + 1 + etp6b + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + true + 1 + etp7a + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + true + 1 + etp7b + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + true + 1 + etp8a + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + true + 1 + etp8b + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + true + 1 + etp9a + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + true + 1 + etp9b + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + true + 1 + etp10a + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + true + 1 + etp10b + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + true + 1 + etp11a + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + true + 1 + etp11b + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + true + 1 + etp12 + + false + 0 + 0 + 400000 + + + DeviceInterface + + true + true + 1 + etp13 + + false + 0 + 0 + 400000 + + + DeviceInterface + + true + true + 1 + etp14 + + false + 0 + 0 + 400000 + + + DeviceInterface + + true + true + 1 + etp15 + + false + 0 + 0 + 400000 + + + DeviceInterface + + true + true + 1 + etp16 + + false + 0 + 0 + 400000 + + + DeviceInterface + + true + true + 1 + etp17 + + false + 0 + 0 + 400000 + + + DeviceInterface + + true + true + 1 + etp18 + + false + 0 + 0 + 400000 + + + DeviceInterface + + true + true + 1 + etp19 + + false + 0 + 0 + 400000 + + + DeviceInterface + + true + true + 1 + etp20a + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + true + 1 + etp20b + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + true + 1 + etp21a + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + true + 1 + etp21b + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + true + 1 + etp22a + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + true + 1 + etp22b + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + true + 1 + etp23a + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + true + 1 + etp23b + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + true + 1 + etp24a + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + true + 1 + etp24b + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + true + 1 + etp25a + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + true + 1 + etp25b + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + true + 1 + etp26a + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + true + 1 + etp26b + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + true + 1 + etp27a + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + true + 1 + etp27b + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + true + 1 + etp28a + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + true + 1 + etp28b + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + true + 1 + etp29a + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + true + 1 + etp29b + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + true + 1 + etp30a + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + true + 1 + etp30b + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + true + 1 + etp31a + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + true + 1 + etp31b + + false + 0 + 0 + 100000 + + + true + 0 + Cisco-8101-O8C48 + + + + + + + Device-8101-01 + + + DeploymentId + + 1 + + + QosProfile + + Profile0 + + + DhcpResources + + 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 + + + NtpResources + + 10.20.8.129;10.20.8.130 + + + SnmpResources + + 10.3.145.98 + + + SyslogResources + + 10.64.246.95 + + + TacacsGroup + + Starlab + + + TacacsServer + + 10.3.145.14;10.3.145.15 + + + ForcedMgmtRoutes + + 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.64.246.0/23;10.3.146.0/23;10.64.5.5;10.201.148.32/28 + + + ErspanDestinationIpv4 + + 10.20.6.16 + + + + + + + Device-8101-01 + Cisco-8101-O8C48 + diff --git a/src/sonic-config-engine/tests/sample-cisco-8101-t1-port-config.ini b/src/sonic-config-engine/tests/sample-cisco-8101-t1-port-config.ini new file mode 100644 index 000000000000..434b31e777f1 --- /dev/null +++ b/src/sonic-config-engine/tests/sample-cisco-8101-t1-port-config.ini @@ -0,0 +1,57 @@ +# name lanes alias index speed +Ethernet0 2304,2305,2306,2307 etp0a 0 100000 +Ethernet4 2308,2309,2310,2311 etp0b 0 100000 +Ethernet8 2320,2321,2322,2323 etp1a 1 100000 +Ethernet12 2324,2325,2326,2327 etp1b 1 100000 +Ethernet16 2312,2313,2314,2315 etp2a 2 100000 +Ethernet20 2316,2317,2318,2319 etp2b 2 100000 +Ethernet24 2056,2057,2058,2059 etp3a 3 100000 +Ethernet28 2060,2061,2062,2063 etp3b 3 100000 +Ethernet32 1792,1793,1794,1795 etp4a 4 100000 +Ethernet36 1796,1797,1798,1799 etp4b 4 100000 +Ethernet40 2048,2049,2050,2051 etp5a 5 100000 +Ethernet44 2052,2053,2054,2055 etp5b 5 100000 +Ethernet48 2560,2561,2562,2563 etp6a 6 100000 +Ethernet52 2564,2565,2566,2567 etp6b 6 100000 +Ethernet56 2824,2825,2826,2827 etp7a 7 100000 +Ethernet60 2828,2829,2830,2831 etp7b 7 100000 +Ethernet64 2832,2833,2834,2835 etp8a 8 100000 +Ethernet68 2836,2837,2838,2839 etp8b 8 100000 +Ethernet72 2816,2817,2818,2819 etp9a 9 100000 +Ethernet76 2820,2821,2822,2823 etp9b 9 100000 +Ethernet80 2568,2569,2570,2571 etp10a 10 100000 +Ethernet84 2572,2573,2574,2575 etp10b 10 100000 +Ethernet88 2576,2577,2578,2579 etp11a 11 100000 +Ethernet92 2580,2581,2582,2583 etp11b 11 100000 +Ethernet96 1536,1537,1538,1539,1540,1541,1542,1543 etp12 12 400000 +Ethernet104 1800,1801,1802,1803,1804,1805,1806,1807 etp13 13 400000 +Ethernet112 1552,1553,1554,1555,1556,1557,1558,1559 etp14 14 400000 +Ethernet120 1544,1545,1546,1547,1548,1549,1550,1551 etp15 15 400000 +Ethernet128 1296,1297,1298,1299,1300,1301,1302,1303 etp16 16 400000 +Ethernet136 1288,1289,1290,1291,1292,1293,1294,1295 etp17 17 400000 +Ethernet144 1280,1281,1282,1283,1284,1285,1286,1287 etp18 18 400000 +Ethernet152 1032,1033,1034,1035,1036,1037,1038,1039 etp19 19 400000 +Ethernet160 264,265,266,267 etp20a 20 100000 +Ethernet164 268,269,270,271 etp20b 20 100000 +Ethernet168 272,273,274,275 etp21a 21 100000 +Ethernet172 276,277,278,279 etp21b 21 100000 +Ethernet176 16,17,18,19 etp22a 22 100000 +Ethernet180 20,21,22,23 etp22b 22 100000 +Ethernet184 0,1,2,3 etp23a 23 100000 +Ethernet188 4,5,6,7 etp23b 23 100000 +Ethernet192 256,257,258,259 etp24a 24 100000 +Ethernet196 260,261,262,263 etp24b 24 100000 +Ethernet200 8,9,10,11 etp25a 25 100000 +Ethernet204 12,13,14,15 etp25b 25 100000 +Ethernet208 1024,1025,1026,1027 etp26a 26 100000 +Ethernet212 1028,1029,1030,1031 etp26b 26 100000 +Ethernet216 768,769,770,771 etp27a 27 100000 +Ethernet220 772,773,774,775 etp27b 27 100000 +Ethernet224 524,525,526,527 etp28a 28 100000 +Ethernet228 520,521,522,523 etp28b 28 100000 +Ethernet232 776,777,778,779 etp29a 29 100000 +Ethernet236 780,781,782,783 etp29b 29 100000 +Ethernet240 516,517,518,519 etp30a 30 100000 +Ethernet244 512,513,514,515 etp30b 30 100000 +Ethernet248 528,529,530,531 etp31a 31 100000 +Ethernet252 532,533,534,535 etp31b 31 100000 diff --git a/src/sonic-config-engine/tests/test_cfggen.py b/src/sonic-config-engine/tests/test_cfggen.py index 67bb2717b78e..b302855cef3c 100644 --- a/src/sonic-config-engine/tests/test_cfggen.py +++ b/src/sonic-config-engine/tests/test_cfggen.py @@ -42,6 +42,9 @@ def setUp(self): self.sample_backend_graph = os.path.join(self.test_dir, 'sample-graph-storage-backend.xml') self.voq_port_config_400g = os.path.join(self.test_dir, 'voq-sample-400g-port-config.ini') self.voq_sample_masic_graph = os.path.join(self.test_dir, 'voq-sample-masic-graph.xml') + self.sample_cisco_port_config_400g = os.path.join(self.test_dir, 'sample-cisco-8101-t1-port-config.ini') + self.sample_cisco_100_graph = os.path.join(self.test_dir, 'sample-cisco-8101-t1-100-minigraph.xml') + self.sample_cisco_400_graph = os.path.join(self.test_dir, 'sample-cisco-8101-t1-400-minigraph.xml') # To ensure that mock config_db data is used for unit-test cases os.environ["CFGGEN_UNIT_TESTING"] = "2" @@ -1027,7 +1030,7 @@ def test_minigraph_packet_chassis_400g_zr_port_config(self): self.assertEqual(output_dict['tx_power'], '7.5') self.assertEqual(output_dict['laser_freq'], 131000) -def test_minigraph_400g_to_100G_speed(self): + def test_minigraph_400g_to_100G_speed(self): argument = "-j {} -m {} -p {} -n asic0 -v \"PORT\"".format(self.macsec_profile,self.voq_sample_masic_graph, self.voq_port_config_400g ) output = self.run_script(argument) self.assertEqual( @@ -1055,3 +1058,25 @@ def test_minigraph_400g_to_100G_speed(self): "'Ethernet-IB0': {'lanes': '222', 'alias': 'Recirc0/1', 'index': '38', 'role': 'Inb', 'speed': '400000', 'asic_port_name': 'Rcy1-ASIC0', 'description': 'Recirc0/1', 'mtu': '9100', 'tpid': '0x8100', 'pfc_asym': 'off', 'admin_status': 'up'}}" ) ) + + def test_minigraph_cisco_400g_to_100G_speed(self): + argument = "-m {} -p {} -v \"PORT\"".format(self.sample_cisco_100_graph, self.sample_cisco_port_config_400g) + output = self.run_script(argument) + self.assertEqual( + utils.to_dict(output.strip()), + utils.to_dict( + "{'Ethernet0': {'lanes': '2304,2305,2306,2307', 'alias': 'etp0a', 'index': '0', 'speed': '100000', 'fec': 'rs', 'description': 'ARISTA01T0:Ethernet1', 'mtu': '9100', 'tpid': '0x8100', 'pfc_asym': 'off', 'admin_status': 'up'}, 'Ethernet4': {'lanes': '2308,2309,2310,2311', 'alias': 'etp0b', 'index': '0', 'speed': '100000', 'fec': 'rs', 'description': 'ARISTA02T0:Ethernet1', 'mtu': '9100', 'tpid': '0x8100', 'pfc_asym': 'off', 'admin_status': 'up'}, 'Ethernet8': {'lanes': '2320,2321,2322,2323', 'alias': 'etp1a', 'index': '1', 'speed': '100000', 'fec': 'rs', 'description': 'etp1a', 'mtu': '9100', 'tpid': '0x8100', 'pfc_asym': 'off'}, 'Ethernet12': {'lanes': '2324,2325,2326,2327', 'alias': 'etp1b', 'index': '1', 'speed': '100000', 'fec': 'rs', 'description': 'etp1b', 'mtu': '9100', 'tpid': '0x8100', 'pfc_asym': 'off'}, 'Ethernet16': {'lanes': '2312,2313,2314,2315', 'alias': 'etp2a', 'index': '2', 'speed': '100000', 'fec': 'rs', 'description': 'ARISTA03T0:Ethernet1', 'mtu': '9100', 'tpid': '0x8100', 'pfc_asym': 'off', 'admin_status': 'up'}, 'Ethernet20': {'lanes': '2316,2317,2318,2319', 'alias': 'etp2b', 'index': '2', 'speed': '100000', 'fec': 'rs', 'description': 'ARISTA04T0:Ethernet1', 'mtu': '9100', 'tpid': '0x8100', 'pfc_asym': 'off', 'admin_status': 'up'}, 'Ethernet24': {'lanes': '2056,2057,2058,2059', 'alias': 'etp3a', 'index': '3', 'speed': '100000', 'fec': 'rs', 'description': 'etp3a', 'mtu': '9100', 'tpid': '0x8100', 'pfc_asym': 'off'}, 'Ethernet28': {'lanes': '2060,2061,2062,2063', 'alias': 'etp3b', 'index': '3', 'speed': '100000', 'fec': 'rs', 'description': 'etp3b', 'mtu': '9100', 'tpid': '0x8100', 'pfc_asym': 'off'}, 'Ethernet32': {'lanes': '1792,1793,1794,1795', 'alias': 'etp4a', 'index': '4', 'speed': '100000', 'fec': 'rs', 'description': 'etp4a', 'mtu': '9100', 'tpid': '0x8100', 'pfc_asym': 'off'}, 'Ethernet36': {'lanes': '1796,1797,1798,1799', 'alias': 'etp4b', 'index': '4', 'speed': '100000', 'fec': 'rs', 'description': 'etp4b', 'mtu': '9100', 'tpid': '0x8100', 'pfc_asym': 'off'}, 'Ethernet40': {'lanes': '2048,2049,2050,2051', 'alias': 'etp5a', 'index': '5', 'speed': '100000', 'fec': 'rs', 'description': 'etp5a', 'mtu': '9100', 'tpid': '0x8100', 'pfc_asym': 'off'}, 'Ethernet44': {'lanes': '2052,2053,2054,2055', 'alias': 'etp5b', 'index': '5', 'speed': '100000', 'fec': 'rs', 'description': 'etp5b', 'mtu': '9100', 'tpid': '0x8100', 'pfc_asym': 'off'}, 'Ethernet48': {'lanes': '2560,2561,2562,2563', 'alias': 'etp6a', 'index': '6', 'speed': '100000', 'fec': 'rs', 'description': 'etp6a', 'mtu': '9100', 'tpid': '0x8100', 'pfc_asym': 'off'}, 'Ethernet52': {'lanes': '2564,2565,2566,2567', 'alias': 'etp6b', 'index': '6', 'speed': '100000', 'fec': 'rs', 'description': 'etp6b', 'mtu': '9100', 'tpid': '0x8100', 'pfc_asym': 'off'}, 'Ethernet56': {'lanes': '2824,2825,2826,2827', 'alias': 'etp7a', 'index': '7', 'speed': '100000', 'fec': 'rs', 'description': 'etp7a', 'mtu': '9100', 'tpid': '0x8100', 'pfc_asym': 'off'}, 'Ethernet60': {'lanes': '2828,2829,2830,2831', 'alias': 'etp7b', 'index': '7', 'speed': '100000', 'fec': 'rs', 'description': 'etp7b', 'mtu': '9100', 'tpid': '0x8100', 'pfc_asym': 'off'}, 'Ethernet64': {'lanes': '2832,2833,2834,2835', 'alias': 'etp8a', 'index': '8', 'speed': '100000', 'fec': 'rs', 'description': 'ARISTA05T0:Ethernet1', 'mtu': '9100', 'tpid': '0x8100', 'pfc_asym': 'off', 'admin_status': 'up'}, 'Ethernet68': {'lanes': '2836,2837,2838,2839', 'alias': 'etp8b', 'index': '8', 'speed': '100000', 'fec': 'rs', 'description': 'ARISTA06T0:Ethernet1', 'mtu': '9100', 'tpid': '0x8100', 'pfc_asym': 'off', 'admin_status': 'up'}, 'Ethernet72': {'lanes': '2816,2817,2818,2819', 'alias': 'etp9a', 'index': '9', 'speed': '100000', 'fec': 'rs', 'description': 'etp9a', 'mtu': '9100', 'tpid': '0x8100', 'pfc_asym': 'off'}, 'Ethernet76': {'lanes': '2820,2821,2822,2823', 'alias': 'etp9b', 'index': '9', 'speed': '100000', 'fec': 'rs', 'description': 'etp9b', 'mtu': '9100', 'tpid': '0x8100', 'pfc_asym': 'off'}, 'Ethernet80': {'lanes': '2568,2569,2570,2571', 'alias': 'etp10a', 'index': '10', 'speed': '100000', 'fec': 'rs', 'description': 'ARISTA07T0:Ethernet1', 'mtu': '9100', 'tpid': '0x8100', 'pfc_asym': 'off', 'admin_status': 'up'}, 'Ethernet84': {'lanes': '2572,2573,2574,2575', 'alias': 'etp10b', 'index': '10', 'speed': '100000', 'fec': 'rs', 'description': 'ARISTA08T0:Ethernet1', 'mtu': '9100', 'tpid': '0x8100', 'pfc_asym': 'off', 'admin_status': 'up'}, 'Ethernet88': {'lanes': '2576,2577,2578,2579', 'alias': 'etp11a', 'index': '11', 'speed': '100000', 'fec': 'rs', 'description': 'etp11a', 'mtu': '9100', 'tpid': '0x8100', 'pfc_asym': 'off'}, 'Ethernet92': {'lanes': '2580,2581,2582,2583', 'alias': 'etp11b', 'index': '11', 'speed': '100000', 'fec': 'rs', 'description': 'etp11b', 'mtu': '9100', 'tpid': '0x8100', 'pfc_asym': 'off'}, 'Ethernet96': {'lanes': '1536,1537,1538,1539', 'alias': 'etp12', 'index': '12', 'speed': '100000', 'fec': 'rs', 'description': 'ARISTA01T2:Ethernet1', 'mtu': '9100', 'tpid': '0x8100', 'pfc_asym': 'off', 'admin_status': 'up'}, 'Ethernet104': {'lanes': '1800,1801,1802,1803', 'alias': 'etp13', 'index': '13', 'speed': '100000', 'fec': 'rs', 'description': 'ARISTA01T2:Ethernet2', 'mtu': '9100', 'tpid': '0x8100', 'pfc_asym': 'off', 'admin_status': 'up'}, 'Ethernet112': {'lanes': '1552,1553,1554,1555', 'alias': 'etp14', 'index': '14', 'speed': '100000', 'fec': 'rs', 'description': 'ARISTA03T2:Ethernet1', 'mtu': '9100', 'tpid': '0x8100', 'pfc_asym': 'off', 'admin_status': 'up'}, 'Ethernet120': {'lanes': '1544,1545,1546,1547', 'alias': 'etp15', 'index': '15', 'speed': '100000', 'fec': 'rs', 'description': 'ARISTA03T2:Ethernet2', 'mtu': '9100', 'tpid': '0x8100', 'pfc_asym': 'off', 'admin_status': 'up'}, 'Ethernet128': {'lanes': '1296,1297,1298,1299', 'alias': 'etp16', 'index': '16', 'speed': '100000', 'fec': 'rs', 'description': 'ARISTA05T2:Ethernet1', 'mtu': '9100', 'tpid': '0x8100', 'pfc_asym': 'off', 'admin_status': 'up'}, 'Ethernet136': {'lanes': '1288,1289,1290,1291', 'alias': 'etp17', 'index': '17', 'speed': '100000', 'fec': 'rs', 'description': 'ARISTA05T2:Ethernet2', 'mtu': '9100', 'tpid': '0x8100', 'pfc_asym': 'off', 'admin_status': 'up'}, 'Ethernet144': {'lanes': '1280,1281,1282,1283', 'alias': 'etp18', 'index': '18', 'speed': '100000', 'fec': 'rs', 'description': 'ARISTA07T2:Ethernet1', 'mtu': '9100', 'tpid': '0x8100', 'pfc_asym': 'off', 'admin_status': 'up'}, 'Ethernet152': {'lanes': '1032,1033,1034,1035', 'alias': 'etp19', 'index': '19', 'speed': '100000', 'fec': 'rs', 'description': 'ARISTA07T2:Ethernet2', 'mtu': '9100', 'tpid': '0x8100', 'pfc_asym': 'off', 'admin_status': 'up'}, 'Ethernet160': {'lanes': '264,265,266,267', 'alias': 'etp20a', 'index': '20', 'speed': '100000', 'fec': 'rs', 'description': 'etp20a', 'mtu': '9100', 'tpid': '0x8100', 'pfc_asym': 'off'}, 'Ethernet164': {'lanes': '268,269,270,271', 'alias': 'etp20b', 'index': '20', 'speed': '100000', 'fec': 'rs', 'description': 'etp20b', 'mtu': '9100', 'tpid': '0x8100', 'pfc_asym': 'off'}, 'Ethernet168': {'lanes': '272,273,274,275', 'alias': 'etp21a', 'index': '21', 'speed': '100000', 'fec': 'rs', 'description': 'ARISTA09T0:Ethernet1', 'mtu': '9100', 'tpid': '0x8100', 'pfc_asym': 'off', 'admin_status': 'up'}, 'Ethernet172': {'lanes': '276,277,278,279', 'alias': 'etp21b', 'index': '21', 'speed': '100000', 'fec': 'rs', 'description': 'etp21b', 'mtu': '9100', 'tpid': '0x8100', 'pfc_asym': 'off'}, 'Ethernet176': {'lanes': '16,17,18,19', 'alias': 'etp22a', 'index': '22', 'speed': '100000', 'fec': 'rs', 'description': 'etp22a', 'mtu': '9100', 'tpid': '0x8100', 'pfc_asym': 'off'}, 'Ethernet180': {'lanes': '20,21,22,23', 'alias': 'etp22b', 'index': '22', 'speed': '100000', 'fec': 'rs', 'description': 'ARISTA10T0:Ethernet1', 'mtu': '9100', 'tpid': '0x8100', 'pfc_asym': 'off', 'admin_status': 'up'}, 'Ethernet184': {'lanes': '0,1,2,3', 'alias': 'etp23a', 'index': '23', 'speed': '100000', 'fec': 'rs', 'description': 'etp23a', 'mtu': '9100', 'tpid': '0x8100', 'pfc_asym': 'off'}, 'Ethernet188': {'lanes': '4,5,6,7', 'alias': 'etp23b', 'index': '23', 'speed': '100000', 'fec': 'rs', 'description': 'etp23b', 'mtu': '9100', 'tpid': '0x8100', 'pfc_asym': 'off'}, 'Ethernet192': {'lanes': '256,257,258,259', 'alias': 'etp24a', 'index': '24', 'speed': '100000', 'fec': 'rs', 'description': 'etp24a', 'mtu': '9100', 'tpid': '0x8100', 'pfc_asym': 'off'}, 'Ethernet196': {'lanes': '260,261,262,263', 'alias': 'etp24b', 'index': '24', 'speed': '100000', 'fec': 'rs', 'description': 'etp24b', 'mtu': '9100', 'tpid': '0x8100', 'pfc_asym': 'off'}, 'Ethernet200': {'lanes': '8,9,10,11', 'alias': 'etp25a', 'index': '25', 'speed': '100000', 'fec': 'rs', 'description': 'ARISTA11T0:Ethernet1', 'mtu': '9100', 'tpid': '0x8100', 'pfc_asym': 'off', 'admin_status': 'up'}, 'Ethernet204': {'lanes': '12,13,14,15', 'alias': 'etp25b', 'index': '25', 'speed': '100000', 'fec': 'rs', 'description': 'ARISTA12T0:Ethernet1', 'mtu': '9100', 'tpid': '0x8100', 'pfc_asym': 'off', 'admin_status': 'up'}, 'Ethernet208': {'lanes': '1024,1025,1026,1027', 'alias': 'etp26a', 'index': '26', 'speed': '100000', 'fec': 'rs', 'description': 'etp26a', 'mtu': '9100', 'tpid': '0x8100', 'pfc_asym': 'off'}, 'Ethernet212': {'lanes': '1028,1029,1030,1031', 'alias': 'etp26b', 'index': '26', 'speed': '100000', 'fec': 'rs', 'description': 'ARISTA13T0:Ethernet1', 'mtu': '9100', 'tpid': '0x8100', 'pfc_asym': 'off', 'admin_status': 'up'}, 'Ethernet216': {'lanes': '768,769,770,771', 'alias': 'etp27a', 'index': '27', 'speed': '100000', 'fec': 'rs', 'description': 'ARISTA14T0:Ethernet1', 'mtu': '9100', 'tpid': '0x8100', 'pfc_asym': 'off', 'admin_status': 'up'}, 'Ethernet220': {'lanes': '772,773,774,775', 'alias': 'etp27b', 'index': '27', 'speed': '100000', 'fec': 'rs', 'description': 'ARISTA15T0:Ethernet1', 'mtu': '9100', 'tpid': '0x8100', 'pfc_asym': 'off', 'admin_status': 'up'}, 'Ethernet224': {'lanes': '524,525,526,527', 'alias': 'etp28a', 'index': '28', 'speed': '100000', 'fec': 'rs', 'description': 'etp28a', 'mtu': '9100', 'tpid': '0x8100', 'pfc_asym': 'off'}, 'Ethernet228': {'lanes': '520,521,522,523', 'alias': 'etp28b', 'index': '28', 'speed': '100000', 'fec': 'rs', 'description': 'etp28b', 'mtu': '9100', 'tpid': '0x8100', 'pfc_asym': 'off'}, 'Ethernet232': {'lanes': '776,777,778,779', 'alias': 'etp29a', 'index': '29', 'speed': '100000', 'fec': 'rs', 'description': 'ARISTA16T0:Ethernet1', 'mtu': '9100', 'tpid': '0x8100', 'pfc_asym': 'off', 'admin_status': 'up'}, 'Ethernet236': {'lanes': '780,781,782,783', 'alias': 'etp29b', 'index': '29', 'speed': '100000', 'fec': 'rs', 'description': 'etp29b', 'mtu': '9100', 'tpid': '0x8100', 'pfc_asym': 'off'}, 'Ethernet240': {'lanes': '516,517,518,519', 'alias': 'etp30a', 'index': '30', 'speed': '100000', 'fec': 'rs', 'description': 'ARISTA17T0:Ethernet1', 'mtu': '9100', 'tpid': '0x8100', 'pfc_asym': 'off', 'admin_status': 'up'}, 'Ethernet244': {'lanes': '512,513,514,515', 'alias': 'etp30b', 'index': '30', 'speed': '100000', 'fec': 'rs', 'description': 'ARISTA18T0:Ethernet1', 'mtu': '9100', 'tpid': '0x8100', 'pfc_asym': 'off', 'admin_status': 'up'}, 'Ethernet248': {'lanes': '528,529,530,531', 'alias': 'etp31a', 'index': '31', 'speed': '100000', 'fec': 'rs', 'description': 'ARISTA19T0:Ethernet1', 'mtu': '9100', 'tpid': '0x8100', 'pfc_asym': 'off', 'admin_status': 'up'}, 'Ethernet252': {'lanes': '532,533,534,535', 'alias': 'etp31b', 'index': '31', 'speed': '100000', 'fec': 'rs', 'description': 'ARISTA20T0:Ethernet1', 'mtu': '9100', 'tpid': '0x8100', 'pfc_asym': 'off', 'admin_status': 'up'}}" + ) + ) + + + + def test_minigraph_cisco_400G_to_400G_speed(self): + argument = "-m {} -p {} -v \"PORT\"".format(self.sample_cisco_400_graph, self.sample_cisco_port_config_400g) + output = self.run_script(argument) + self.assertEqual( + utils.to_dict(output.strip()), + utils.to_dict( + "{'Ethernet0': {'lanes': '2304,2305,2306,2307', 'alias': 'etp0a', 'index': '0', 'speed': '100000', 'fec': 'rs', 'description': 'ARISTA01T0:Ethernet1', 'mtu': '9100', 'tpid': '0x8100', 'pfc_asym': 'off', 'admin_status': 'up'}, 'Ethernet4': {'lanes': '2308,2309,2310,2311', 'alias': 'etp0b', 'index': '0', 'speed': '100000', 'fec': 'rs', 'description': 'ARISTA02T0:Ethernet1', 'mtu': '9100', 'tpid': '0x8100', 'pfc_asym': 'off', 'admin_status': 'up'}, 'Ethernet8': {'lanes': '2320,2321,2322,2323', 'alias': 'etp1a', 'index': '1', 'speed': '100000', 'fec': 'rs', 'description': 'etp1a', 'mtu': '9100', 'tpid': '0x8100', 'pfc_asym': 'off'}, 'Ethernet12': {'lanes': '2324,2325,2326,2327', 'alias': 'etp1b', 'index': '1', 'speed': '100000', 'fec': 'rs', 'description': 'etp1b', 'mtu': '9100', 'tpid': '0x8100', 'pfc_asym': 'off'}, 'Ethernet16': {'lanes': '2312,2313,2314,2315', 'alias': 'etp2a', 'index': '2', 'speed': '100000', 'fec': 'rs', 'description': 'ARISTA03T0:Ethernet1', 'mtu': '9100', 'tpid': '0x8100', 'pfc_asym': 'off', 'admin_status': 'up'}, 'Ethernet20': {'lanes': '2316,2317,2318,2319', 'alias': 'etp2b', 'index': '2', 'speed': '100000', 'fec': 'rs', 'description': 'ARISTA04T0:Ethernet1', 'mtu': '9100', 'tpid': '0x8100', 'pfc_asym': 'off', 'admin_status': 'up'}, 'Ethernet24': {'lanes': '2056,2057,2058,2059', 'alias': 'etp3a', 'index': '3', 'speed': '100000', 'fec': 'rs', 'description': 'etp3a', 'mtu': '9100', 'tpid': '0x8100', 'pfc_asym': 'off'}, 'Ethernet28': {'lanes': '2060,2061,2062,2063', 'alias': 'etp3b', 'index': '3', 'speed': '100000', 'fec': 'rs', 'description': 'etp3b', 'mtu': '9100', 'tpid': '0x8100', 'pfc_asym': 'off'}, 'Ethernet32': {'lanes': '1792,1793,1794,1795', 'alias': 'etp4a', 'index': '4', 'speed': '100000', 'fec': 'rs', 'description': 'etp4a', 'mtu': '9100', 'tpid': '0x8100', 'pfc_asym': 'off'}, 'Ethernet36': {'lanes': '1796,1797,1798,1799', 'alias': 'etp4b', 'index': '4', 'speed': '100000', 'fec': 'rs', 'description': 'etp4b', 'mtu': '9100', 'tpid': '0x8100', 'pfc_asym': 'off'}, 'Ethernet40': {'lanes': '2048,2049,2050,2051', 'alias': 'etp5a', 'index': '5', 'speed': '100000', 'fec': 'rs', 'description': 'etp5a', 'mtu': '9100', 'tpid': '0x8100', 'pfc_asym': 'off'}, 'Ethernet44': {'lanes': '2052,2053,2054,2055', 'alias': 'etp5b', 'index': '5', 'speed': '100000', 'fec': 'rs', 'description': 'etp5b', 'mtu': '9100', 'tpid': '0x8100', 'pfc_asym': 'off'}, 'Ethernet48': {'lanes': '2560,2561,2562,2563', 'alias': 'etp6a', 'index': '6', 'speed': '100000', 'fec': 'rs', 'description': 'etp6a', 'mtu': '9100', 'tpid': '0x8100', 'pfc_asym': 'off'}, 'Ethernet52': {'lanes': '2564,2565,2566,2567', 'alias': 'etp6b', 'index': '6', 'speed': '100000', 'fec': 'rs', 'description': 'etp6b', 'mtu': '9100', 'tpid': '0x8100', 'pfc_asym': 'off'}, 'Ethernet56': {'lanes': '2824,2825,2826,2827', 'alias': 'etp7a', 'index': '7', 'speed': '100000', 'fec': 'rs', 'description': 'etp7a', 'mtu': '9100', 'tpid': '0x8100', 'pfc_asym': 'off'}, 'Ethernet60': {'lanes': '2828,2829,2830,2831', 'alias': 'etp7b', 'index': '7', 'speed': '100000', 'fec': 'rs', 'description': 'etp7b', 'mtu': '9100', 'tpid': '0x8100', 'pfc_asym': 'off'}, 'Ethernet64': {'lanes': '2832,2833,2834,2835', 'alias': 'etp8a', 'index': '8', 'speed': '100000', 'fec': 'rs', 'description': 'ARISTA05T0:Ethernet1', 'mtu': '9100', 'tpid': '0x8100', 'pfc_asym': 'off', 'admin_status': 'up'}, 'Ethernet68': {'lanes': '2836,2837,2838,2839', 'alias': 'etp8b', 'index': '8', 'speed': '100000', 'fec': 'rs', 'description': 'ARISTA06T0:Ethernet1', 'mtu': '9100', 'tpid': '0x8100', 'pfc_asym': 'off', 'admin_status': 'up'}, 'Ethernet72': {'lanes': '2816,2817,2818,2819', 'alias': 'etp9a', 'index': '9', 'speed': '100000', 'fec': 'rs', 'description': 'etp9a', 'mtu': '9100', 'tpid': '0x8100', 'pfc_asym': 'off'}, 'Ethernet76': {'lanes': '2820,2821,2822,2823', 'alias': 'etp9b', 'index': '9', 'speed': '100000', 'fec': 'rs', 'description': 'etp9b', 'mtu': '9100', 'tpid': '0x8100', 'pfc_asym': 'off'}, 'Ethernet80': {'lanes': '2568,2569,2570,2571', 'alias': 'etp10a', 'index': '10', 'speed': '100000', 'fec': 'rs', 'description': 'ARISTA07T0:Ethernet1', 'mtu': '9100', 'tpid': '0x8100', 'pfc_asym': 'off', 'admin_status': 'up'}, 'Ethernet84': {'lanes': '2572,2573,2574,2575', 'alias': 'etp10b', 'index': '10', 'speed': '100000', 'fec': 'rs', 'description': 'ARISTA08T0:Ethernet1', 'mtu': '9100', 'tpid': '0x8100', 'pfc_asym': 'off', 'admin_status': 'up'}, 'Ethernet88': {'lanes': '2576,2577,2578,2579', 'alias': 'etp11a', 'index': '11', 'speed': '100000', 'fec': 'rs', 'description': 'etp11a', 'mtu': '9100', 'tpid': '0x8100', 'pfc_asym': 'off'}, 'Ethernet92': {'lanes': '2580,2581,2582,2583', 'alias': 'etp11b', 'index': '11', 'speed': '100000', 'fec': 'rs', 'description': 'etp11b', 'mtu': '9100', 'tpid': '0x8100', 'pfc_asym': 'off'}, 'Ethernet96': {'lanes': '1536,1537,1538,1539,1540,1541,1542,1543', 'alias': 'etp12', 'index': '12', 'speed': '400000', 'description': 'ARISTA01T2:Ethernet1', 'mtu': '9100', 'tpid': '0x8100', 'pfc_asym': 'off', 'admin_status': 'up'}, 'Ethernet104': {'lanes': '1800,1801,1802,1803,1804,1805,1806,1807', 'alias': 'etp13', 'index': '13', 'speed': '400000', 'description': 'ARISTA01T2:Ethernet2', 'mtu': '9100', 'tpid': '0x8100', 'pfc_asym': 'off', 'admin_status': 'up'}, 'Ethernet112': {'lanes': '1552,1553,1554,1555,1556,1557,1558,1559', 'alias': 'etp14', 'index': '14', 'speed': '400000', 'description': 'ARISTA03T2:Ethernet1', 'mtu': '9100', 'tpid': '0x8100', 'pfc_asym': 'off', 'admin_status': 'up'}, 'Ethernet120': {'lanes': '1544,1545,1546,1547,1548,1549,1550,1551', 'alias': 'etp15', 'index': '15', 'speed': '400000', 'description': 'ARISTA03T2:Ethernet2', 'mtu': '9100', 'tpid': '0x8100', 'pfc_asym': 'off', 'admin_status': 'up'}, 'Ethernet128': {'lanes': '1296,1297,1298,1299,1300,1301,1302,1303', 'alias': 'etp16', 'index': '16', 'speed': '400000', 'description': 'ARISTA05T2:Ethernet1', 'mtu': '9100', 'tpid': '0x8100', 'pfc_asym': 'off', 'admin_status': 'up'}, 'Ethernet136': {'lanes': '1288,1289,1290,1291,1292,1293,1294,1295', 'alias': 'etp17', 'index': '17', 'speed': '400000', 'description': 'ARISTA05T2:Ethernet2', 'mtu': '9100', 'tpid': '0x8100', 'pfc_asym': 'off', 'admin_status': 'up'}, 'Ethernet144': {'lanes': '1280,1281,1282,1283,1284,1285,1286,1287', 'alias': 'etp18', 'index': '18', 'speed': '400000', 'description': 'ARISTA07T2:Ethernet1', 'mtu': '9100', 'tpid': '0x8100', 'pfc_asym': 'off', 'admin_status': 'up'}, 'Ethernet152': {'lanes': '1032,1033,1034,1035,1036,1037,1038,1039', 'alias': 'etp19', 'index': '19', 'speed': '400000', 'description': 'ARISTA07T2:Ethernet2', 'mtu': '9100', 'tpid': '0x8100', 'pfc_asym': 'off', 'admin_status': 'up'}, 'Ethernet160': {'lanes': '264,265,266,267', 'alias': 'etp20a', 'index': '20', 'speed': '100000', 'fec': 'rs', 'description': 'etp20a', 'mtu': '9100', 'tpid': '0x8100', 'pfc_asym': 'off'}, 'Ethernet164': {'lanes': '268,269,270,271', 'alias': 'etp20b', 'index': '20', 'speed': '100000', 'fec': 'rs', 'description': 'etp20b', 'mtu': '9100', 'tpid': '0x8100', 'pfc_asym': 'off'}, 'Ethernet168': {'lanes': '272,273,274,275', 'alias': 'etp21a', 'index': '21', 'speed': '100000', 'fec': 'rs', 'description': 'ARISTA09T0:Ethernet1', 'mtu': '9100', 'tpid': '0x8100', 'pfc_asym': 'off', 'admin_status': 'up'}, 'Ethernet172': {'lanes': '276,277,278,279', 'alias': 'etp21b', 'index': '21', 'speed': '100000', 'fec': 'rs', 'description': 'etp21b', 'mtu': '9100', 'tpid': '0x8100', 'pfc_asym': 'off'}, 'Ethernet176': {'lanes': '16,17,18,19', 'alias': 'etp22a', 'index': '22', 'speed': '100000', 'fec': 'rs', 'description': 'etp22a', 'mtu': '9100', 'tpid': '0x8100', 'pfc_asym': 'off'}, 'Ethernet180': {'lanes': '20,21,22,23', 'alias': 'etp22b', 'index': '22', 'speed': '100000', 'fec': 'rs', 'description': 'ARISTA10T0:Ethernet1', 'mtu': '9100', 'tpid': '0x8100', 'pfc_asym': 'off', 'admin_status': 'up'}, 'Ethernet184': {'lanes': '0,1,2,3', 'alias': 'etp23a', 'index': '23', 'speed': '100000', 'fec': 'rs', 'description': 'etp23a', 'mtu': '9100', 'tpid': '0x8100', 'pfc_asym': 'off'}, 'Ethernet188': {'lanes': '4,5,6,7', 'alias': 'etp23b', 'index': '23', 'speed': '100000', 'fec': 'rs', 'description': 'etp23b', 'mtu': '9100', 'tpid': '0x8100', 'pfc_asym': 'off'}, 'Ethernet192': {'lanes': '256,257,258,259', 'alias': 'etp24a', 'index': '24', 'speed': '100000', 'fec': 'rs', 'description': 'etp24a', 'mtu': '9100', 'tpid': '0x8100', 'pfc_asym': 'off'}, 'Ethernet196': {'lanes': '260,261,262,263', 'alias': 'etp24b', 'index': '24', 'speed': '100000', 'fec': 'rs', 'description': 'etp24b', 'mtu': '9100', 'tpid': '0x8100', 'pfc_asym': 'off'}, 'Ethernet200': {'lanes': '8,9,10,11', 'alias': 'etp25a', 'index': '25', 'speed': '100000', 'fec': 'rs', 'description': 'ARISTA11T0:Ethernet1', 'mtu': '9100', 'tpid': '0x8100', 'pfc_asym': 'off', 'admin_status': 'up'}, 'Ethernet204': {'lanes': '12,13,14,15', 'alias': 'etp25b', 'index': '25', 'speed': '100000', 'fec': 'rs', 'description': 'ARISTA12T0:Ethernet1', 'mtu': '9100', 'tpid': '0x8100', 'pfc_asym': 'off', 'admin_status': 'up'}, 'Ethernet208': {'lanes': '1024,1025,1026,1027', 'alias': 'etp26a', 'index': '26', 'speed': '100000', 'fec': 'rs', 'description': 'etp26a', 'mtu': '9100', 'tpid': '0x8100', 'pfc_asym': 'off'}, 'Ethernet212': {'lanes': '1028,1029,1030,1031', 'alias': 'etp26b', 'index': '26', 'speed': '100000', 'fec': 'rs', 'description': 'ARISTA13T0:Ethernet1', 'mtu': '9100', 'tpid': '0x8100', 'pfc_asym': 'off', 'admin_status': 'up'}, 'Ethernet216': {'lanes': '768,769,770,771', 'alias': 'etp27a', 'index': '27', 'speed': '100000', 'fec': 'rs', 'description': 'ARISTA14T0:Ethernet1', 'mtu': '9100', 'tpid': '0x8100', 'pfc_asym': 'off', 'admin_status': 'up'}, 'Ethernet220': {'lanes': '772,773,774,775', 'alias': 'etp27b', 'index': '27', 'speed': '100000', 'fec': 'rs', 'description': 'ARISTA15T0:Ethernet1', 'mtu': '9100', 'tpid': '0x8100', 'pfc_asym': 'off', 'admin_status': 'up'}, 'Ethernet224': {'lanes': '524,525,526,527', 'alias': 'etp28a', 'index': '28', 'speed': '100000', 'fec': 'rs', 'description': 'etp28a', 'mtu': '9100', 'tpid': '0x8100', 'pfc_asym': 'off'}, 'Ethernet228': {'lanes': '520,521,522,523', 'alias': 'etp28b', 'index': '28', 'speed': '100000', 'fec': 'rs', 'description': 'etp28b', 'mtu': '9100', 'tpid': '0x8100', 'pfc_asym': 'off'}, 'Ethernet232': {'lanes': '776,777,778,779', 'alias': 'etp29a', 'index': '29', 'speed': '100000', 'fec': 'rs', 'description': 'ARISTA16T0:Ethernet1', 'mtu': '9100', 'tpid': '0x8100', 'pfc_asym': 'off', 'admin_status': 'up'}, 'Ethernet236': {'lanes': '780,781,782,783', 'alias': 'etp29b', 'index': '29', 'speed': '100000', 'fec': 'rs', 'description': 'etp29b', 'mtu': '9100', 'tpid': '0x8100', 'pfc_asym': 'off'}, 'Ethernet240': {'lanes': '516,517,518,519', 'alias': 'etp30a', 'index': '30', 'speed': '100000', 'fec': 'rs', 'description': 'ARISTA17T0:Ethernet1', 'mtu': '9100', 'tpid': '0x8100', 'pfc_asym': 'off', 'admin_status': 'up'}, 'Ethernet244': {'lanes': '512,513,514,515', 'alias': 'etp30b', 'index': '30', 'speed': '100000', 'fec': 'rs', 'description': 'ARISTA18T0:Ethernet1', 'mtu': '9100', 'tpid': '0x8100', 'pfc_asym': 'off', 'admin_status': 'up'}, 'Ethernet248': {'lanes': '528,529,530,531', 'alias': 'etp31a', 'index': '31', 'speed': '100000', 'fec': 'rs', 'description': 'ARISTA19T0:Ethernet1', 'mtu': '9100', 'tpid': '0x8100', 'pfc_asym': 'off', 'admin_status': 'up'}, 'Ethernet252': {'lanes': '532,533,534,535', 'alias': 'etp31b', 'index': '31', 'speed': '100000', 'fec': 'rs', 'description': 'ARISTA20T0:Ethernet1', 'mtu': '9100', 'tpid': '0x8100', 'pfc_asym': 'off', 'admin_status': 'up'}}" + ) + ) From e9a2e1b6a5cf68968d05d2fbf07334e2b0c9c850 Mon Sep 17 00:00:00 2001 From: Dror Prital <76714716+dprital@users.noreply.github.com> Date: Wed, 10 May 2023 20:56:12 +0300 Subject: [PATCH 081/193] Add ability to navigate to specific path inside registry server (#14946) Why I did it Backport PR #14907 to 202205 branch In order to reduce sonic build time, there is an option to acquire sonic slave docker(s) from artifact server (reduce sonic make configure time). Current implementation supports only convention of: :/: In case the SLAVE_BASE_IMAGE appear in internal path inside the server, the convention should be like that: :/: When REGISTRY_SERVER_PATH (that is set on rules/config) will have to start with "/". If REGISTRY_SERVER_PATH will not be set, the behavior will remain the same it works today. Work item tracking Microsoft ADO (number only): How I did it Add ability to set REGISTRY_SERVER_PATH and update the code for docker image tag and docker image pull accordingly How to verify it Use sonic slave docker image from artifact server in which the image is kept in internal folder and make sure it consume it. --- Makefile.work | 6 +++--- rules/config | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Makefile.work b/Makefile.work index 3737c47e84af..facb17222c6d 100644 --- a/Makefile.work +++ b/Makefile.work @@ -330,7 +330,7 @@ DOCKER_BASE_BUILD = docker build --no-cache \ $(SLAVE_DIR) $(SPLIT_LOG) $(DOCKER_BASE_LOG) DOCKER_BASE_PULL = docker pull \ - $(REGISTRY_SERVER):$(REGISTRY_PORT)/$(SLAVE_BASE_IMAGE):$(SLAVE_BASE_TAG) + $(REGISTRY_SERVER):$(REGISTRY_PORT)$(REGISTRY_SERVER_PATH)/$(SLAVE_BASE_IMAGE):$(SLAVE_BASE_TAG) DOCKER_BUILD = docker build --no-cache \ --build-arg user=$(USER) \ @@ -431,7 +431,7 @@ endif @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) && \ - { docker tag $(REGISTRY_SERVER):$(REGISTRY_PORT)/$(SLAVE_BASE_IMAGE):$(SLAVE_BASE_TAG) $(SLAVE_BASE_IMAGE):$(SLAVE_BASE_TAG) && \ + { docker tag $(REGISTRY_SERVER):$(REGISTRY_PORT)$(REGISTRY_SERVER_PATH)/$(SLAVE_BASE_IMAGE):$(SLAVE_BASE_TAG) $(SLAVE_BASE_IMAGE):$(SLAVE_BASE_TAG) && \ scripts/collect_docker_version_files.sh $(SLAVE_BASE_IMAGE):$(SLAVE_BASE_TAG) target ; } } || \ { echo Image $(SLAVE_BASE_IMAGE):$(SLAVE_BASE_TAG) not found. Building... ; \ $(DOCKER_BASE_BUILD) ; \ @@ -466,7 +466,7 @@ endif @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) && \ - { docker tag $(REGISTRY_SERVER):$(REGISTRY_PORT)/$(SLAVE_BASE_IMAGE):$(SLAVE_BASE_TAG) $(SLAVE_BASE_IMAGE):$(SLAVE_BASE_TAG) && \ + { docker tag $(REGISTRY_SERVER):$(REGISTRY_PORT)$(REGISTRY_SERVER_PATH)/$(SLAVE_BASE_IMAGE):$(SLAVE_BASE_TAG) $(SLAVE_BASE_IMAGE):$(SLAVE_BASE_TAG) && \ scripts/collect_docker_version_files.sh $(SLAVE_BASE_IMAGE):$(SLAVE_BASE_TAG) target ; } } || \ { echo Image $(SLAVE_BASE_IMAGE):$(SLAVE_BASE_TAG) not found. Building... ; \ $(DOCKER_BASE_BUILD) ; \ diff --git a/rules/config b/rules/config index 9b9ab102518b..ef70bddee390 100644 --- a/rules/config +++ b/rules/config @@ -233,6 +233,7 @@ MIRROR_SNAPSHOT ?= n # 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 +REGISTRY_SERVER_PATH ?= # BUILD_MULTIASIC_KVM - if set to y multi-asic KVM images will be generated. BUILD_MULTIASIC_KVM = n From 1496d1d28cff9f6ffbac7eefb2df2fd293d52b7d Mon Sep 17 00:00:00 2001 From: Ying Xie Date: Fri, 12 May 2023 09:54:21 -0700 Subject: [PATCH 082/193] yang model table DEVICE_NEIGHBOR_METADATA creation (#11894) (#15026) * yang mode support for neighbor metadata * add description in leaf node * modify description Co-authored-by: jcaiMR <111116206+jcaiMR@users.noreply.github.com> --- src/sonic-config-engine/minigraph.py | 40 +++++-- .../tests/test_minigraph_case.py | 39 +++---- .../tests/test_multinpu_cfggen.py | 12 +- src/sonic-yang-models/setup.py | 2 + .../tests/files/sample_config_db.json | 20 ++++ .../tests/device_neighbor_metadata.json | 15 +++ .../device_neighbor_metadata.json | 107 ++++++++++++++++++ .../sonic-device_neighbor_metadata.yang | 100 ++++++++++++++++ 8 files changed, 301 insertions(+), 34 deletions(-) create mode 100644 src/sonic-yang-models/tests/yang_model_tests/tests/device_neighbor_metadata.json create mode 100644 src/sonic-yang-models/tests/yang_model_tests/tests_config/device_neighbor_metadata.json create mode 100644 src/sonic-yang-models/yang-models/sonic-device_neighbor_metadata.yang diff --git a/src/sonic-config-engine/minigraph.py b/src/sonic-config-engine/minigraph.py index 32a56be76fb2..80127a5e175c 100644 --- a/src/sonic-config-engine/minigraph.py +++ b/src/sonic-config-engine/minigraph.py @@ -264,14 +264,24 @@ 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, mgmt_prefix_v6, name, hwsku, d_type, deployment_id, cluster, d_subtype) = parse_device(device) - device_data = {'lo_addr': lo_prefix, 'type': d_type, 'mgmt_addr': mgmt_prefix, 'hwsku': hwsku} - if cluster: + device_data = {} + if hwsku != None: + device_data['hwsku'] = hwsku + if cluster != None: device_data['cluster'] = cluster - if deployment_id: + if deployment_id != None: device_data['deployment_id'] = deployment_id - if lo_prefix_v6: + if lo_prefix != None: + device_data['lo_addr'] = lo_prefix + if lo_prefix_v6 != None: device_data['lo_addr_v6'] = lo_prefix_v6 - if d_subtype: + if mgmt_prefix != None: + device_data['mgmt_addr'] = mgmt_prefix + if mgmt_prefix_v6 != None: + device_data['mgmt_addr_v6'] = mgmt_prefix_v6 + if d_type != None: + device_data['type'] = d_type + if d_subtype != None: device_data['subtype'] = d_subtype devices[name] = device_data @@ -395,13 +405,23 @@ 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, 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 = {} + if hwsku != None: + device_data['hwsku'] = hwsku + if cluster != None: device_data['cluster'] = cluster - if deployment_id: + if deployment_id != None: device_data['deployment_id'] = deployment_id - if lo_prefix_v6: - device_data['lo_addr_v6']= lo_prefix_v6 + if lo_prefix != None: + device_data['lo_addr'] = lo_prefix + if lo_prefix_v6 != None: + device_data['lo_addr_v6'] = lo_prefix_v6 + if mgmt_prefix != None: + device_data['mgmt_addr'] = mgmt_prefix + if mgmt_prefix_v6 != None: + device_data['mgmt_addr_v6'] = mgmt_prefix_v6 + if d_type != None: + device_data['type'] = d_type devices[name] = device_data return (neighbors, devices, port_speeds) diff --git a/src/sonic-config-engine/tests/test_minigraph_case.py b/src/sonic-config-engine/tests/test_minigraph_case.py index 0cdfb7e9e9af..9c1a40992d9a 100644 --- a/src/sonic-config-engine/tests/test_minigraph_case.py +++ b/src/sonic-config-engine/tests/test_minigraph_case.py @@ -203,39 +203,40 @@ def test_minigraph_neighbor_metadata(self): argument = '-m "' + self.sample_graph + '" -p "' + self.port_config + '" -v "DEVICE_NEIGHBOR_METADATA"' expected_table = { - 'switch-01t1': { - 'lo_addr': '10.1.0.186/32', - 'mgmt_addr': '10.7.0.196/26', - 'hwsku': 'Force10-S6000', - 'type': 'LeafRouter', - 'deployment_id': '2' - }, 'switch2-t0': { - 'hwsku': 'Force10-S6000', 'lo_addr': '25.1.1.10/32', 'mgmt_addr': '10.7.0.196/26', + 'hwsku': 'Force10-S6000', 'type': 'ToRRouter' }, - 'server1': { + 'server2': { + 'lo_addr_v6': 'fe80::0002/128', + 'lo_addr': '10.10.10.2/32', + 'mgmt_addr': '10.0.0.2/32', 'hwsku': 'server-sku', - 'lo_addr': '10.10.10.1/32', - 'lo_addr_v6': 'fe80::0001/80', - 'mgmt_addr': '10.0.0.1/32', 'type': 'Server' }, - 'server2': { + 'server1': { + 'lo_addr_v6': 'fe80::0001/80', + 'lo_addr': '10.10.10.1/32', + 'mgmt_addr': '10.0.0.1/32', 'hwsku': 'server-sku', - 'lo_addr': '10.10.10.2/32', - 'lo_addr_v6': 'fe80::0002/128', - 'mgmt_addr': '10.0.0.2/32', 'type': 'Server' }, + 'switch-01t1': { + 'lo_addr': '10.1.0.186/32', + 'deployment_id': '2', + 'hwsku': 'Force10-S6000', + 'type': 'LeafRouter', + 'mgmt_addr': '10.7.0.196/26' + }, 'server1-SC': { - 'hwsku': 'smartcable-sku', - 'lo_addr': '0.0.0.0/0', 'lo_addr_v6': '::/0', 'mgmt_addr': '0.0.0.0/0', - 'type': 'SmartCable' + 'hwsku': 'smartcable-sku', + 'lo_addr': '0.0.0.0/0', + 'type': 'SmartCable', + 'mgmt_addr_v6': '::/0', } } output = self.run_script(argument) diff --git a/src/sonic-config-engine/tests/test_multinpu_cfggen.py b/src/sonic-config-engine/tests/test_multinpu_cfggen.py index ca7be3c25960..323e76fdaf5c 100644 --- a/src/sonic-config-engine/tests/test_multinpu_cfggen.py +++ b/src/sonic-config-engine/tests/test_multinpu_cfggen.py @@ -250,10 +250,11 @@ def test_frontend_asic_device_neigh(self): def test_frontend_asic_device_neigh_metadata(self): argument = "-m {} -p {} -n asic0 --var-json \"DEVICE_NEIGHBOR_METADATA\"".format(self.sample_graph, self.port_config[0]) output = json.loads(self.run_script(argument)) + print(output) self.assertDictEqual(output, \ - {'01T2': {'lo_addr': None, 'mgmt_addr': '89.139.132.40', 'hwsku': 'VM', 'type': 'SpineRouter'}, - 'ASIC3': {'lo_addr': '0.0.0.0/0', 'lo_addr_v6': '::/0', 'mgmt_addr': '0.0.0.0/0', 'hwsku': 'multi-npu-asic', 'type': 'Asic'}, - 'ASIC2': {'lo_addr': '0.0.0.0/0', 'lo_addr_v6': '::/0', 'mgmt_addr': '0.0.0.0/0', 'hwsku': 'multi-npu-asic', 'type': 'Asic'}}) + {'01T2': {'mgmt_addr': '89.139.132.40', 'hwsku': 'VM', 'type': 'SpineRouter'}, + 'ASIC3': {'lo_addr_v6': '::/0', 'mgmt_addr': '0.0.0.0/0', 'hwsku': 'multi-npu-asic', 'lo_addr': '0.0.0.0/0', 'type': 'Asic', 'mgmt_addr_v6': '::/0'}, + 'ASIC2': {'lo_addr_v6': '::/0', 'mgmt_addr': '0.0.0.0/0', 'hwsku': 'multi-npu-asic', 'lo_addr': '0.0.0.0/0', 'type': 'Asic', 'mgmt_addr_v6': '::/0'}}) def test_backend_asic_device_neigh(self): argument = "-m {} -p {} -n asic3 --var-json \"DEVICE_NEIGHBOR\"".format(self.sample_graph, self.port_config[3]) @@ -267,9 +268,10 @@ def test_backend_asic_device_neigh(self): def test_backend_device_neigh_metadata(self): argument = "-m {} -p {} -n asic3 --var-json \"DEVICE_NEIGHBOR_METADATA\"".format(self.sample_graph, self.port_config[3]) output = json.loads(self.run_script(argument)) + print(output) self.assertDictEqual(output, \ - {'ASIC1': {'lo_addr': '0.0.0.0/0', 'lo_addr_v6': '::/0', 'mgmt_addr': '0.0.0.0/0', 'hwsku': 'multi-npu-asic', 'type': 'Asic'}, - 'ASIC0': {'lo_addr': '0.0.0.0/0', 'lo_addr_v6': '::/0', 'mgmt_addr': '0.0.0.0/0', 'hwsku': 'multi-npu-asic', 'type': 'Asic'}}) + {'ASIC1': {'lo_addr_v6': '::/0', 'mgmt_addr': '0.0.0.0/0', 'hwsku': 'multi-npu-asic', 'lo_addr': '0.0.0.0/0', 'type': 'Asic', 'mgmt_addr_v6': '::/0'}, + 'ASIC0': {'lo_addr_v6': '::/0', 'mgmt_addr': '0.0.0.0/0', 'hwsku': 'multi-npu-asic', 'lo_addr': '0.0.0.0/0', 'type': 'Asic', 'mgmt_addr_v6': '::/0'}}) def test_frontend_bgp_neighbor(self): argument = "-m {} -p {} -n asic0 --var-json \"BGP_NEIGHBOR\"".format(self.sample_graph, self.port_config[0]) diff --git a/src/sonic-yang-models/setup.py b/src/sonic-yang-models/setup.py index 4b68369d011f..3a42dfccf302 100644 --- a/src/sonic-yang-models/setup.py +++ b/src/sonic-yang-models/setup.py @@ -103,6 +103,7 @@ def run(self): './yang-models/sonic-default-lossless-buffer-parameter.yang', './yang-models/sonic-device_metadata.yang', './yang-models/sonic-device_neighbor.yang', + './yang-models/sonic-device_neighbor_metadata.yang', './yang-models/sonic-dhcpv6-relay.yang', './yang-models/sonic-extension.yang', './yang-models/sonic-flex_counter.yang', @@ -170,6 +171,7 @@ def run(self): './cvlyang-models/sonic-crm.yang', './cvlyang-models/sonic-device_metadata.yang', './cvlyang-models/sonic-device_neighbor.yang', + './cvlyang-models/sonic-device_neighbor_metadata.yang', './cvlyang-models/sonic-extension.yang', './cvlyang-models/sonic-flex_counter.yang', './cvlyang-models/sonic-feature.yang', diff --git a/src/sonic-yang-models/tests/files/sample_config_db.json b/src/sonic-yang-models/tests/files/sample_config_db.json index a292b8e9193d..b0d78bd16624 100644 --- a/src/sonic-yang-models/tests/files/sample_config_db.json +++ b/src/sonic-yang-models/tests/files/sample_config_db.json @@ -372,6 +372,26 @@ "port": "Eth18" } }, + "DEVICE_NEIGHBOR_METADATA": { + "dccsw01.nw": { + "lo_addr": "0.0.0.0/0", + "mgmt_addr": "10.184.228.211/32", + "hwsku": "Arista", + "type": "LeafRouter", + "deployment_id": "1" + }, + "dccsw02.nw": { + "mgmt_addr_v6": "2a04:5555:40:a709::2/128", + "hwsku": "Arista", + "type": "LeafRouter", + "deployment_id": "1" + }, + "dccsw03.nw": { + "hwsku": "Arista", + "type": "LeafRouter", + "deployment_id": "1" + } + }, "MGMT_PORT": { "eth0": { "alias": "eth0", diff --git a/src/sonic-yang-models/tests/yang_model_tests/tests/device_neighbor_metadata.json b/src/sonic-yang-models/tests/yang_model_tests/tests/device_neighbor_metadata.json new file mode 100644 index 000000000000..2943a53d1b91 --- /dev/null +++ b/src/sonic-yang-models/tests/yang_model_tests/tests/device_neighbor_metadata.json @@ -0,0 +1,15 @@ +{ + "DEVICE_NEIGHBOR_METADATA_TABLE": { + "desc": "DEVICE_NEIGHBOR_METADATA_TABLE config pattern." + }, + "DEVICE_NEIGHBOR_METADATA_TYPE_INCORRECT_PATTERN": { + "desc": "DEVICE_NEIGHBOR_METADATA_TYPE_INCORRECT_PATTERN pattern failure.", + "eStrKey" : "Pattern" + }, + "DEVICE_NEIGHBOR_METADATA_TYPE_CORRECT_PATTERN": { + "desc": "DEVICE_NEIGHBOR_METADATA correct value for Type field" + }, + "DEVICE_NEIGHBOR_METADATA_TYPE_NOT_PROVISIONED_PATTERN": { + "desc": "DEVICE_NEIGHBOR_METADATA value as not-provisioned for Type field" + } +} \ No newline at end of file diff --git a/src/sonic-yang-models/tests/yang_model_tests/tests_config/device_neighbor_metadata.json b/src/sonic-yang-models/tests/yang_model_tests/tests_config/device_neighbor_metadata.json new file mode 100644 index 000000000000..ecc0c35d2208 --- /dev/null +++ b/src/sonic-yang-models/tests/yang_model_tests/tests_config/device_neighbor_metadata.json @@ -0,0 +1,107 @@ +{ + "DEVICE_NEIGHBOR_METADATA_TYPE_INCORRECT_PATTERN": { + "sonic-device_neighbor_metadata:sonic-device_neighbor_metadata": { + "sonic-device_neighbor_metadata:DEVICE_NEIGHBOR_METADATA": { + "DEVICE_NEIGHBOR_METADATA_LIST": [ + { + "name": "Ethernet116", + "hwsku": "Arista", + "type": "ToRrouter" + } + ] + } + } + }, + "DEVICE_NEIGHBOR_METADATA_TYPE_CORRECT_PATTERN": { + "sonic-device_neighbor_metadata:sonic-device_neighbor_metadata": { + "sonic-device_neighbor_metadata:DEVICE_NEIGHBOR_METADATA": { + "DEVICE_NEIGHBOR_METADATA_LIST": [ + { + "name": "Ethernet116", + "hwsku": "Arista", + "type": "BackEndToRRouter" + } + ] + } + } + }, + "DEVICE_NEIGHBOR_METADATA_TYPE_NOT_PROVISIONED_PATTERN": { + "sonic-device_neighbor_metadata:sonic-device_neighbor_metadata": { + "sonic-device_neighbor_metadata:DEVICE_NEIGHBOR_METADATA": { + "DEVICE_NEIGHBOR_METADATA_LIST": [ + { + "name": "Ethernet116", + "hwsku": "Arista", + "type": "not-provisioned" + } + ] + } + } + }, + "DEVICE_NEIGHBOR_METADATA_TABLE": { + "sonic-device_neighbor_metadata:sonic-device_neighbor_metadata": { + "sonic-device_neighbor_metadata:DEVICE_NEIGHBOR_METADATA": { + "DEVICE_NEIGHBOR_METADATA_LIST": [ + { + "lo_addr": "25.77.193.11/32", + "mgmt_addr": "0.0.0.0/0", + "name": "dccsw01.nw", + "hwsku": "Arista", + "type": "ToRRouter", + "deployment_id": "1" + }, + { + "lo_addr": "0.0.0.0/0", + "mgmt_addr": "10.11.150.46/26", + "name": "dccsw02.nw", + "hwsku": "Arista", + "type": "LeafRouter", + "deployment_id": "1" + }, + { + "lo_addr_v6": "2a04:5555:40:a709::2/126", + "mgmt_addr": "10.11.150.47/26", + "name": "dccsw03.nw", + "hwsku": "Arista", + "type": "SpineRouter", + "deployment_id": "1" + }, + { + "name": "dccsw04.nw", + "mgmt_addr_v6": "2a04:5555:40:a708::2/126", + "hwsku": "Arista", + "type": "LeafRouter", + "deployment_id": "1" + }, + { + "name": "dccsw05.nw", + "hwsku": "Arista", + "type": "LeafRouter", + "deployment_id": "1" + }, + { + "lo_addr_v6": "2a04:5555:40:a710::2/126", + "name": "dccsw06.nw", + "hwsku": "Arista", + "type": "LeafRouter", + "deployment_id": "1" + }, + { + "lo_addr": "25.77.193.11/32", + "name": "dccsw07.nw", + "hwsku": "Arista", + "type": "LeafRouter", + "deployment_id": "1" + }, + { + "mgmt_addr": "10.11.150.48/26", + "name": "dccsw08.nw", + "hwsku": "Arista", + "type": "LeafRouter", + "deployment_id": "1" + } + ] + } + } + } +} diff --git a/src/sonic-yang-models/yang-models/sonic-device_neighbor_metadata.yang b/src/sonic-yang-models/yang-models/sonic-device_neighbor_metadata.yang new file mode 100644 index 000000000000..76526f801c92 --- /dev/null +++ b/src/sonic-yang-models/yang-models/sonic-device_neighbor_metadata.yang @@ -0,0 +1,100 @@ +module sonic-device_neighbor_metadata { + + yang-version 1.1; + + namespace "http://github.com/Azure/sonic-device_neighbor_metadata"; + prefix device_neighbor_metadata; + + import ietf-yang-types { + prefix yang; + } + + import ietf-inet-types { + prefix inet; + } + + import sonic-types { + prefix stypes; + } + + description "DEVICE_NEIGHBOR_METADATA YANG Module for SONiC OS"; + + revision 2022-08-25 { + description "First Revision"; + } + + container sonic-device_neighbor_metadata { + + container DEVICE_NEIGHBOR_METADATA { + + description "DEVICE_NEIGHBOR_METADATA part of config_db.json"; + + list DEVICE_NEIGHBOR_METADATA_LIST { + + key "name"; + + leaf name { + description "Host name string, max length 255"; + type string { + length 1..255; + } + } + + leaf hwsku { + type stypes:hwsku; + } + + leaf lo_addr { + description "Device loopback ipv4 address, type of ietf-inet + ipv4-prefix or ipv4-address"; + type union { + type inet:ipv4-prefix; + type inet:ipv4-address; + } + } + + leaf lo_addr_v6 { + description "Device loopback ipv6 address, type of ietf-inet + ipv6-prefix or ipv6-address"; + type union { + type inet:ipv6-prefix; + type inet:ipv6-address; + } + } + + leaf mgmt_addr { + description "Device management ipv4 address, type of ietf-inet + ipv4-prefix or ipv4-address"; + type union { + type inet:ipv4-prefix; + type inet:ipv4-address; + } + } + + leaf mgmt_addr_v6 { + description "Device management ipv6 address, type of ietf-inet + ipv6-prefix or ipv6-address"; + type union { + type inet:ipv6-prefix; + type inet:ipv6-address; + } + } + + leaf type { + description "Network element type"; + type string { + pattern "ToRRouter|LeafRouter|SpineChassisFrontendRouter|ChassisBackendRouter|ASIC|Asic|Supervior|MgmtToRRouter|SpineRouter|BackEndToRRouter|BackEndLeafRouter|EPMS|MgmtTsToR|BmcMgmtToRRouter|Server|MiniPower|SmartCable|Ixia|not-provisioned"; + } + } + + leaf deployment_id { + type uint32; + } + } + /* end of list DEVICE_NEIGHBOR_METADATA_LIST */ + } + /* end of container DEVICE_NEIGHBOR_METADATA */ + } + /* end of container sonic-device_neighbor_metadata */ +} +/* end of module sonic-device_neighbor_metadata */ From 4ee822448860180ad557b77b5b64cdcb94c9669f Mon Sep 17 00:00:00 2001 From: mssonicbld <79238446+mssonicbld@users.noreply.github.com> Date: Tue, 16 May 2023 01:02:02 +0800 Subject: [PATCH 083/193] [Build] update python package docker in host image to 6.1.1 (#14993) (#15050) Fix #14974 Refs: https://github.com/docker/docker-py/pull/3116 Co-authored-by: Konstantin Vasin <126960927+k-v1@users.noreply.github.com> --- build_debian.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build_debian.sh b/build_debian.sh index 19bce0ff43b5..6b15ee345124 100755 --- a/build_debian.sh +++ b/build_debian.sh @@ -507,7 +507,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==5.0.3' +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' From f6d8d908abcf48129c5418e6d5f776fc800b898c Mon Sep 17 00:00:00 2001 From: xumia <59720581+xumia@users.noreply.github.com> Date: Fri, 5 May 2023 12:40:35 +0800 Subject: [PATCH 084/193] [Ci] Support marvell/marvell-arm64 build (#14875) Why I did it Support marvell/marvell-arm64 build Work item tracking Microsoft ADO (number only): 19995559 How I did it --- .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 824a654c2477..f8767bd5b9d3 100644 --- a/.azure-pipelines/azure-pipelines-build.yml +++ b/.azure-pipelines/azure-pipelines-build.yml @@ -86,6 +86,15 @@ jobs: variables: PLATFORM_ARCH: armhf + - name: marvell-arm64 + ${{ if not(parameters.qemuOrCrossBuild) }}: + pool: sonicbld-arm64 + timeoutInMinutes: 2880 + variables: + PLATFORM_ARCH: arm64 + + - name: marvell + - name: mellanox variables: dbg_image: yes From 4507026435706ffeaba153d8052fcddf4e0a8a58 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Ollivier?= Date: Fri, 25 Nov 2022 05:37:13 +0100 Subject: [PATCH 085/193] [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 --- 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 0537a48d1f529af78db3a197457d46d553bc36be Mon Sep 17 00:00:00 2001 From: Hua Liu <58683130+liuh-80@users.noreply.github.com> Date: Mon, 24 Apr 2023 13:31:59 +0800 Subject: [PATCH 086/193] Fix per-command authorization failed issue when a command with wildcard match more than hundred files. (#14787) Fix per-command authorization failed issue when a command with wildcard match more than hundred files. #### Why I did it When user enable TACACS per-command authorization, and run a command with wildcard , if the command match more than hundreds of files, the per-command authorization will failed with following message: *** authorize failed by TACACS+ with given arguments, not executing The root cause of this issue is because bash will match files with wildcard and replace with wildcard args with matched files. when there are too many files, TACACS plugin will generate a big authorization request, which will be reject by server side. ##### Work item tracking - Microsoft ADO **(number only)**: 18074861 #### How I did it Fix bash patch file, use original user inputs as authorization parameters. #### How to verify it Pass all UT. Create new UT to validate the TACACS authorization request are using original command arguments. UT PR: https://github.com/sonic-net/sonic-mgmt/pull/8115 #### Which release branch to backport (provide reason below if selected) - [ ] 201811 - [ ] 201911 - [ ] 202006 - [ ] 202012 - [ ] 202106 - [ ] 202111 - [X] 202205 - [X] 202211 #### Tested branch (Please provide the tested image version) - [x] 202205.258490-412b83d0f - [x] 202211.71966120-1b971c54b5 #### Description for the changelog Fix per-command authorization failed issue when a command with wildcard match more than hundred files. --- .../0001-Add-plugin-support-to-bash.patch | 93 +++++++++++++++++-- 1 file changed, 84 insertions(+), 9 deletions(-) diff --git a/src/bash/patches/0001-Add-plugin-support-to-bash.patch b/src/bash/patches/0001-Add-plugin-support-to-bash.patch index bec53ba8b5df..4b0813404767 100644 --- a/src/bash/patches/0001-Add-plugin-support-to-bash.patch +++ b/src/bash/patches/0001-Add-plugin-support-to-bash.patch @@ -1,4 +1,4 @@ -From 79b3c4f7e8589afae4b048d662a56b055436e9ab Mon Sep 17 00:00:00 2001 +From c5687a2a9a9fd5ca4d5184002070b6961037395e Mon Sep 17 00:00:00 2001 From: liuh-80 <58683130+liuh-80@users.noreply.github.com> Date: Fri, 8 Oct 2021 16:36:34 +0800 Subject: [PATCH] Add plugin support to bash. @@ -8,11 +8,11 @@ Subject: [PATCH] Add plugin support to bash. bash-5.1/config.h.in | 3 + bash-5.1/configure | 18 +- bash-5.1/configure.ac | 10 + - bash-5.1/execute_cmd.c | 16 ++ + bash-5.1/execute_cmd.c | 35 +++- bash-5.1/plugin.c | 428 +++++++++++++++++++++++++++++++++++++++++ bash-5.1/plugin.h | 79 ++++++++ bash-5.1/shell.c | 12 ++ - 8 files changed, 571 insertions(+), 9 deletions(-) + 8 files changed, 583 insertions(+), 16 deletions(-) create mode 100644 bash-5.1/plugin.c create mode 100644 bash-5.1/plugin.h @@ -211,7 +211,7 @@ index 2fe3e7d..0064683 100644 AC_DEFINE(ALIAS) fi diff --git a/bash-5.1/execute_cmd.c b/bash-5.1/execute_cmd.c -index d2a0dd7..fb05489 100644 +index d2a0dd7..e74d0f3 100644 --- a/bash-5.1/execute_cmd.c +++ b/bash-5.1/execute_cmd.c @@ -82,6 +82,10 @@ extern int errno; @@ -225,14 +225,89 @@ index d2a0dd7..fb05489 100644 #include "builtins/common.h" #include "builtins/builtext.h" /* list of builtins */ -@@ -5592,6 +5596,18 @@ execute_disk_command (words, redirects, command_line, pipe_in, pipe_out, +@@ -171,13 +175,13 @@ static int execute_function PARAMS((SHELL_VAR *, WORD_LIST *, int, struct fd_bit + static int execute_builtin_or_function PARAMS((WORD_LIST *, sh_builtin_func_t *, + SHELL_VAR *, + REDIRECT *, struct fd_bitmap *, int)); +-static void execute_subshell_builtin_or_function PARAMS((WORD_LIST *, REDIRECT *, ++static void execute_subshell_builtin_or_function PARAMS((WORD_LIST *, WORD_LIST *, REDIRECT *, + sh_builtin_func_t *, + SHELL_VAR *, + int, int, int, + struct fd_bitmap *, + int)); +-static int execute_disk_command PARAMS((WORD_LIST *, REDIRECT *, char *, ++static int execute_disk_command PARAMS((WORD_LIST *, WORD_LIST *, REDIRECT *, char *, + int, int, int, struct fd_bitmap *, int)); + + static char *getinterp PARAMS((char *, int, int *)); +@@ -4587,7 +4591,7 @@ run_builtin: + if (async == 0) + subshell_level++; + execute_subshell_builtin_or_function +- (words, simple_command->redirects, builtin, func, ++ (words, simple_command->words, simple_command->redirects, builtin, func, + pipe_in, pipe_out, async, fds_to_close, + cmdflags); + subshell_level--; +@@ -4665,7 +4669,7 @@ execute_from_filesystem: + if (already_forked == 0 && (cmdflags & CMD_NO_FORK) && fifos_pending() > 0) + cmdflags &= ~CMD_NO_FORK; + #endif +- result = execute_disk_command (words, simple_command->redirects, command_line, ++ result = execute_disk_command (words, simple_command->words, simple_command->redirects, command_line, + pipe_in, pipe_out, async, fds_to_close, + cmdflags); + +@@ -5169,10 +5173,11 @@ execute_shell_function (var, words) + to the command, REDIRECTS specifies redirections to perform before the + command is executed. */ + static void +-execute_subshell_builtin_or_function (words, redirects, builtin, var, ++execute_subshell_builtin_or_function (words, original_words, redirects, builtin, var, + pipe_in, pipe_out, async, fds_to_close, + flags) + WORD_LIST *words; ++ WORD_LIST *original_words; + REDIRECT *redirects; + sh_builtin_func_t *builtin; + SHELL_VAR *var; +@@ -5258,7 +5263,7 @@ execute_subshell_builtin_or_function (words, redirects, builtin, var, + char *command_line; + + command_line = savestring (the_printed_command_except_trap ? the_printed_command_except_trap : ""); +- r = execute_disk_command (words, (REDIRECT *)0, command_line, ++ r = execute_disk_command (words, original_words, (REDIRECT *)0, command_line, + -1, -1, async, (struct fd_bitmap *)0, flags|CMD_NO_FORK); + } + subshell_exit (r); +@@ -5439,9 +5444,10 @@ setup_async_signals () + #endif + + static int +-execute_disk_command (words, redirects, command_line, pipe_in, pipe_out, ++execute_disk_command (words, original_words, redirects, command_line, pipe_in, pipe_out, + async, fds_to_close, cmdflags) + WORD_LIST *words; ++ WORD_LIST *original_words; + REDIRECT *redirects; + char *command_line; + int pipe_in, pipe_out, async; +@@ -5588,10 +5594,25 @@ execute_disk_command (words, redirects, command_line, pipe_in, pipe_out, + exit (execute_shell_function (hookf, wl)); + } + ++#if defined (BASH_SHELL_EXECVE_PLUGIN) ++ /*get original user input args for plugin*/ ++ char **original_args = strvec_from_word_list (original_words, 0, 0, (int *)NULL); ++ result = invoke_plugin_on_shell_execve (current_user.user_name, command, original_args); ++ xfree(original_args); ++ + /* Execve expects the command name to be in args[0]. So we leave it there, in the same format that the user used to type it in. */ args = strvec_from_word_list (words, 0, 0, (int *)NULL); + -+#if defined (BASH_SHELL_EXECVE_PLUGIN) -+ result = invoke_plugin_on_shell_execve (current_user.user_name, command, args); -+ +#if defined (DEBUG) + itrace("invoke_plugin_on_shell_execve: failed invoke plugin with user:%s, command:%s, result: %d", current_user.user_name, command, result); +#endif @@ -801,5 +876,5 @@ index ce8087f..6928208 100644 static int -- -2.17.1.windows.2 +2.40.0.windows.1 From cd671aca86a2342ec1ae4c5b8d66a5498b4de7be Mon Sep 17 00:00:00 2001 From: Zhijian Li Date: Thu, 27 Apr 2023 07:07:38 +0800 Subject: [PATCH 087/193] [minigraph-parser] Support ACL interface type BmcData in minigraph parser (#14703) * Support ACL interface type BmcData in minigraph parser * Support ACL interface type BmcData in minigraph parser * add unittest * Add a global dict for storing the defination of custom acl tables --- src/sonic-config-engine/minigraph.py | 40 +- ...ple-sample-graph-case-acl-type-bmcdata.xml | 795 ++++++++++++++++++ .../tests/test_minigraph_case.py | 37 + 3 files changed, 868 insertions(+), 4 deletions(-) create mode 100644 src/sonic-config-engine/tests/simple-sample-graph-case-acl-type-bmcdata.xml diff --git a/src/sonic-config-engine/minigraph.py b/src/sonic-config-engine/minigraph.py index 80127a5e175c..a530a99bef46 100644 --- a/src/sonic-config-engine/minigraph.py +++ b/src/sonic-config-engine/minigraph.py @@ -50,6 +50,20 @@ # Default Virtual Network Index (VNI) vni_default = 8000 +# Defination of custom acl table types +acl_table_type_defination = { + 'BMCDATA': { + "ACTIONS": "PACKET_ACTION,COUNTER", + "BIND_POINTS": "PORT", + "MATCHES": "SRC_IP,DST_IP,ETHER_TYPE,IP_TYPE,IP_PROTOCOL,IN_PORTS,TCP_FLAGS", + }, + 'BMCDATAV6': { + "ACTIONS": "PACKET_ACTION,COUNTER", + "BIND_POINTS": "PORT", + "MATCHES": "SRC_IPV6,DST_IPV6,ETHER_TYPE,IP_TYPE,IP_PROTOCOL,IN_PORTS,TCP_FLAGS", + } +} + ############################################################################### # # Minigraph parsing functions @@ -645,6 +659,7 @@ def parse_dpg(dpg, hname): vlan_member_list[sonic_vlan_name] = vmbr_list acls = {} + acl_table_types = {} for aclintf in aclintfs.findall(str(QName(ns, "AclInterface"))): if aclintf.find(str(QName(ns, "InAcl"))) is not None: aclname = aclintf.find(str(QName(ns, "InAcl"))).text.upper().replace(" ", "_").replace("-", "_") @@ -656,6 +671,8 @@ def parse_dpg(dpg, hname): sys.exit("Error: 'AclInterface' must contain either an 'InAcl' or 'OutAcl' subelement.") aclattach = aclintf.find(str(QName(ns, "AttachTo"))).text.split(';') acl_intfs = [] + is_bmc_data = False + is_bmc_data_v6 = False is_mirror = False is_mirror_v6 = False is_mirror_dscp = False @@ -738,6 +755,13 @@ 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 aclintf.find(str(QName(ns, "Type"))) is not None and aclintf.find(str(QName(ns, "Type"))).text.upper() == "BMCDATA": + if 'v6' in aclname.lower(): + is_bmc_data_v6 = True + acl_table_types['BMCDATAV6'] = acl_table_type_defination['BMCDATAV6'] + else: + is_bmc_data = True + acl_table_types['BMCDATA'] = acl_table_type_defination['BMCDATA'] # 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 @@ -758,6 +782,10 @@ def parse_dpg(dpg, hname): acls[aclname]['type'] = 'MIRRORV6' elif is_mirror_dscp: acls[aclname]['type'] = 'MIRROR_DSCP' + elif is_bmc_data: + acls[aclname]['type'] = 'BMCDATA' + elif is_bmc_data_v6: + acls[aclname]['type'] = 'BMCDATAV6' else: acls[aclname]['type'] = 'L3V6' if 'v6' in aclname.lower() else 'L3' else: @@ -816,8 +844,8 @@ def parse_dpg(dpg, hname): 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, voq_inband_intfs, vlans, vlan_members, dhcp_relay_table, pcs, pc_members, acls, vni, tunnelintfs, dpg_ecmp_content, static_routes, tunnelintfs_qos_remap_config - return None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None + return intfs, lo_intfs, mvrf, mgmt_intf, voq_inband_intfs, vlans, vlan_members, dhcp_relay_table, pcs, pc_members, acls, acl_table_types, vni, tunnelintfs, dpg_ecmp_content, static_routes, tunnelintfs_qos_remap_config + return None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None def parse_host_loopback(dpg, hname): @@ -1374,6 +1402,8 @@ def parse_xml(filename, platform=None, port_config_file=None, asic_name=None, hw u_neighbors = None u_devices = None + acls = {} + acl_table_types = {} hwsku = None bgp_sessions = None bgp_monitors = [] @@ -1454,7 +1484,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, voq_inband_intfs, vlans, vlan_members, dhcp_relay_table, pcs, pc_members, acls, vni, tunnel_intfs, dpg_ecmp_content, static_routes, tunnel_intfs_qos_remap_config) = parse_dpg(child, hostname) + (intfs, lo_intfs, mvrf, mgmt_intf, voq_inband_intfs, vlans, vlan_members, dhcp_relay_table, pcs, pc_members, acls, acl_table_types, vni, tunnel_intfs, dpg_ecmp_content, static_routes, tunnel_intfs_qos_remap_config) = parse_dpg(child, hostname) elif child.tag == str(QName(ns, "CpgDec")): (bgp_sessions, bgp_internal_sessions, bgp_voq_chassis_sessions, bgp_asn, bgp_peers_with_range, bgp_monitors) = parse_cpg(child, hostname) elif child.tag == str(QName(ns, "PngDec")): @@ -1469,7 +1499,7 @@ def parse_xml(filename, platform=None, port_config_file=None, asic_name=None, hw (port_speeds_default, port_descriptions, sys_ports) = parse_deviceinfo(child, hwsku) else: if child.tag == str(QName(ns, "DpgDec")): - (intfs, lo_intfs, mvrf, mgmt_intf, voq_inband_intfs, vlans, vlan_members, dhcp_relay_table, pcs, pc_members, acls, vni, tunnel_intfs, dpg_ecmp_content, static_routes, tunnel_intfs_qos_remap_config) = parse_dpg(child, asic_name) + (intfs, lo_intfs, mvrf, mgmt_intf, voq_inband_intfs, vlans, vlan_members, dhcp_relay_table, pcs, pc_members, acls, acl_table_types, vni, tunnel_intfs, dpg_ecmp_content, static_routes, 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_voq_chassis_sessions, bgp_asn, bgp_peers_with_range, bgp_monitors) = parse_cpg(child, asic_name, local_devices) @@ -1897,6 +1927,8 @@ 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) + if len(acl_table_types) > 0: + results['ACL_TABLE_TYPE'] = acl_table_types results['ACL_TABLE'] = filter_acl_table_bindings(acls, neighbors, pcs, pc_members, sub_role, current_device['type'], is_storage_device, vlan_members) results['FEATURE'] = { 'telemetry': { diff --git a/src/sonic-config-engine/tests/simple-sample-graph-case-acl-type-bmcdata.xml b/src/sonic-config-engine/tests/simple-sample-graph-case-acl-type-bmcdata.xml new file mode 100644 index 000000000000..6c29fb47e42f --- /dev/null +++ b/src/sonic-config-engine/tests/simple-sample-graph-case-acl-type-bmcdata.xml @@ -0,0 +1,795 @@ + + + + + + switch-t0 + 10.1.0.32 + BGPMonitor + 10.20.30.40 + 30 + 10 + 3 + + + false + switch-t0 + 10.0.0.56 + ARISTA01T1 + 10.0.0.57 + 1 + 180 + 60 + + + switch-t0 + FC00::71 + ARISTA01T1 + FC00::72 + 1 + 180 + 60 + + + false + switch-t0 + 10.0.0.58 + ARISTA02T1 + 10.0.0.59 + 1 + 180 + 60 + + + switch-t0 + FC00::75 + ARISTA02T1 + FC00::76 + 1 + 180 + 60 + + + switch-t0 + FC00::75 + ARISTA02T1 + FC00::76 + 1 + 180 + 60 + + + false + switch-t0 + 10.2.0.20 + CHASSIS_PEER + 10.2.0.21 + 1 + 180 + 60 + voq + + + + + 1 + + BGPMonitor + + + BGPPeer +
10.1.0.32
+ + + + + + + + + 65100 + switch-t0 + + +
10.0.0.57
+ + + + + +
10.0.0.59
+ + + + + +
10.2.0.21
+ + + + + + + + + 64600 + ARISTA01T1 + + + + 64600 + ARISTA02T1 + + + + 64600 + ARISTA03T1 + + + + 64600 + ARISTA04T1 + + + + 65100 + CHASSIS_PEER + + + + + + + + + + HostIP + Loopback0 + + 10.1.0.32/32 + + 10.1.0.32/32 + + + HostIP1 + Loopback0 + + FC00:1::32/128 + + FC00:1::32/128 + + + + + HostIP + eth0 + + 10.0.0.100/24 + + 10.0.0.100/24 + + + + + + + switch-t0 + + + PortChannel1 + fortyGigE0/4 + + + + + + ab1 + fortyGigE0/8 + 192.0.0.1;192.0.0.2 + 1000 + 1000 + 192.168.0.0/27 + + + ab4 + fortyGigE0/8 + 192.0.0.1;192.0.0.2 + 1001 + 1001 + 192.168.0.32/27 + + + kk1 + fortyGigE0/12 + 192.0.0.1;192.0.0.2 + 2020 + 2020 + Tagged + 192.168.0.0/28 + + + ab2 + fortyGigE0/12 + 192.0.0.1;192.0.0.2 + 2000 + 2000 + Tagged + 192.168.0.240/27 + + + ab3 + fortyGigE0/12 + 192.0.0.1;192.0.0.2 + 2001 + 2001 + 192.168.0.240/27 + + + + + + PortChannel1 + 10.0.0.56/31 + + + + PortChannel1 + FC00::71/126 + + + + PortChannel1001 + 10.0.0.57/31 + + + + PortChannel1001 + FC00::72/126 + + + + fortyGigE0/0 + 10.0.0.58/31 + + + + fortyGigE0/0 + FC00::75/126 + + + + ab1 + 192.168.0.1/27 + + + + + + PortChannel1 + DataAcl + DataPlane + + + SNMP + SNMP_ACL + SNMP + + + Ethernet0;Ethernet1 + BMC_ACL_NORTHBOUND + BmcData + + + Ethernet0;Ethernet1 + BMC_ACL_NORTHBOUND_V6 + BmcData + + + + + + + + + + DeviceInterfaceLink + 1000 + ARISTA01T1 + et1 + true + switch-t0 + fortyGigE0/8 + true + + + DeviceMgmtLink + 1000 + switch-t0 + fortyGigE0/16 + true + ChassisMTS1 + mgmt0 + true + + + DeviceMgmtLink + 1000 + switch-t0 + Management1 + switch-m0 + Management1 + true + + + + + switch-t0 + Force10-S6000 + AAA00PrdStr00 + + + ARISTA01T1 + Arista + + + ARISTA02T1 + Arista + + + ARISTA03T1 + Arista + + + ARISTA04T1 + Arista + + + + + + + + DeviceInterface + + true + 1 + fortyGigE0/0 + + false + 0 + 0 + 10000 + + + DeviceInterface + + true + 1 + Ethernet1 + + false + 0 + 0 + 10000 + + + DeviceInterface + + true + 1 + Ethernet2 + + false + 0 + 0 + 10000 + + + DeviceInterface + + true + 1 + fortyGigE0/4 + + false + 0 + 0 + 25000 + + + DeviceInterface + + true + 1 + fortyGigE0/8 + + false + 0 + 0 + 40000 + Interface description + + + DeviceInterface + + true + 1 + fortyGigE0/12 + + false + 0 + 0 + 100000 + Interface description + + + DeviceInterface + + true + 1 + fortyGigE0/16 + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + 1 + fortyGigE0/20 + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + 1 + fortyGigE0/24 + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + 1 + fortyGigE0/28 + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + 1 + fortyGigE0/32 + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + 1 + fortyGigE0/36 + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + 1 + fortyGigE0/40 + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + 1 + fortyGigE0/44 + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + 1 + fortyGigE0/48 + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + 1 + fortyGigE0/52 + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + 1 + fortyGigE0/56 + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + 1 + fortyGigE0/60 + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + 1 + fortyGigE0/64 + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + 1 + fortyGigE0/68 + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + 1 + fortyGigE0/72 + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + 1 + fortyGigE0/76 + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + 1 + fortyGigE0/80 + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + 1 + fortyGigE0/84 + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + 1 + fortyGigE0/88 + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + 1 + fortyGigE0/92 + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + 1 + fortyGigE0/96 + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + 1 + fortyGigE0/100 + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + 1 + fortyGigE0/104 + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + 1 + fortyGigE0/108 + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + 1 + fortyGigE0/112 + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + 1 + fortyGigE0/116 + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + 1 + fortyGigE0/120 + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + 1 + fortyGigE0/124 + + false + 0 + 0 + 100000 + + + true + 0 + Force10-S6000 + + + DeviceInterface + + 1 + Management1 + false + mgmt1 + 1000 + + + + + + + + switch-t0 + + + DeploymentId + + 1 + + + + + + + switch-t0 + Force10-S6000 + diff --git a/src/sonic-config-engine/tests/test_minigraph_case.py b/src/sonic-config-engine/tests/test_minigraph_case.py index 9c1a40992d9a..d265be199c19 100644 --- a/src/sonic-config-engine/tests/test_minigraph_case.py +++ b/src/sonic-config-engine/tests/test_minigraph_case.py @@ -491,6 +491,43 @@ def test_minigraph_acl_attach_to_ports(self): expected_dataacl_ports = ['Ethernet0'] self.assertEqual(sorted(result['ACL_TABLE']['DATAACL_MIXED_NAME_ALIAS_3']['ports']), sorted(expected_dataacl_ports)) + def test_minigraph_acl_type_bmcdata(self): + expected_acl_type_bmcdata = { + "ACTIONS": "PACKET_ACTION,COUNTER", + "BIND_POINTS": "PORT", + "MATCHES": "SRC_IP,DST_IP,ETHER_TYPE,IP_TYPE,IP_PROTOCOL,IN_PORTS,TCP_FLAGS", + } + expected_acl_type_bmcdatav6 = { + "ACTIONS": "PACKET_ACTION,COUNTER", + "BIND_POINTS": "PORT", + "MATCHES": "SRC_IPV6,DST_IPV6,ETHER_TYPE,IP_TYPE,IP_PROTOCOL,IN_PORTS,TCP_FLAGS", + } + expected_acl_table_bmc_acl_northbound = { + 'policy_desc': 'BMC_ACL_NORTHBOUND', + 'ports': ['Ethernet0', 'Ethernet1'], + 'stage': 'ingress', + 'type': 'BMCDATA', + } + expected_acl_table_bmc_acl_northbound_v6 = { + 'policy_desc': 'BMC_ACL_NORTHBOUND_V6', + 'ports': ['Ethernet0', 'Ethernet1'], + 'stage': 'ingress', + 'type': 'BMCDATAV6', + } + # TC1: Minigraph contains acl table type BmcData + sample_graph = os.path.join(self.test_dir,'simple-sample-graph-case-acl-type-bmcdata.xml') + result = minigraph.parse_xml(sample_graph) + self.assertIn('ACL_TABLE_TYPE', result) + self.assertIn('BMCDATA', result['ACL_TABLE_TYPE']) + self.assertIn('BMCDATAV6', result['ACL_TABLE_TYPE']) + self.assertDictEqual(result['ACL_TABLE_TYPE']['BMCDATA'], expected_acl_type_bmcdata) + self.assertDictEqual(result['ACL_TABLE_TYPE']['BMCDATAV6'], expected_acl_type_bmcdatav6) + self.assertDictEqual(result['ACL_TABLE']['BMC_ACL_NORTHBOUND'], expected_acl_table_bmc_acl_northbound) + self.assertDictEqual(result['ACL_TABLE']['BMC_ACL_NORTHBOUND_V6'], expected_acl_table_bmc_acl_northbound_v6) + # TC2: Minigraph doesn't contain acl table type BmcData + result = minigraph.parse_xml(self.sample_graph) + self.assertNotIn('ACL_TABLE_TYPE', result) + 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) From d04b81cd9c7f25b9d173b0ea424ef3f50edefd9a Mon Sep 17 00:00:00 2001 From: Rajkumar-Marvell <54936542+rajkumar38@users.noreply.github.com> Date: Wed, 17 May 2023 04:32:41 +0530 Subject: [PATCH 088/193] [Marvell] Update armhf sai debian (#15043) 1. SONIC 20220531.25 OC Failure: Everflow testcases failing due to SAI orchagent crash 2. SONIC 20220531.25 OC Failure: ACL IPv6 testcases. 3. TPID support Signed-off-by: rajkumar38 --- 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 1577a625c185..d7179e3f0ff1 100644 --- a/platform/marvell-armhf/sai.mk +++ b/platform/marvell-armhf/sai.mk @@ -1,6 +1,6 @@ # Marvell SAI -export MRVL_SAI_VERSION = 1.10.2-3 +export MRVL_SAI_VERSION = 1.10.2-4 export MRVL_SAI = mrvllibsai_$(MRVL_SAI_VERSION)_$(PLATFORM_ARCH).deb $(MRVL_SAI)_SRC_PATH = $(PLATFORM_PATH)/sai From 1b503a1ebed7436e776738d24acc818d95fdb702 Mon Sep 17 00:00:00 2001 From: James An <94036556+jamesan47@users.noreply.github.com> Date: Tue, 16 May 2023 20:34:42 -0700 Subject: [PATCH 089/193] Update cisco-8000.ini (#15078) --- 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 190fc372457d..08ced69bd2c2 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=202205.2.2.2 +ref=202205.2.2.3 From d99999de732ff91d2fc9fd988497dd948552c54a Mon Sep 17 00:00:00 2001 From: "Marty Y. Lok" <76118573+mlok-nokia@users.noreply.github.com> Date: Thu, 27 Apr 2023 11:52:22 -0400 Subject: [PATCH 090/193] [Nokia7250][sonic-platform] Update sonic-platform submodule for Nokia-7150IXRE platform (#14548) Why I did it Update sonic-platform submodule for Nokia-7250IXRE Platform. This requires the new NDK 22.9.8 and above How I did it Update submodule sonic-platform for Nokia-7250IXRE platform. c9f316e Disparate process and thread-safe protection for MDIPC transport, and refactored presence logic to better align with SfpStateUpdateTask operation a3486cc Added _get_module_bulk_info() and cache the info for 5 seconds to optimize the chassisd update. 4b2e729 Fixed the nokia_cmd show qfpga help display 7b87049 Fixed the nokia_cmd show midplane helper dispaly. 83eabea Add "nokia_cmd set ndk-monitor-action" and "nokia_cmd set ndk-log-level" commands 8aad7de Add nokia_cmd show ndk-version d2c55e3 Modify the psu.py and module.py to optimize the psud running time Signed-off-by: mlok --- platform/broadcom/sonic-platform-modules-nokia | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platform/broadcom/sonic-platform-modules-nokia b/platform/broadcom/sonic-platform-modules-nokia index d768d199bdd0..b027ce0fbccc 160000 --- a/platform/broadcom/sonic-platform-modules-nokia +++ b/platform/broadcom/sonic-platform-modules-nokia @@ -1 +1 @@ -Subproject commit d768d199bdd0247135f2135214a92d81953d4795 +Subproject commit b027ce0fbcccaff92d42ef05c05e87922f9161ba From 6335f610c84ce7b7a71dcf638c57f86767aeb506 Mon Sep 17 00:00:00 2001 From: "Marty Y. Lok" <76118573+mlok-nokia@users.noreply.github.com> Date: Thu, 27 Apr 2023 11:53:16 -0400 Subject: [PATCH 091/193] [Nokia][device-data] Modify the Nokia-7250IXRE platform specific reboot script (#14568) Why I did it When reboot the chassis by issuing "sudo reboot" on Supervisor card. The internal midplane communication xe0 should be shutdown to avoid double reboot on the linecard. Added a udev link rule to disable the autoneg on AMD xgbe port Xe0 and Xe1 and make the setting in sync with the peer Broadcom greyhound ports. How I did it Modify the Nokia-7250IXRE specific reboot script on the Supervisor card to shutdown the internal interface xe0. Also move reboot linecard code to the top of the script to make sure the notification has been send to Linecard before shutdown the xe0 interface. Introduced a new rule 80-net-by-driver.link to disable the autoneg on the AMD size. This change requires the latest NDK which contains the change to set the autoneg on the xe0 and xe1 port on the Greyhound. Signed-off-by: mlok --- .../platform_reboot | 2 +- .../89-net-by-driver.link | 19 +++++++++++++++++++ .../platform_reboot | 10 ++++++---- 3 files changed, 26 insertions(+), 5 deletions(-) create mode 100644 device/nokia/x86_64-nokia_ixr7250e_sup-r0/89-net-by-driver.link diff --git a/device/nokia/x86_64-nokia_ixr7250e_36x400g-r0/platform_reboot b/device/nokia/x86_64-nokia_ixr7250e_36x400g-r0/platform_reboot index b086d09bddcd..180db164df69 100755 --- a/device/nokia/x86_64-nokia_ixr7250e_36x400g-r0/platform_reboot +++ b/device/nokia/x86_64-nokia_ixr7250e_36x400g-r0/platform_reboot @@ -28,4 +28,4 @@ rm -f /sys/firmware/efi/efivars/dump-* touch /etc/opt/srlinux/devmgr_reboot_cause.done rm -f /etc/opt/srlinux/reboot-cause.txt sync -/sbin/reboot +exec /sbin/reboot $@ diff --git a/device/nokia/x86_64-nokia_ixr7250e_sup-r0/89-net-by-driver.link b/device/nokia/x86_64-nokia_ixr7250e_sup-r0/89-net-by-driver.link new file mode 100644 index 000000000000..fa0bcb1b4067 --- /dev/null +++ b/device/nokia/x86_64-nokia_ixr7250e_sup-r0/89-net-by-driver.link @@ -0,0 +1,19 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later +# +# This file is part of systemd. +# +# systemd is free software; you can redistribute it and/or modify it +# under the terms of the GNU Lesser General Public License as published by +# the Free Software Foundation; either version 2.1 of the License, or +# (at your option) any later version. + +[Match] +Driver=amd-xgbe + +[Link] +NamePolicy=keep kernel database onboard slot path +AlternativeNamesPolicy=database onboard slot path +MACAddressPolicy=persistent +AutoNegotiation=no +BitsPerSecond=10G +Duplex=full diff --git a/device/nokia/x86_64-nokia_ixr7250e_sup-r0/platform_reboot b/device/nokia/x86_64-nokia_ixr7250e_sup-r0/platform_reboot index ba47829674a4..00ae76c9de86 100755 --- a/device/nokia/x86_64-nokia_ixr7250e_sup-r0/platform_reboot +++ b/device/nokia/x86_64-nokia_ixr7250e_sup-r0/platform_reboot @@ -1,5 +1,7 @@ #!/bin/bash - +echo "Rebooting all Linecards" +python3 -c 'import sonic_platform.platform; platform_chassis = sonic_platform.platform.Platform().get_chassis(); platform_chassis.reboot_imms()' +sleep 3 systemctl stop nokia-watchdog.service sleep 2 echo "w" > /dev/watchdog @@ -8,7 +10,7 @@ echo "last watchdog kick $kick_date" > /var/log/nokia-watchdog-last.log rm -f /sys/firmware/efi/efivars/dump-* touch /etc/opt/srlinux/devmgr_reboot_cause.done rm -f /etc/opt/srlinux/reboot-cause.txt +echo "Shutdown midplane" +ifconfig xe0 down sync -echo "Rebooting all Linecards" -python3 -c 'import sonic_platform.platform; platform_chassis = sonic_platform.platform.Platform().get_chassis(); platform_chassis.reboot_imms()' -/sbin/reboot +exec /sbin/reboot $@ From 4ff0832bbdf7a9ca61414937a72fed3b2b019d93 Mon Sep 17 00:00:00 2001 From: mssonicbld <79238446+mssonicbld@users.noreply.github.com> Date: Thu, 18 May 2023 02:37:09 +0800 Subject: [PATCH 092/193] [submodule] Update submodule sonic-utilities to the latest HEAD automatically (#14983) src/sonic-utilities * 62683097 - (HEAD -> 202205, origin/202205) [config]: Dynamically start and stop ndppd (#2814) (5 days ago) [Lawrence Lee] * 8adaa020 - Added platform plugin support in load_minigraph (#2808) (#2831) (8 days ago) [anamehra] --- src/sonic-utilities | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/sonic-utilities b/src/sonic-utilities index f6359bccc74b..626830976a86 160000 --- a/src/sonic-utilities +++ b/src/sonic-utilities @@ -1 +1 @@ -Subproject commit f6359bccc74bb1ed1c570de4e50b555b77923e16 +Subproject commit 626830976a86d74f85c96c2f4fecc08f40b4b06f From b8bf426543453e25bcd48b4053201f8bc85f1b86 Mon Sep 17 00:00:00 2001 From: mssonicbld <79238446+mssonicbld@users.noreply.github.com> Date: Thu, 18 May 2023 02:38:13 +0800 Subject: [PATCH 093/193] [submodule] Update submodule wpasupplicant/sonic-wpa-supplicant to the latest HEAD automatically (#15016) src/wpasupplicant/sonic-wpa-supplicant * a24412c25 - (HEAD -> 202205, origin/master, origin/HEAD, origin/202211, origin/202205, master) [mka]: Fix unexpected cleanup (#73) (8 days ago) [Ze Gan] * 26d1da0bc - [mka]: Fix re-establishment by reset MI (#72) (8 days ago) [Ze Gan] * f07e0a097 - [azp]: Update build pipeline to build for Bullseye (#70) (4 weeks ago) [Ze Gan] * 2c69e2cda - Use github code scanning instead of LGTM (#69) (6 months ago) [Liu Shilong] |\ | * 23abb04e5 - fix (6 months ago) [shilongliu] | * f34d68fe6 - libdbus-1-dev (6 months ago) [shilongliu] | * dc2dd881e - add dbus (6 months ago) [shilongliu] | * 5de037661 - use swsscommon packages (6 months ago) [shilongliu] | * 32c5a2729 - Use github code scanning instead of LGTM (6 months ago) [shilongliu] |/ * aa731b96f - [azp]: Install libyang in azure pipeline (#68) (8 months ago) [Hua Liu] * 71b635d74 - Revert "[Azp]: Upgrade Azp to bullseye (#49)" (#66) (9 months ago) [Ze Gan] * 7aa4e6fa4 - Adding Microsoft SECURITY.MD (#58) (9 months ago) [microsoft-github-policy-service[bot]] --- src/wpasupplicant/sonic-wpa-supplicant | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/wpasupplicant/sonic-wpa-supplicant b/src/wpasupplicant/sonic-wpa-supplicant index 24f505148191..a24412c25b8a 160000 --- a/src/wpasupplicant/sonic-wpa-supplicant +++ b/src/wpasupplicant/sonic-wpa-supplicant @@ -1 +1 @@ -Subproject commit 24f5051481910677b9e5937c01b8b941185086d3 +Subproject commit a24412c25b8af63ab0030e6135c21a51a4a4c316 From 1f04c4b9a1781228ea57db71724f15ad0b1ff860 Mon Sep 17 00:00:00 2001 From: mssonicbld <79238446+mssonicbld@users.noreply.github.com> Date: Thu, 18 May 2023 02:40:26 +0800 Subject: [PATCH 094/193] [submodule] Update submodule sonic-platform-common to the latest HEAD automatically (#15033) src/sonic-platform-common * c7ce1a5 - (HEAD -> 202205, origin/202205) Prevent VDM dictionary related KeyError when a transceiver module is pulled while a bulk get method is interrogating said module (#360) (5 days ago) [snider-nokia] --- 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 c97af3c9815b..c7ce1a56cb39 160000 --- a/src/sonic-platform-common +++ b/src/sonic-platform-common @@ -1 +1 @@ -Subproject commit c97af3c9815b794d2fad48f652d27d9892834382 +Subproject commit c7ce1a56cb39fde313e671aea772da8dfe407d7d From ad1033d5ac0e710248aa28da3152eced07f54c3c Mon Sep 17 00:00:00 2001 From: mssonicbld <79238446+mssonicbld@users.noreply.github.com> Date: Thu, 18 May 2023 02:40:52 +0800 Subject: [PATCH 095/193] [submodule] Update submodule sonic-swss to the latest HEAD automatically (#15034) src/sonic-swss * eb79dae - (HEAD -> 202205, origin/202205) [orchagent]: Handle additional SAI error conditions gracefully (#2755) (5 days ago) [prabhataravind] * d3c3a7d - [mux]: Implement rollback for failed mux switchovers (#2714) (#2761) (5 days ago) [Lawrence Lee] --- src/sonic-swss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/sonic-swss b/src/sonic-swss index f977724b9364..eb79dae9d5a5 160000 --- a/src/sonic-swss +++ b/src/sonic-swss @@ -1 +1 @@ -Subproject commit f977724b9364fb45def63aa96dd50445e88a2acd +Subproject commit eb79dae9d5a51200a52617e355ab0624d19b75ab From 5206fcd0974b348a3964c632796750158f08c29b Mon Sep 17 00:00:00 2001 From: Hua Liu <58683130+liuh-80@users.noreply.github.com> Date: Wed, 17 May 2023 13:09:04 -0700 Subject: [PATCH 096/193] [S6100] Improve S6100 serial-getty monitor, wait and re-check when getty not running to avoid false alert. (#14402) (#15032) 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. #### 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' #### 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 ``` #### Description for the changelog [S6100] Improve S6100 serial-getty monitor. #### 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. --- .../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 22378cf0eb8b..ab20e29e188d 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 @@ -35,6 +35,7 @@ s6100/systemd/s6100-ssd-upgrade-status.service etc/systemd/system s6100/systemd/s6100-reboot-cause.service etc/systemd/system s6100/systemd/s6100-platform-startup.service etc/systemd/system s6100/scripts/s6100_serial_getty_monitor etc/monit/conf.d +s6100/scripts/check-getty.sh usr/local/bin common/fw-updater usr/local/bin common/onie_mode_set usr/local/bin common/onie_version 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 b6df524b0ff312b362c98b29766b0a1e82b71fd3 Mon Sep 17 00:00:00 2001 From: judyjoseph <53951155+judyjoseph@users.noreply.github.com> Date: Wed, 17 May 2023 13:17:20 -0700 Subject: [PATCH 097/193] Add override_config to load_minigraph in config-setup service (#14834) (#15097) This PR is to handle the override minigraph config by golden_config_db.json file if it is present in the backup location. --- files/Aboot/boot0.j2 | 3 ++- files/image_config/config-setup/config-setup | 8 ++++++-- files/image_config/platform/rc.local | 6 ++++++ files/image_config/secureboot/allowlist_paths.conf | 1 + 4 files changed, 15 insertions(+), 3 deletions(-) diff --git a/files/Aboot/boot0.j2 b/files/Aboot/boot0.j2 index f40fef8162f5..a0b67eeb0f9a 100644 --- a/files/Aboot/boot0.j2 +++ b/files/Aboot/boot0.j2 @@ -118,7 +118,8 @@ clean_flash() { [ $f != "minigraph.xml" ] && [ $f != "snmp.yml" ] && [ $f != "acl.json" ] && - [ $f != "port_config.json" ] + [ $f != "port_config.json" ] && + [ $f != "golden_config_db.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 b151437b9e25..0f5a248b05f8 100755 --- a/files/image_config/config-setup/config-setup +++ b/files/image_config/config-setup/config-setup @@ -109,7 +109,11 @@ run_hookdir() { reload_minigraph() { echo "Reloading minigraph..." - config load_minigraph -y -n + if [ -f /etc/sonic/golden_config_db.json ]; then + config load_minigraph -y -n --override_config --golden_config_path '/etc/sonic/golden_config_db.json' + else + config load_minigraph -y -n + fi config save -y } @@ -305,7 +309,7 @@ check_all_config_db_present() do_config_migration() { # Identify list of files to migrate - copy_list="minigraph.xml snmp.yml acl.json port_config.json frr telemetry" + copy_list="minigraph.xml snmp.yml acl.json port_config.json frr telemetry golden_config_db.json" # 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 84a0b91d9bd0..d0abf78ca9b0 100755 --- a/files/image_config/platform/rc.local +++ b/files/image_config/platform/rc.local @@ -126,6 +126,8 @@ migrate_nos_configuration() 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 + GOLDEN_CONFIG_DB_GZFILE=$NOS_DIR/golden_config_db.json.gz.base64.txt + GOLDEN_CONFIG_DB_FILE=$NOS_DIR/golden_config_db.json mkdir -p $NOS_DIR mount $nos_dev $NOS_DIR @@ -137,6 +139,7 @@ migrate_nos_configuration() [ -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 + [ -f $GOLDEN_CONFIG_DB_GZFILE] && /usr/bin/base64 -d $GOLDEN_CONFIG_DB_GZFILE| /bin/gunzip > $GOLDEN_CONFIG_DB_FILE # Copy relevant files nos_migration_import $NOS_DIR/mgmt_interface.cfg /host/migration @@ -144,6 +147,7 @@ migrate_nos_configuration() nos_migration_import $ACL_FILE /host/migration nos_migration_import $PORT_CONFIG_FILE /host/migration nos_migration_import $SNMP_FILE /host/migration + nos_migration_import $GOLDEN_CONFIG_DB_FILE /host/migration if [ "$sonic_fast_reboot" == true ]; then mkdir -p /host/fast-reboot @@ -261,6 +265,7 @@ if [ -f $FIRST_BOOT_FILE ]; then [ -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/ + [ -f /host/golden_config_db.json ] && mv /host/golden_config_db.json /etc/sonic/old_config/ touch /tmp/pending_config_migration elif [ -n "$migration" ] && [ -f /host/migration/minigraph.xml ]; then mkdir -p /etc/sonic/old_config @@ -268,6 +273,7 @@ if [ -f $FIRST_BOOT_FILE ]; then [ -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/ + [ -f /host/migration/golden_config_db.json ] && mv /host/migration/golden_config_db.json /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 else diff --git a/files/image_config/secureboot/allowlist_paths.conf b/files/image_config/secureboot/allowlist_paths.conf index 80b176178c7f..53ade2515541 100644 --- a/files/image_config/secureboot/allowlist_paths.conf +++ b/files/image_config/secureboot/allowlist_paths.conf @@ -36,3 +36,4 @@ etc/subuid etc/tacplus_nss.conf etc/tacplus_user lib/systemd/system/serial-getty@.service +etc/sonic/golden_config_db.json From 14ecd2811d4457e8ab58a6f3c70eceea479433f1 Mon Sep 17 00:00:00 2001 From: anamehra <54692434+anamehra@users.noreply.github.com> Date: Wed, 17 May 2023 13:21:16 -0700 Subject: [PATCH 098/193] Enable 400G to 100G/40G speed change via minigraph for all platforms (#14736) (#15079) - Why I did it There are chassis-packet and Single asic platforms which support this 400G to 100G/40G speed change via config. Enabling this feature for all platforms which can support this. Keeping it enabled for all does not affect the platforms which do not support this feature yet. Work item tracking Microsoft ADO (number only): 17952356 - How I did it Removed switch_type and role type check. - How to verify it Loaded router with default 400G config. Loaded minigraph to convert 400G to 100G speed. Signed-off-by: anamehra --- src/sonic-config-engine/minigraph.py | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/src/sonic-config-engine/minigraph.py b/src/sonic-config-engine/minigraph.py index a530a99bef46..6458aad17936 100644 --- a/src/sonic-config-engine/minigraph.py +++ b/src/sonic-config-engine/minigraph.py @@ -1706,17 +1706,15 @@ def parse_xml(filename, platform=None, port_config_file=None, asic_name=None, hw port_default_speed = port_speeds_default.get(port_name, None) port_png_speed = port_speed_png[port_name] - # Add a check for for voq, T1 - if results['DEVICE_METADATA']['localhost']['type'].lower() == 'leafrouter' or switch_type == 'voq': - # when the port speed is changes from 400g to 100g - # update the port lanes, use the first 4 lanes of the 400G port to support 100G port - if port_default_speed == '400000' and port_png_speed == '100000': - port_lanes = ports[port_name].get('lanes', '').split(',') - # check if the 400g port has only 8 lanes - if len(port_lanes) != 8: - continue - updated_lanes = ",".join(port_lanes[:4]) - ports[port_name]['lanes'] = updated_lanes + # when the port speed is changes from 400g to 100g/40g + # update the port lanes, use the first 4 lanes of the 400G port to support 100G/40G port + if port_default_speed == '400000' and (port_png_speed == '100000' or port_png_speed == '40000'): + port_lanes = ports[port_name].get('lanes', '').split(',') + # check if the 400g port has only 8 lanes + if len(port_lanes) != 8: + continue + updated_lanes = ",".join(port_lanes[:4]) + ports[port_name]['lanes'] = updated_lanes ports.setdefault(port_name, {})['speed'] = port_speed_png[port_name] From 578cd38f27defb96e6a4ca480f2eb6072b4430a8 Mon Sep 17 00:00:00 2001 From: Song Yuan <64041228+ysmanman@users.noreply.github.com> Date: Wed, 17 May 2023 11:34:43 -0700 Subject: [PATCH 099/193] Install ptf afpacket module required by ptf_nn_agent. (#14503) Why I did it ptf_nn_agent failed to start in dnx rpc syncd because module afpacket was not installed. Please see issue sonic-net/sonic-mgmt#7822 How I did it Add downloading ptf afpacket module in docker file. How to verify it Verified that ptf_nn_agent was started successfully in dnx rpc syncd with the change. --- platform/broadcom/docker-syncd-brcm-dnx-rpc/Dockerfile.j2 | 1 + 1 file changed, 1 insertion(+) diff --git a/platform/broadcom/docker-syncd-brcm-dnx-rpc/Dockerfile.j2 b/platform/broadcom/docker-syncd-brcm-dnx-rpc/Dockerfile.j2 index 868b0603e11e..ca85d74083ea 100644 --- a/platform/broadcom/docker-syncd-brcm-dnx-rpc/Dockerfile.j2 +++ b/platform/broadcom/docker-syncd-brcm-dnx-rpc/Dockerfile.j2 @@ -49,6 +49,7 @@ RUN wget https://github.com/nanomsg/nanomsg/archive/1.0.0.tar.gz \ && mkdir -p /opt \ && cd /opt \ && wget https://github.com/raw/p4lang/ptf/master/ptf_nn/ptf_nn_agent.py \ + && mkdir ptf && cd ptf && wget https://github.com/raw/p4lang/ptf/master/src/ptf/afpacket.py && touch __init__.py \ && apt-get clean -y; apt-get autoclean -y; apt-get autoremove -y \ && rm -rf /root/deps From f6bd817c72a7af58386413f90efbf6a5539a3766 Mon Sep 17 00:00:00 2001 From: mssonicbld <79238446+mssonicbld@users.noreply.github.com> Date: Thu, 18 May 2023 08:45:13 +0800 Subject: [PATCH 100/193] [armhf][Nokia-7215] changes fstrim.timer to daily (#14723) (#15126) --- .../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 1ad633876be6..8ce8d1726524 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,5 +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/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 inband_mgmt.sh etc/ From 80aba3143379a35047d1dabb73414639a319a7a9 Mon Sep 17 00:00:00 2001 From: mssonicbld <79238446+mssonicbld@users.noreply.github.com> Date: Thu, 18 May 2023 08:50:55 +0800 Subject: [PATCH 101/193] [arp_update] Resolve neighbors from config_db (#15006) (#15124) --- 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 2725f034668b..4b25973cfc02 100755 --- a/files/scripts/arp_update +++ b/files/scripts/arp_update @@ -124,8 +124,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 4b30d09903627de7eb7b7227ea07772c12cf7e84 Mon Sep 17 00:00:00 2001 From: judyjoseph <53951155+judyjoseph@users.noreply.github.com> Date: Thu, 27 Apr 2023 08:51:28 -0700 Subject: [PATCH 102/193] [macsec]: show macsec: add --profile option, include profile name in show command output (#13940) This PR is to add the following Add a new options "--profile" to the show macsec command, to show all profiles in device Update the currentl show macsec command, to show profile in each interface o/p. This will tell which macsec profile the interface is attached to. --- .../cli-plugin-tests/config_db.json | 75 +++++++++++++ .../cli-plugin-tests/test_show_macsec.py | 4 + .../cli/show/plugins/show_macsec.py | 104 +++++++++++++++--- 3 files changed, 168 insertions(+), 15 deletions(-) create mode 100644 dockers/docker-macsec/cli-plugin-tests/config_db.json diff --git a/dockers/docker-macsec/cli-plugin-tests/config_db.json b/dockers/docker-macsec/cli-plugin-tests/config_db.json new file mode 100644 index 000000000000..8c6b6893e560 --- /dev/null +++ b/dockers/docker-macsec/cli-plugin-tests/config_db.json @@ -0,0 +1,75 @@ +{ + "MACSEC_PROFILE|macsec_profile": { + "cipher_suite": "GCM-AES-XPN-256", + "policy": "security", + "primary_cak": "0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF", + "primary_ckn": "6162636465666768696A6B6C6D6E6F707172737475767778797A303132333435", + "priority": "0", + "rekey_period": "900", + "send_sci": "true" + }, + "PORT|Ethernet0": { + "alias": "Ethernet1/1", + "asic_port_name": "Eth0-ASIC0", + "coreid": "1", + "coreportid": "1", + "description": "Ethernet1/1", + "index": "1", + "lanes": "72,73,74,75,76,77,78,79", + "macsec": "macsec_profile", + "mtu": "9100", + "numvoq": "8", + "pfc_asym": "off", + "role": "Ext", + "speed": "400000", + "tpid": "0x8100" + }, + "PORT|Ethernet1": { + "alias": "Ethernet2/1", + "asic_port_name": "Eth0-ASIC0", + "coreid": "1", + "coreportid": "1", + "description": "Ethernet2/1", + "index": "1", + "lanes": "72,73,74,75,76,77,78,79", + "macsec": "macsec_profile", + "mtu": "9100", + "numvoq": "8", + "pfc_asym": "off", + "role": "Ext", + "speed": "400000", + "tpid": "0x8100" + }, + "PORT|Ethernet4": { + "alias": "Ethernet5/1", + "asic_port_name": "Eth0-ASIC0", + "coreid": "1", + "coreportid": "1", + "description": "Ethernet5/1", + "index": "1", + "lanes": "72,73,74,75,76,77,78,79", + "macsec": "macsec_profile", + "mtu": "9100", + "numvoq": "8", + "pfc_asym": "off", + "role": "Ext", + "speed": "400000", + "tpid": "0x8100" + }, + "PORT|Ethernet5": { + "alias": "Ethernet6/1", + "asic_port_name": "Eth0-ASIC0", + "coreid": "1", + "coreportid": "1", + "description": "Ethernet6/1", + "index": "1", + "lanes": "72,73,74,75,76,77,78,79", + "macsec": "macsec_profile", + "mtu": "9100", + "numvoq": "8", + "pfc_asym": "off", + "role": "Ext", + "speed": "400000", + "tpid": "0x8100" + } +} diff --git a/dockers/docker-macsec/cli-plugin-tests/test_show_macsec.py b/dockers/docker-macsec/cli-plugin-tests/test_show_macsec.py index 39b3a39ea7a9..2345c55b0627 100644 --- a/dockers/docker-macsec/cli-plugin-tests/test_show_macsec.py +++ b/dockers/docker-macsec/cli-plugin-tests/test_show_macsec.py @@ -23,3 +23,7 @@ def test_show_one_port(self): result = runner.invoke(show_macsec.macsec,["Ethernet1"]) assert result.exit_code == 0, "exit code: {}, Exception: {}, Traceback: {}".format(result.exit_code, result.exception, result.exc_info) + def test_show_profile(self): + runner = CliRunner() + result = runner.invoke(show_macsec.macsec,["--profile"]) + assert result.exit_code == 0, "exit code: {}, Exception: {}, Traceback: {}".format(result.exit_code, result.exception, result.exc_info) diff --git a/dockers/docker-macsec/cli/show/plugins/show_macsec.py b/dockers/docker-macsec/cli/show/plugins/show_macsec.py index 9789b32bac6b..f8a1265b07e9 100644 --- a/dockers/docker-macsec/cli/show/plugins/show_macsec.py +++ b/dockers/docker-macsec/cli/show/plugins/show_macsec.py @@ -18,6 +18,17 @@ DB_CONNECTOR = None COUNTER_TABLE = None +class MACsecCfgMeta(object): + def __init__(self, *args) -> None: + SEPARATOR = DB_CONNECTOR.get_db_separator(DB_CONNECTOR.CONFIG_DB) + self.key = self.__class__.get_cfg_table_name() + SEPARATOR + \ + SEPARATOR.join(args) + self.cfgMeta = DB_CONNECTOR.get_all( + DB_CONNECTOR.CONFIG_DB, self.key) + if len(self.cfgMeta) == 0: + raise ValueError("No such MACsecCfgMeta: {}".format(self.key)) + for k, v in self.cfgMeta.items(): + setattr(self, k, v) class MACsecAppMeta(object): def __init__(self, *args) -> None: @@ -126,23 +137,55 @@ def get_header(self): return "MACsec Egress SC ({})\n".format(self.sci) -class MACsecPort(MACsecAppMeta): +class MACsecPort(MACsecAppMeta, MACsecCfgMeta): def __init__(self, port_name: str) -> None: self.port_name = port_name - super(MACsecPort, self).__init__(port_name) + MACsecAppMeta.__init__(self, port_name) + MACsecCfgMeta.__init__(self, port_name) @classmethod def get_appl_table_name(cls) -> str: return "MACSEC_PORT_TABLE" + @classmethod + def get_cfg_table_name(cls) -> str: + return "PORT" + def dump_str(self, cache = None) -> str: buffer = self.get_header() + + # Add the profile information to the meta dict from config meta dict + self.meta["profile"] = self.cfgMeta["macsec"] + buffer += tabulate(sorted(self.meta.items(), key=lambda x: x[0])) return buffer def get_header(self) -> str: return "MACsec port({})\n".format(self.port_name) +class MACsecProfile(MACsecCfgMeta): + def __init__(self, profile_name: str) -> None: + self.profile_name = profile_name + super(MACsecProfile, self).__init__(profile_name) + + @classmethod + def get_cfg_table_name(cls) -> str: + return "MACSEC_PROFILE" + + def dump_str(self, cache = None) -> str: + buffer = self.get_header() + + # Don't display the primary and fallback CAK + if 'primary_cak' in self.cfgMeta: del self.cfgMeta['primary_cak'] + if 'fallback_cak' in self.cfgMeta: del self.cfgMeta['fallback_cak'] + + t_buffer = tabulate(sorted(self.cfgMeta.items(), key=lambda x: x[0])) + t_buffer = "\n".join(["\t" + line for line in t_buffer.splitlines()]) + buffer += t_buffer + return buffer + + def get_header(self) -> str: + return "MACsec profile : {}\n".format(self.profile_name) def create_macsec_obj(key: str) -> MACsecAppMeta: attr = key.split(":") @@ -161,6 +204,14 @@ def create_macsec_obj(key: str) -> MACsecAppMeta: except ValueError as e: return None +def create_macsec_profile_obj(key: str) -> MACsecCfgMeta: + attr = key.split("|") + try: + if attr[0] == MACsecProfile.get_cfg_table_name(): + return MACsecProfile(attr[1]) + raise TypeError("Unknown MACsec object type") + except ValueError as e: + return None def create_macsec_objs(interface_name: str) -> typing.List[MACsecAppMeta]: objs = [] @@ -192,6 +243,12 @@ def create_macsec_objs(interface_name: str) -> typing.List[MACsecAppMeta]: return objs +def create_macsec_profiles_objs(profile_name: str) -> typing.List[MACsecCfgMeta]: + objs = [] + objs.append(create_macsec_profile_obj(MACsecProfile.get_cfg_table_name() + "|" + profile_name)) + return objs + + def cache_find(cache: dict, target: MACsecAppMeta) -> MACsecAppMeta: if not cache or not cache["objs"]: return None @@ -207,10 +264,14 @@ def cache_find(cache: dict, target: MACsecAppMeta) -> MACsecAppMeta: @click.command() @click.argument('interface_name', required=False) -@click.option('--dump-file', is_flag=True, required=False, default=False) +@click.option('--profile', is_flag=True, required=False, default=False, help="show all macsec profiles") +@click.option('--dump-file', is_flag=True, required=False, default=False, help="store show output to a file") @multi_asic_util.multi_asic_click_options -def macsec(interface_name, dump_file, namespace, display): - MacsecContext(namespace, display).show(interface_name, dump_file) +def macsec(interface_name, dump_file, namespace, display, profile): + if interface_name is not None and profile: + click.echo('Interface name is not valid with profile option') + return + MacsecContext(namespace, display).show(interface_name, dump_file, profile) class MacsecContext(object): @@ -218,23 +279,36 @@ def __init__(self, namespace_option, display_option): self.db = None self.multi_asic = multi_asic_util.MultiAsic( display_option, namespace_option) + self.macsec_profiles = [] @multi_asic_util.run_on_multi_asic - def show(self, interface_name, dump_file): + def show(self, interface_name, dump_file, profile): global DB_CONNECTOR global COUNTER_TABLE DB_CONNECTOR = self.db - COUNTER_TABLE = CounterTable(self.db.get_redis_client(self.db.COUNTERS_DB)) - interface_names = [name.split(":")[1] for name in self.db.keys(self.db.APPL_DB, "MACSEC_PORT*")] - if interface_name is not None: - if interface_name not in interface_names: - return - interface_names = [interface_name] - objs = [] + if not profile: + COUNTER_TABLE = CounterTable(self.db.get_redis_client(self.db.COUNTERS_DB)) + + interface_names = [name.split(":")[1] for name in self.db.keys(self.db.APPL_DB, "MACSEC_PORT*")] + if interface_name is not None: + if interface_name not in interface_names: + return + interface_names = [interface_name] + objs = [] - for interface_name in natsorted(interface_names): - objs += create_macsec_objs(interface_name) + for interface_name in natsorted(interface_names): + objs += create_macsec_objs(interface_name) + else: + profile_names = [name.split("|")[1] for name in self.db.keys(self.db.CONFIG_DB, "MACSEC_PROFILE*")] + objs = [] + + for profile_name in natsorted(profile_names): + # Check if this macsec profile is already added to profile list. This is in case of + # multi-asic devices where all namespaces will have the same macsec profile defined. + if profile_name not in self.macsec_profiles and not dump_file: + self.macsec_profiles.append(profile_name) + objs += create_macsec_profiles_objs(profile_name) cache = {} if os.path.isfile(CACHE_FILE.format(self.multi_asic.current_namespace)): From b9d1a9f51261d18924fbdb7bc635c6de7628974b Mon Sep 17 00:00:00 2001 From: Vivek Date: Thu, 27 Apr 2023 11:02:13 -0500 Subject: [PATCH 103/193] [Sys Mon] Fix the service entry delete in state_db because of timer job (#14702) Why I did it systemd stop event on service with timers can sometime delete the state_db entry for the corresponding service. Note: This won't be observed on the latest master label since the dependency on timer was removed with the recent config reload enhancement. However, it is better to have the fix since there might be some systemd services added to system health daemon in the future which may contain timers root@qa-eth-vt01-4-3700c:/home/admin# systemctl stop snmp root@qa-eth-vt01-4-3700c:/home/admin# show system-health sysready-status System is not ready - one or more services are not up Service-Name Service-Status App-Ready-Status Down-Reason ---------------------- ---------------- ------------------ ------------- ssh OK OK - swss OK OK - syncd OK OK - sysstat OK OK - teamd OK OK - telemetry OK OK - what-just-happened OK OK - ztp OK OK - Expected Should see a Down entry for SNMP instead of the entry being deleted from the STATE_DB root@qa-eth-vt01-4-3700c:/home/admin# show system-health sysready-status System is not ready - one or more services are not up Service-Name Service-Status App-Ready-Status Down-Reason ---------------------- ---------------- ------------------ ------------- snmp Down Down Inactive ssh OK OK - swss OK OK - syncd OK OK - sysstat OK OK - teamd OK OK - telemetry OK OK - what-just-happened OK OK - ztp OK OK - How I did it Happens because the timer is usually a PartOf service and thus a stop on service is propagated to timer. Fixed the logic to handle this Apr 18 02:06:47.711252 r-lionfish-16 DEBUG healthd: Main process- received event:snmp.service from source:sysbus time:2023-04-17 23:06:47 Apr 18 02:06:47.711347 r-lionfish-16 INFO healthd: check_unit_status for [ snmp.service ] Apr 18 02:06:47.722363 r-lionfish-16 INFO healthd: snmp.service service state changed to [inactive/dead] Apr 18 02:06:47.723230 r-lionfish-16 DEBUG healthd: Main process- received event:snmp.timer from source:sysbus time:2023-04-17 23:06:47 Apr 18 02:06:47.723328 r-lionfish-16 INFO healthd: check_unit_status for [ snmp.timer ] Signed-off-by: Vivek Reddy Karri --- src/system-health/health_checker/sysmonitor.py | 11 +++++++---- src/system-health/tests/test_system_health.py | 9 +++++++++ 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/src/system-health/health_checker/sysmonitor.py b/src/system-health/health_checker/sysmonitor.py index b3f43e447f7b..1357693c108a 100755 --- a/src/system-health/health_checker/sysmonitor.py +++ b/src/system-health/health_checker/sysmonitor.py @@ -407,10 +407,13 @@ def check_unit_status(self, event): self.dnsrvs_name.remove(event) srv_name,last = event.split('.') - key = 'ALL_SERVICE_STATUS|{}'.format(srv_name) - key_exists = self.state_db.exists(self.state_db.STATE_DB, key) - if key_exists == 1: - self.state_db.delete(self.state_db.STATE_DB, key) + # stop on service maybe propagated to timers and in that case, + # the state_db entry for the service should not be deleted + if last == "service": + key = 'ALL_SERVICE_STATUS|{}'.format(srv_name) + key_exists = self.state_db.exists(self.state_db.STATE_DB, key) + if key_exists == 1: + self.state_db.delete(self.state_db.STATE_DB, key) return 0 diff --git a/src/system-health/tests/test_system_health.py b/src/system-health/tests/test_system_health.py index cea80b48a349..29f2e14704cc 100644 --- a/src/system-health/tests/test_system_health.py +++ b/src/system-health/tests/test_system_health.py @@ -622,6 +622,15 @@ def test_check_unit_status(): assert 'mock_bgp.service' in sysmon.dnsrvs_name +@patch('health_checker.sysmonitor.Sysmonitor.get_all_service_list', MagicMock(return_value=['mock_snmp.service'])) +def test_check_unit_status_timer(): + sysmon = Sysmonitor() + sysmon.state_db = MagicMock() + sysmon.state_db.exists = MagicMock(return_value=1) + sysmon.state_db.delete = MagicMock() + sysmon.check_unit_status('mock_snmp.timer') + assert not sysmon.state_db.delete.called + @patch('health_checker.sysmonitor.Sysmonitor.run_systemctl_show', MagicMock(return_value=mock_srv_props['mock_radv.service'])) @patch('health_checker.sysmonitor.Sysmonitor.get_app_ready_status', MagicMock(return_value=('Up','-','-'))) From 4f0f0e09279caf5baa5322e1c4dc018f7a05d3ea Mon Sep 17 00:00:00 2001 From: abdosi <58047199+abdosi@users.noreply.github.com> Date: Fri, 5 May 2023 13:55:05 -0700 Subject: [PATCH 104/193] [bgp/TSA]: Fixed the internal peer route-map policy (#14804) What I did: In FRR command update source is not at address-family level. Because of this internal peer route-map for ipv6 were getting applied to ipv4 address family. As a result TSA over iBGP for Ipv6 was not getting applied. How I verify: Manual Verification of TSA over both ipv4 and ipv6 after fix works fine. Updated UT for this. Added sonic-mgmt test gap: sonic-net/sonic-mgmt#8170 Signed-off-by: Abhishek Dosi --- .../bgpd/templates/internal/peer-group.conf.j2 | 15 ++++++++------- .../peer-group.conf/param_chasiss_packet.json | 2 +- .../peer-group.conf/result_chasiss_packet.conf | 4 ++-- 3 files changed, 11 insertions(+), 10 deletions(-) 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 e14094a652e5..e29a4c9e2fb6 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 @@ -3,11 +3,11 @@ ! neighbor INTERNAL_PEER_V4 peer-group neighbor INTERNAL_PEER_V6 peer-group - address-family ipv4 - {% if CONFIG_DB__DEVICE_METADATA['localhost']['switch_type'] == 'chassis-packet' %} - neighbor INTERNAL_PEER_V4 update-source Loopback4096 -{% elif CONFIG_DB__DEVICE_METADATA['localhost']['sub_role'] == 'BackEnd' %} + neighbor INTERNAL_PEER_V4 update-source Loopback4096 +{% endif %} + address-family ipv4 +{% if CONFIG_DB__DEVICE_METADATA['localhost']['sub_role'] == 'BackEnd' %} neighbor INTERNAL_PEER_V4 route-reflector-client {% endif %} neighbor INTERNAL_PEER_V4 soft-reconfiguration inbound @@ -15,10 +15,11 @@ 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 {% if CONFIG_DB__DEVICE_METADATA['localhost']['switch_type'] == 'chassis-packet' %} - neighbor INTERNAL_PEER_V6 update-source Loopback4096 -{% elif CONFIG_DB__DEVICE_METADATA['localhost']['sub_role'] == 'BackEnd' %} + neighbor INTERNAL_PEER_V6 update-source Loopback4096 +{% endif %} + address-family ipv6 +{% if CONFIG_DB__DEVICE_METADATA['localhost']['sub_role'] == 'BackEnd' %} neighbor INTERNAL_PEER_V6 route-reflector-client {% endif %} neighbor INTERNAL_PEER_V6 soft-reconfiguration inbound diff --git a/src/sonic-bgpcfgd/tests/data/internal/peer-group.conf/param_chasiss_packet.json b/src/sonic-bgpcfgd/tests/data/internal/peer-group.conf/param_chasiss_packet.json index 956758febcfe..fb4065194b06 100644 --- a/src/sonic-bgpcfgd/tests/data/internal/peer-group.conf/param_chasiss_packet.json +++ b/src/sonic-bgpcfgd/tests/data/internal/peer-group.conf/param_chasiss_packet.json @@ -2,7 +2,7 @@ "CONFIG_DB__DEVICE_METADATA": { "localhost": { "type": "SpineRouter", - "sub_role": "BackEnd", + "sub_role": "FrontEnd", "switch_type": "chassis-packet" } }, diff --git a/src/sonic-bgpcfgd/tests/data/internal/peer-group.conf/result_chasiss_packet.conf b/src/sonic-bgpcfgd/tests/data/internal/peer-group.conf/result_chasiss_packet.conf index 3a6f0bad59aa..1f4e219e2770 100644 --- a/src/sonic-bgpcfgd/tests/data/internal/peer-group.conf/result_chasiss_packet.conf +++ b/src/sonic-bgpcfgd/tests/data/internal/peer-group.conf/result_chasiss_packet.conf @@ -3,15 +3,15 @@ ! neighbor INTERNAL_PEER_V4 peer-group neighbor INTERNAL_PEER_V6 peer-group + neighbor INTERNAL_PEER_V4 update-source Loopback4096 address-family ipv4 - neighbor INTERNAL_PEER_V4 update-source Loopback4096 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 + neighbor INTERNAL_PEER_V6 update-source Loopback4096 address-family ipv6 - neighbor INTERNAL_PEER_V6 update-source Loopback4096 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 From 3521c29704ac76c1d5611a60ef86a7da1750ee65 Mon Sep 17 00:00:00 2001 From: Yaqiang Zhu Date: Fri, 19 May 2023 00:02:42 +0800 Subject: [PATCH 105/193] [202205][yang] Extend device_metadata yang model with rack_mgmt_map (#15140) * [yang] Extend device_metadata yang model with rack_mgmt_map * Update doc and sample --- src/sonic-yang-models/doc/Configuration.md | 3 ++- .../tests/files/sample_config_db.json | 3 ++- .../tests/device_metadata.json | 7 +++++++ .../tests_config/device_metadata.json | 18 ++++++++++++++++++ .../yang-models/sonic-device_metadata.yang | 9 +++++++++ 5 files changed, 38 insertions(+), 2 deletions(-) diff --git a/src/sonic-yang-models/doc/Configuration.md b/src/sonic-yang-models/doc/Configuration.md index 5dc65909c29f..cb4e3d953289 100644 --- a/src/sonic-yang-models/doc/Configuration.md +++ b/src/sonic-yang-models/doc/Configuration.md @@ -822,7 +822,8 @@ instance is supported in SONiC. "bgp_asn": "65100", "deployment_id": "1", "type": "ToRRouter", - "buffer_model": "traditional" + "buffer_model": "traditional", + "rack_mgmt_map": "dummy_value" } } } diff --git a/src/sonic-yang-models/tests/files/sample_config_db.json b/src/sonic-yang-models/tests/files/sample_config_db.json index b0d78bd16624..321a5df4a388 100644 --- a/src/sonic-yang-models/tests/files/sample_config_db.json +++ b/src/sonic-yang-models/tests/files/sample_config_db.json @@ -315,7 +315,8 @@ "switch_type": "voq", "max_cores": "8", "sub_role": "FrontEnd", - "dhcp_server": "disabled" + "dhcp_server": "disabled", + "rack_mgmt_map": "dummy_value" } }, "VLAN": { diff --git a/src/sonic-yang-models/tests/yang_model_tests/tests/device_metadata.json b/src/sonic-yang-models/tests/yang_model_tests/tests/device_metadata.json index 1c39661d056e..262f123e5b14 100644 --- a/src/sonic-yang-models/tests/yang_model_tests/tests/device_metadata.json +++ b/src/sonic-yang-models/tests/yang_model_tests/tests/device_metadata.json @@ -113,6 +113,13 @@ "DEVICE_METADATA_INVALID_DHCP_SERVER": { "desc": "Verifying invalid dhcp_server configuration.", "eStrKey": "InvalidValue" + }, + "DEVICE_METADATA_VALID_RACK_MGMT_MAP": { + "desc": "Verifying rack_mgmt_map configuration." + }, + "DEVICE_METADATA_INVALID_RACK_MGMT_MAP": { + "desc": "Verifying invalid rack_mgmt_map configuration.", + "eStr": "Invalid length for the rack mgmt map." } } diff --git a/src/sonic-yang-models/tests/yang_model_tests/tests_config/device_metadata.json b/src/sonic-yang-models/tests/yang_model_tests/tests_config/device_metadata.json index 687a745a24c6..5298b389e7e5 100644 --- a/src/sonic-yang-models/tests/yang_model_tests/tests_config/device_metadata.json +++ b/src/sonic-yang-models/tests/yang_model_tests/tests_config/device_metadata.json @@ -311,5 +311,23 @@ } } } + }, + "DEVICE_METADATA_VALID_RACK_MGMT_MAP": { + "sonic-device_metadata:sonic-device_metadata": { + "sonic-device_metadata:DEVICE_METADATA": { + "sonic-device_metadata:localhost": { + "rack_mgmt_map": "dummy_value" + } + } + } + }, + "DEVICE_METADATA_INVALID_RACK_MGMT_MAP": { + "sonic-device_metadata:sonic-device_metadata": { + "sonic-device_metadata:DEVICE_METADATA": { + "sonic-device_metadata:localhost": { + "rack_mgmt_map": "dummy_value-dummy_value-dummy_value-dummy_value-dummy_value-dummy_value-dummy_value-dummy_value-dummy_value-dummy_value-dummy_value-dummy_value-dummy_value" + } + } + } } } diff --git a/src/sonic-yang-models/yang-models/sonic-device_metadata.yang b/src/sonic-yang-models/yang-models/sonic-device_metadata.yang index 5b06cd631952..99fb4ef715bc 100644 --- a/src/sonic-yang-models/yang-models/sonic-device_metadata.yang +++ b/src/sonic-yang-models/yang-models/sonic-device_metadata.yang @@ -193,6 +193,15 @@ module sonic-device_metadata { type stypes:admin_mode; description "Indicate whether enable the embedded DHCP server."; } + + leaf rack_mgmt_map { + type string { + length 0..128 { + error-message "Invalid length for the rack mgmt map."; + } + } + description "Information of rack mgmt map."; + } } /* end of container localhost */ } From fd5955956b735354769ad506505f569a098b66bc Mon Sep 17 00:00:00 2001 From: bingwang-ms <66248323+bingwang-ms@users.noreply.github.com> Date: Thu, 18 May 2023 15:01:48 -0700 Subject: [PATCH 106/193] Add Yang model for SYSTEM_DEFAULTS table (#15129) Why I did it This PR is to backport PR #11117 into 202205 branch. This PR is to define Yang model for SYSTEM_DEFAULTS table. The table was introduced in PR sonic-net/SONiC#982 The table will be like "SYSTEM_DEFAULTS": { "tunnel_qos_remap": { "status": "enabled" } } Work item tracking Microsoft ADO (https://msazure.visualstudio.com/One/_workitems/edit/23037078) How I did it Add a new yang file sonic-system-defaults. Yang. How to verify it Verified by UT --- src/sonic-yang-models/doc/Configuration.md | 28 ++++++++++++- src/sonic-yang-models/setup.py | 2 + .../tests/files/sample_config_db.json | 5 +++ .../tests/system_defaults.json | 9 +++++ .../tests_config/system_defaults.json | 26 +++++++++++++ .../yang-models/sonic-system-defaults.yang | 39 +++++++++++++++++++ 6 files changed, 108 insertions(+), 1 deletion(-) create mode 100644 src/sonic-yang-models/tests/yang_model_tests/tests/system_defaults.json create mode 100644 src/sonic-yang-models/tests/yang_model_tests/tests_config/system_defaults.json create mode 100644 src/sonic-yang-models/yang-models/sonic-system-defaults.yang diff --git a/src/sonic-yang-models/doc/Configuration.md b/src/sonic-yang-models/doc/Configuration.md index cb4e3d953289..cf4656882f15 100644 --- a/src/sonic-yang-models/doc/Configuration.md +++ b/src/sonic-yang-models/doc/Configuration.md @@ -28,7 +28,7 @@ Table of Contents * [DHCP_RELAY](#dhcp_relay) * [DSCP_TO_TC_MAP](#dscp_to_tc_map) * [FLEX_COUNTER_TABLE](#flex_counter_table) - * [KDUMP](#kdump) + * [KDUMP](#kdump) * [L2 Neighbors](#l2-neighbors) * [Loopback Interface](#loopback-interface) * [LOSSLESS_TRAFFIC_PATTERN](#LOSSLESS_TRAFFIC_PATTERN) @@ -58,6 +58,7 @@ Table of Contents * [WRED_PROFILE](#wred_profile) * [PASSWORD_HARDENING](#password_hardening) * [RADIUS](#radius) + * [SYSTEM_DEFAULTS table](#systemdefaults-table) * [For Developers](#for-developers) * [Generating Application Config by Jinja2 Template](#generating-application-config-by-jinja2-template) * [Incremental Configuration by Subscribing to ConfigDB](#incremental-configuration-by-subscribing-to-configdb) @@ -1801,6 +1802,31 @@ The RADIUS and RADIUS_SERVER tables define RADIUS config paramerters. RADIUS tab ``` +### SYSTEM_DEFAULTS table +To have a better management of the features in SONiC, a new table `SYSTEM_DEFAULTS` is introduced. + +``` +"SYSTEM_DEFAULTS": { + "tunnel_qos_remap": { + "status": "enabled" + } + "default_bgp_status": { + "status": "down" + } + "synchronous_mode": { + "status": "enable" + } + "dhcp_server": { + "status": "enable" + } + } +``` +The default value of flags in `SYSTEM_DEFAULTS` table can be set in `init_cfg.json` and loaded into db at system startup. These flags are usually set at image being build, and are unlikely to change at runtime. + +If the values in `config_db.json` is changed by user, it will not be rewritten back by `init_cfg.json` as `config_db.json` is loaded after `init_cfg.json` in [docker_image_ctl.j2](https://github.com/Azure/sonic-buildimage/blob/master/files/build_templates/docker_image_ctl.j2) + +For the flags that can be changed by reconfiguration, we can update entries in `minigraph.xml`, and parse the new values in to config_db with minigraph parser at reloading minigraph. If there are duplicated entries in `init_cfg.json` and `minigraph.xml`, the values in `minigraph.xml` will overwritten the values defined in `init_cfg.json`. +#### 5.2.3 Update value directly in db memory For Developers ============== diff --git a/src/sonic-yang-models/setup.py b/src/sonic-yang-models/setup.py index 3a42dfccf302..4b5646525d86 100644 --- a/src/sonic-yang-models/setup.py +++ b/src/sonic-yang-models/setup.py @@ -108,6 +108,7 @@ def run(self): './yang-models/sonic-extension.yang', './yang-models/sonic-flex_counter.yang', './yang-models/sonic-feature.yang', + './yang-models/sonic-system-defaults.yang', './yang-models/sonic-interface.yang', './yang-models/sonic-kdump.yang', './yang-models/sonic-loopback-interface.yang', @@ -175,6 +176,7 @@ def run(self): './cvlyang-models/sonic-extension.yang', './cvlyang-models/sonic-flex_counter.yang', './cvlyang-models/sonic-feature.yang', + './cvlyang-models/sonic-system-defaults.yang', './cvlyang-models/sonic-interface.yang', './cvlyang-models/sonic-kdump.yang', './cvlyang-models/sonic-loopback-interface.yang', diff --git a/src/sonic-yang-models/tests/files/sample_config_db.json b/src/sonic-yang-models/tests/files/sample_config_db.json index 321a5df4a388..3713ae131828 100644 --- a/src/sonic-yang-models/tests/files/sample_config_db.json +++ b/src/sonic-yang-models/tests/files/sample_config_db.json @@ -1954,6 +1954,11 @@ "TYPE": "RW" } }, + "SYSTEM_DEFAULTS": { + "tunnel_qos_remap": { + "status": "enabled" + } + }, "LOSSLESS_TRAFFIC_PATTERN": { "AZURE": { "mtu": "1024", diff --git a/src/sonic-yang-models/tests/yang_model_tests/tests/system_defaults.json b/src/sonic-yang-models/tests/yang_model_tests/tests/system_defaults.json new file mode 100644 index 000000000000..7d02dae1f95c --- /dev/null +++ b/src/sonic-yang-models/tests/yang_model_tests/tests/system_defaults.json @@ -0,0 +1,9 @@ +{ + "SYSTEM_DEFAULTS_WITH_CORRECT_VALUES": { + "desc": "CONFIG SYSTEM_DEFAULTS TABLE WITH ALL THE CORRECT VALUES" + }, + "SYSTEM_DEFAULTS_WITH_INVALID_STATUS_VALUE" : { + "desc": "Referring invalid status value", + "eStrKey": "InvalidValue" + } +} diff --git a/src/sonic-yang-models/tests/yang_model_tests/tests_config/system_defaults.json b/src/sonic-yang-models/tests/yang_model_tests/tests_config/system_defaults.json new file mode 100644 index 000000000000..a8ccc13c099d --- /dev/null +++ b/src/sonic-yang-models/tests/yang_model_tests/tests_config/system_defaults.json @@ -0,0 +1,26 @@ +{ + "SYSTEM_DEFAULTS_WITH_CORRECT_VALUES": { + "sonic-system-defaults:sonic-system-defaults": { + "sonic-system-defaults:SYSTEM_DEFAULTS": { + "SYSTEM_DEFAULTS_LIST": [ + { + "name": "tunnel_qos_remap", + "status": "enabled" + } + ] + } + } + }, + "SYSTEM_DEFAULTS_WITH_INVALID_STATUS_VALUE": { + "sonic-system-defaults:sonic-system-defaults": { + "sonic-system-defaults:SYSTEM_DEFAULTS": { + "SYSTEM_DEFAULTS_LIST": [ + { + "name": "tunnel_qos_remap", + "status": "invalid_status" + } + ] + } + } + } +} diff --git a/src/sonic-yang-models/yang-models/sonic-system-defaults.yang b/src/sonic-yang-models/yang-models/sonic-system-defaults.yang new file mode 100644 index 000000000000..a5160899777a --- /dev/null +++ b/src/sonic-yang-models/yang-models/sonic-system-defaults.yang @@ -0,0 +1,39 @@ +module sonic-system-defaults{ + + yang-version 1.1; + + namespace "http://github.com/Azure/system-defaults"; + prefix system-defaults; + + import sonic-types { + prefix stypes; + } + + description "SYSTEM_DEFAULTS Table yang Module for SONiC"; + + container sonic-system-defaults { + + container SYSTEM_DEFAULTS { + + description "system_defaults table in config_db.json"; + + list SYSTEM_DEFAULTS_LIST { + + key "name"; + + leaf name { + description "feature name in SYSTEM_DEFAULTS table"; + type string { + length 1..32; + } + } + + leaf status { + description "default status of the feature"; + type stypes:admin_mode; + } + + } + } + } +} From 3c5f2596e65f9ee3d9503a6e7892f4b730d94830 Mon Sep 17 00:00:00 2001 From: mssonicbld <79238446+mssonicbld@users.noreply.github.com> Date: Fri, 19 May 2023 06:03:03 +0800 Subject: [PATCH 107/193] [submodule] Update submodule sonic-platform-common to the latest HEAD automatically (#15133) src/sonic-platform-common * ff72811 - (HEAD -> 202205, origin/202205) Fix issue '<' not supported between instances of 'NoneType' and 'int' (#371) (5 hours ago) [Junchao-Mellanox] * f2a419d - Render Media lane and Media assignment options info from Application Code (#368) (8 hours ago) [rajann] * d8bad10 - Retrieve FW version using CDB command for CMIS transceivers + handle single bank FW versioning (#372) (8 hours ago) [mihirpat1] --- 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 c7ce1a56cb39..ff728111268d 160000 --- a/src/sonic-platform-common +++ b/src/sonic-platform-common @@ -1 +1 @@ -Subproject commit c7ce1a56cb39fde313e671aea772da8dfe407d7d +Subproject commit ff728111268d6dde9c214d6e82ee450084400a4b From dd8a5f2ba0a58db9bdd057fa98f67c2220714775 Mon Sep 17 00:00:00 2001 From: mssonicbld <79238446+mssonicbld@users.noreply.github.com> Date: Fri, 19 May 2023 06:03:29 +0800 Subject: [PATCH 108/193] [submodule] Update submodule sonic-py-swsssdk to the latest HEAD automatically (#15134) src/sonic-py-swsssdk * cd4cb1e - (HEAD -> 202205, origin/202205) Loosen the redis version requirement (#138) (5 hours 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 a79fa6783a07..cd4cb1e4b22d 160000 --- a/src/sonic-py-swsssdk +++ b/src/sonic-py-swsssdk @@ -1 +1 @@ -Subproject commit a79fa6783a0712f8e09e80f824ffa93a6a77112c +Subproject commit cd4cb1e4b22d219bdf3b9be38b3fb8e6e43bf0b2 From e1a1c131db7ef1a812a1f87d2c4e236b8491a446 Mon Sep 17 00:00:00 2001 From: mssonicbld <79238446+mssonicbld@users.noreply.github.com> Date: Fri, 19 May 2023 06:04:38 +0800 Subject: [PATCH 109/193] [submodule] Update submodule sonic-utilities to the latest HEAD automatically (#15135) src/sonic-utilities * ff26d900 - (HEAD -> 202205, origin/202205) Fix the invalid variable issue when set-fips in uboot (#2834) (5 hours ago) [xumia] * d98033fa - correctly parsing complete ipv6 vnet info (#2827) (5 hours ago) [Keith Lu] * 14b21508 - [GCU]Fix rdma check failure (#2824) (5 hours ago) [jingwenxie] * e2f0f2c8 - LAG keepalive script to reduce lacp session wait during warm-reboot (#2806) (5 hours ago) [Vaibhav Hemant Dixit] * 30533711 - Update TRANSCEIVER_INFO table after CDB FW upgrade (#2837) (8 hours ago) [mihirpat1] --- src/sonic-utilities | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/sonic-utilities b/src/sonic-utilities index 626830976a86..ff26d900830d 160000 --- a/src/sonic-utilities +++ b/src/sonic-utilities @@ -1 +1 @@ -Subproject commit 626830976a86d74f85c96c2f4fecc08f40b4b06f +Subproject commit ff26d900830dfae207e136f1c703d9808fc5eb40 From 0556b21188f78c5bb2c40ed63d9b66c84e336a60 Mon Sep 17 00:00:00 2001 From: Liu Shilong Date: Fri, 19 May 2023 06:06:24 +0800 Subject: [PATCH 110/193] [ci] Fix pipeline error caused by qemuOrCrossBuild missing. (#15139) Why I did it Fix pipeline issue which breaks 202205 official build. Work item tracking Microsoft ADO (number only): 23115245 How I did it qemuOrCrossBuild was not cherry picked into 202205 branch. Remove this feature. --- .azure-pipelines/azure-pipelines-build.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.azure-pipelines/azure-pipelines-build.yml b/.azure-pipelines/azure-pipelines-build.yml index f8767bd5b9d3..2a2f6797af63 100644 --- a/.azure-pipelines/azure-pipelines-build.yml +++ b/.azure-pipelines/azure-pipelines-build.yml @@ -87,8 +87,7 @@ jobs: PLATFORM_ARCH: armhf - name: marvell-arm64 - ${{ if not(parameters.qemuOrCrossBuild) }}: - pool: sonicbld-arm64 + pool: sonicbld-arm64 timeoutInMinutes: 2880 variables: PLATFORM_ARCH: arm64 From 56c0e0bdb291d6069263de249e909be6f5620aef Mon Sep 17 00:00:00 2001 From: mssonicbld <79238446+mssonicbld@users.noreply.github.com> Date: Sun, 21 May 2023 07:27:09 +0800 Subject: [PATCH 111/193] [build] update isc-dhcp to 4.4.1-2.3+deb11u2 to fix build failure (#15002) (#15171) --- rules/isc-dhcp.mk | 2 +- src/isc-dhcp/Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/rules/isc-dhcp.mk b/rules/isc-dhcp.mk index 0951836470ce..5dc98d5d5653 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.3+deb11u1 +ISC_DHCP_VERSION_FULL = ${ISC_DHCP_VERSION}-2.3+deb11u2 export ISC_DHCP_VERSION ISC_DHCP_VERSION_FULL diff --git a/src/isc-dhcp/Makefile b/src/isc-dhcp/Makefile index 63e82e5c49aa..db0036c15c7c 100644 --- a/src/isc-dhcp/Makefile +++ b/src/isc-dhcp/Makefile @@ -10,7 +10,7 @@ $(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% : rm -rf ./isc-dhcp-$(ISC_DHCP_VERSION) # Get isc-dhcp release, debian files - dget http://deb.debian.org/debian/pool/main/i/isc-dhcp/isc-dhcp_$(ISC_DHCP_VERSION_FULL).dsc + dget -u http://deb.debian.org/debian/pool/main/i/isc-dhcp/isc-dhcp_$(ISC_DHCP_VERSION_FULL).dsc pushd ./isc-dhcp-$(ISC_DHCP_VERSION) # Create a git repository here for stg to apply patches From 11226b9ca476b42deb9551d631e18ea048332bf1 Mon Sep 17 00:00:00 2001 From: mssonicbld <79238446+mssonicbld@users.noreply.github.com> Date: Sun, 21 May 2023 20:38:55 +0800 Subject: [PATCH 112/193] [ci/build]: Upgrade SONiC package versions (#15174) --- .../versions-deb-bullseye | 3 +- .../versions-deb-bullseye-arm64 | 2 -- .../build-sonic-slave-bullseye/versions-py3 | 2 +- .../versions-py3-all-arm64 | 4 --- .../versions-py3-all-armhf | 2 +- .../build-sonic-slave-buster/versions-py3 | 2 +- files/build/versions/default/versions-docker | 24 +++++++-------- files/build/versions/default/versions-git | 10 +++---- files/build/versions/default/versions-mirror | 24 +++++++-------- files/build/versions/default/versions-web | 6 ++-- .../versions-deb-bullseye | 1 - .../versions-deb-bullseye | 3 +- .../versions-py3 | 4 +-- .../docker-config-engine-buster/versions-py3 | 4 +-- .../docker-dhcp-relay/versions-deb-bullseye | 4 +-- .../versions-deb-bullseye | 2 +- .../docker-orchagent/versions-deb-bullseye | 2 +- .../versions-deb-bullseye | 3 +- .../dockers/docker-ptf/versions-deb-buster | 22 +++++++------- .../versions/dockers/docker-ptf/versions-py2 | 1 + .../versions-deb-bullseye | 2 +- .../dockers/docker-snmp/versions-deb-bullseye | 2 +- .../versions/dockers/docker-snmp/versions-py3 | 2 +- .../docker-sonic-mgmt-framework/versions-py3 | 8 ++--- .../dockers/docker-sonic-vs/versions-py3 | 8 ++--- .../versions-deb-bullseye | 2 +- .../versions-deb-bullseye | 2 +- .../docker-syncd-mlnx/versions-deb-bullseye | 2 +- .../versions-deb-bullseye-armhf | 2 +- .../versions-deb-bullseye | 30 ++++++++----------- .../versions-deb-bullseye-arm64 | 13 ++------ .../versions-deb-bullseye-armhf | 13 ++------ .../dockers/sonic-slave-bullseye/versions-py3 | 4 +-- .../sonic-slave-buster/versions-deb-buster | 30 +++++++++---------- .../dockers/sonic-slave-buster/versions-py3 | 4 +-- .../versions/host-image/versions-deb-bullseye | 16 +++++----- .../host-image/versions-deb-bullseye-arm64 | 5 ++++ .../host-image/versions-deb-bullseye-armhf | 5 +--- files/build/versions/host-image/versions-py3 | 13 ++++---- 39 files changed, 132 insertions(+), 156 deletions(-) delete mode 100644 files/build/versions/build/build-sonic-slave-bullseye/versions-py3-all-arm64 diff --git a/files/build/versions/build/build-sonic-slave-bullseye/versions-deb-bullseye b/files/build/versions/build/build-sonic-slave-bullseye/versions-deb-bullseye index a62518ca04bc..89871050e3ae 100644 --- a/files/build/versions/build/build-sonic-slave-bullseye/versions-deb-bullseye +++ b/files/build/versions/build/build-sonic-slave-bullseye/versions-deb-bullseye @@ -1,7 +1,7 @@ applibs==1.mlnx.4.5.4206 applibs-dev==1.mlnx.4.5.4206 iproute2-dev==1.mlnx.4.5.4206 -isc-dhcp-relay==4.4.1-2.3+deb11u1 +isc-dhcp-relay==4.4.1-2.3+deb11u2 kernel-mft-dkms==4.22.1-15 libhiredis-dev==0.14.0-3~bpo9+1 libhiredis0.14==0.14.0-3~bpo9+1 @@ -21,7 +21,6 @@ libsairedis==1.0.0 libsairedis-dev==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 libtac-dev==1.4.1-1 diff --git a/files/build/versions/build/build-sonic-slave-bullseye/versions-deb-bullseye-arm64 b/files/build/versions/build/build-sonic-slave-bullseye/versions-deb-bullseye-arm64 index 3f9e16d7fe7d..5aa489f5de91 100644 --- a/files/build/versions/build/build-sonic-slave-bullseye/versions-deb-bullseye-arm64 +++ b/files/build/versions/build/build-sonic-slave-bullseye/versions-deb-bullseye-arm64 @@ -1,3 +1 @@ -libnl-3-200==3.5.0-1 -libnl-route-3-200==3.5.0-1 linux-headers-5.10.0-18-2-arm64==5.10.140-1 \ No newline at end of file diff --git a/files/build/versions/build/build-sonic-slave-bullseye/versions-py3 b/files/build/versions/build/build-sonic-slave-bullseye/versions-py3 index 89476acaf3c1..a15ce5500f47 100644 --- a/files/build/versions/build/build-sonic-slave-bullseye/versions-py3 +++ b/files/build/versions/build/build-sonic-slave-bullseye/versions-py3 @@ -2,7 +2,7 @@ blessed==1.20.0 charset-normalizer==3.1.0 click-log==0.4.0 colorful==0.5.5 -docker==6.0.1 +docker==6.1.2 docker-image-py==0.1.12 enlighten==1.11.2 filelock==3.12.0 diff --git a/files/build/versions/build/build-sonic-slave-bullseye/versions-py3-all-arm64 b/files/build/versions/build/build-sonic-slave-bullseye/versions-py3-all-arm64 deleted file mode 100644 index 5466f6dff37a..000000000000 --- a/files/build/versions/build/build-sonic-slave-bullseye/versions-py3-all-arm64 +++ /dev/null @@ -1,4 +0,0 @@ -bitarray==1.5.3 -click==7.0 -requests==2.29.0 -zipp==1.2.0 \ No newline at end of file diff --git a/files/build/versions/build/build-sonic-slave-bullseye/versions-py3-all-armhf b/files/build/versions/build/build-sonic-slave-bullseye/versions-py3-all-armhf index 5466f6dff37a..2c38507f3e6d 100644 --- a/files/build/versions/build/build-sonic-slave-bullseye/versions-py3-all-armhf +++ b/files/build/versions/build/build-sonic-slave-bullseye/versions-py3-all-armhf @@ -1,4 +1,4 @@ bitarray==1.5.3 click==7.0 -requests==2.29.0 +requests==2.30.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 index e87984e0366b..3a40efee2d2d 100644 --- a/files/build/versions/build/build-sonic-slave-buster/versions-py3 +++ b/files/build/versions/build/build-sonic-slave-buster/versions-py3 @@ -4,7 +4,7 @@ click==7.0 click-log==0.4.0 colorful==0.5.5 dbus-python==1.3.2 -docker==6.0.1 +docker==6.1.2 docker-image-py==0.1.12 enlighten==1.11.2 filelock==3.12.0 diff --git a/files/build/versions/default/versions-docker b/files/build/versions/default/versions-docker index a5b33cfde3ef..aa765a2347d1 100644 --- a/files/build/versions/default/versions-docker +++ b/files/build/versions/default/versions-docker @@ -1,12 +1,12 @@ -amd64:amd64/debian:bullseye==sha256:4effa16ae79ab36347d55ebb6bb4aad411077b72ad735054e684b3eeba373a35 -amd64:amd64/debian:buster==sha256:2803ab27dfe4f2e23b58d351e80e8d433942b6fb830225e6d034098ed450a169 -amd64:debian:bullseye==sha256:0a78ed641b76252739e28ebbbe8cdbd80dc367fba4502565ca839e5803cfd86e -amd64:debian:buster==sha256:173f0b19d2ac5ee17194dbe9a888a4a617dbf905ee666c9e780afad55eaf1d8c -arm64:arm64v8/debian:bullseye==sha256:c0f6422141bb031238126fbd535c0df24db4252a2d9876216a94082df74c8fda -arm64:arm64v8/debian:buster==sha256:55cd39723a057f730e9c33487fea9fe151bbe86dce51e92a73ccfd12206a1f43 -arm64:debian:bullseye==sha256:0a78ed641b76252739e28ebbbe8cdbd80dc367fba4502565ca839e5803cfd86e -arm64:debian:buster==sha256:173f0b19d2ac5ee17194dbe9a888a4a617dbf905ee666c9e780afad55eaf1d8c -armhf:arm32v7/debian:bullseye==sha256:ab0ce510343d33415fc4eaea0102da2d24cb720b185aaee0b411c48a07abb0de -armhf:arm32v7/debian:buster==sha256:3e45d273ad15d7b648212c8faa5e236f6fdc694af7272b8c4bd25a5d90c27fe1 -armhf:debian:bullseye==sha256:0a78ed641b76252739e28ebbbe8cdbd80dc367fba4502565ca839e5803cfd86e -armhf:debian:buster==sha256:173f0b19d2ac5ee17194dbe9a888a4a617dbf905ee666c9e780afad55eaf1d8c \ No newline at end of file +amd64:amd64/debian:bullseye==sha256:32888a3c745e38e72a5f49161afc7bb52a263b8f5ea1b3b4a6af537678f29491 +amd64:amd64/debian:buster==sha256:ebc58102f66492508f6d0f0c5164978afbe27f4a69bd3431ed8bb015c82a8b80 +amd64:debian:bullseye==sha256:63d62ae233b588d6b426b7b072d79d1306bfd02a72bff1fc045b8511cc89ee09 +amd64:debian:buster==sha256:cca6bcced970f7634197ff1821aabb452024eb437958ab98bfc146ece96969c6 +arm64:arm64v8/debian:bullseye==sha256:ffc0fb46ea2b4c6e5462896ab380db366d1f142e565a0bfae4f91d0b511baae3 +arm64:arm64v8/debian:buster==sha256:4db99637cd48a7181532cbd61a0da9295ae135ac590f1948fea5cd7c9acfab0b +arm64:debian:bullseye==sha256:63d62ae233b588d6b426b7b072d79d1306bfd02a72bff1fc045b8511cc89ee09 +arm64:debian:buster==sha256:cca6bcced970f7634197ff1821aabb452024eb437958ab98bfc146ece96969c6 +armhf:arm32v7/debian:bullseye==sha256:b0f334e3bc529853a0fad8d2b5d85476d0316bff06ab5328d4628f90a7a789ab +armhf:arm32v7/debian:buster==sha256:9606bc9689ace2b3958d23babcf39a7bbcbebdc3ff99b9050014558273a95e4a +armhf:debian:bullseye==sha256:63d62ae233b588d6b426b7b072d79d1306bfd02a72bff1fc045b8511cc89ee09 +armhf:debian:buster==sha256:cca6bcced970f7634197ff1821aabb452024eb437958ab98bfc146ece96969c6 \ No newline at end of file diff --git a/files/build/versions/default/versions-git b/files/build/versions/default/versions-git index e3130d82d92e..af630e3e72f4 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==1398e4fc6999ef6423626c782599e88bc7fcb5fb +https://chromium.googlesource.com/chromium/tools/depot_tools.git==4d73c057d82ac5994d992f0b1f57ca6d513c3554 https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f https://github.com/CESNET/libyang.git==9a4e5b2ce30b9696116d6e654ee55caab5aafed8 https://github.com/daveolson53/audisp-tacplus.git==559c9f22edd4f2dea0ecedffb3ad9502b12a75b6 https://github.com/daveolson53/libnss-tacplus.git==19008ab68d9d504aa58eb34d5f564755a1613b8b https://github.com/dyninc/OpenBFDD.git==e35f43ad8d2b3f084e96a84c392528a90d05a287 -https://github.com/flashrom/flashrom.git==1776bb46ba6ea3d1ab2ec3f0cd88158aabed7400 -https://github.com/FreeRADIUS/freeradius-server.git==9c146d29e07513ace9db29d197c2596a47986552 +https://github.com/flashrom/flashrom.git==0f541c216ad1c2ed3587353f4122318809e53174 +https://github.com/FreeRADIUS/freeradius-server.git==433970a3ed074e101da488f0ec6b349daeac9f2e https://github.com/FreeRADIUS/pam_radius.git==8d373539bb9f13b0abfe8bcae0095a930a00fad0 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==9dbae444204a2c27b33be698ce497d55926b8893 https://github.com/Mellanox/libpsample.git==62bb27d9a49424e45191eee81df7ce0d8c74e774 -https://github.com/opencomputeproject/SAI.git==554852e762f07ccb39db88ff2217d9a540db14fa +https://github.com/opencomputeproject/SAI.git==c4ff21fda73be53d4e5b789bc933df96ddfea651 https://github.com/p4lang/scapy-vxlan.git==85ffe83da156568ee47a0750f638227e6e1d7479 -https://github.com/sflow/host-sflow==71a250f56c6f101d6f3821827e5de19086f00b55 +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 78c0a752b8fd..8e763427ea84 100644 --- a/files/build/versions/default/versions-mirror +++ b/files/build/versions/default/versions-mirror @@ -1,15 +1,15 @@ deb.nodesource.com_node%5f14.x_dists_bullseye==2023-02-17T00:35:28Z deb.nodesource.com_node%5f14.x_dists_buster==2023-02-17T00:35:28Z -debian==20230502T000201Z -debian-security==20230502T000201Z -download.docker.com_linux_debian_dists_bullseye==2023-04-28T15:03:42Z -download.docker.com_linux_debian_dists_buster==2023-04-28T15:03:42Z +debian==20230521T000208Z +debian-security==20230521T000209Z +download.docker.com_linux_debian_dists_bullseye==2023-05-19T22:46:29Z +download.docker.com_linux_debian_dists_buster==2023-05-19T22:46:29Z packages.microsoft.com_repos_sonic-dev_dists_jessie==2022-10-31T19:34:29Z -packages.trafficmanager.net_snapshot_debian-security_20230502T000201Z_dists_bullseye-security==2023-05-01T17:44:43Z -packages.trafficmanager.net_snapshot_debian-security_20230502T000201Z_dists_buster_updates==2023-05-01T17:44:44Z -packages.trafficmanager.net_snapshot_debian_20230502T000201Z_dists_bullseye==2023-04-29T09:31:02Z -packages.trafficmanager.net_snapshot_debian_20230502T000201Z_dists_bullseye-backports==2023-05-01T20:14:55Z -packages.trafficmanager.net_snapshot_debian_20230502T000201Z_dists_bullseye-updates==2023-05-01T20:14:55Z -packages.trafficmanager.net_snapshot_debian_20230502T000201Z_dists_buster==2022-09-10T11:30:54Z -packages.trafficmanager.net_snapshot_debian_20230502T000201Z_dists_buster-backports==2023-05-01T20:14:55Z -packages.trafficmanager.net_snapshot_debian_20230502T000201Z_dists_buster-updates==2023-05-01T20:14:55Z \ No newline at end of file +packages.trafficmanager.net_snapshot_debian-security_20230521T000209Z_dists_bullseye-security==2023-05-20T20:52:21Z +packages.trafficmanager.net_snapshot_debian-security_20230521T000209Z_dists_buster_updates==2023-05-20T20:52:21Z +packages.trafficmanager.net_snapshot_debian_20230521T000208Z_dists_bullseye==2023-04-29T09:31:02Z +packages.trafficmanager.net_snapshot_debian_20230521T000208Z_dists_bullseye-backports==2023-05-20T20:10:57Z +packages.trafficmanager.net_snapshot_debian_20230521T000208Z_dists_bullseye-updates==2023-05-20T20:10:57Z +packages.trafficmanager.net_snapshot_debian_20230521T000208Z_dists_buster==2022-09-10T11:30:54Z +packages.trafficmanager.net_snapshot_debian_20230521T000208Z_dists_buster-backports==2023-05-20T20:10:57Z +packages.trafficmanager.net_snapshot_debian_20230521T000208Z_dists_buster-updates==2023-05-20T20:10:57Z \ No newline at end of file diff --git a/files/build/versions/default/versions-web b/files/build/versions/default/versions-web index 14da17b47fd2..a4ea405623d6 100644 --- a/files/build/versions/default/versions-web +++ b/files/build/versions/default/versions-web @@ -10,8 +10,8 @@ http://deb.debian.org/debian/pool/main/i/iproute2/iproute2_5.10.0.orig.tar.xz==f 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/i/isc-dhcp/isc-dhcp_4.4.1-2.3+deb11u1.debian.tar.xz==8c3640097a1b4cc59e927badbd45b3f0 -http://deb.debian.org/debian/pool/main/i/isc-dhcp/isc-dhcp_4.4.1-2.3+deb11u1.dsc==1af0a028a9655235ec3372332f94a19c +http://deb.debian.org/debian/pool/main/i/isc-dhcp/isc-dhcp_4.4.1-2.3+deb11u2.debian.tar.xz==126081bf0da3c1e5ca722edeb5a3aed1 +http://deb.debian.org/debian/pool/main/i/isc-dhcp/isc-dhcp_4.4.1-2.3+deb11u2.dsc==c35e75da314bce54f53b2e0847c6bc9b http://deb.debian.org/debian/pool/main/i/isc-dhcp/isc-dhcp_4.4.1.orig.tar.gz==dbcba5108f659278200218ac0847ce3f http://deb.debian.org/debian/pool/main/l/lm-sensors/lm-sensors_3.6.0-7.debian.tar.xz==8eab143a53c71c03695ebc78e4b5ed36 http://deb.debian.org/debian/pool/main/l/lm-sensors/lm-sensors_3.6.0-7.dsc==983d68fb43001bb2fc94862bc4bc2e2b @@ -44,7 +44,7 @@ https://github.com/CentecNetworks/sonic-binaries/raw/master/amd64/third_party/ad https://github.com/CentecNetworks/sonic-binaries/raw/master/amd64/third_party/advantech/libSUSI-4.00.so.1==393a94b0abba146777e276e1febe0cb0 https://github.com/CentecNetworks/sonic-binaries/raw/master/arm64/sai/libsai_1.9.1-0_arm64.deb==c354c766cc763a5af621a88637b9e126 https://github.com/CumulusNetworks/ifupdown2/archive/3.0.0-1.tar.gz==755459b3a58fbc11625336846cea7420 -https://github.com/Marvell-switching/sonic-marvell-binaries/raw/master/armhf/sai-plugin/mrvllibsai_1.10.2-3_armhf.deb==13728edb8ddb2cede3244d031580a468 +https://github.com/Marvell-switching/sonic-marvell-binaries/raw/master/armhf/sai-plugin/mrvllibsai_1.10.2-4_armhf.deb==e11d749b36531486044e47292a809662 https://github.com/Mellanox/Spectrum-SDK-Drivers-SONiC-Bins/releases/download/fw-2010.4204/fw-SPC-rel-13_2010_4204-EVB.mfa==c511454113db7cbf01a5bc898250cf8d https://github.com/Mellanox/Spectrum-SDK-Drivers-SONiC-Bins/releases/download/fw-2010.4204/fw-SPC2-rel-29_2010_4204-EVB.mfa==eb004feb6008dc7f109e42d36f372fc6 https://github.com/Mellanox/Spectrum-SDK-Drivers-SONiC-Bins/releases/download/fw-2010.4204/fw-SPC3-rel-30_2010_4204-EVB.mfa==9099a37a1efb22b6dce535ad2e1528d4 diff --git a/files/build/versions/dockers/docker-base-bullseye/versions-deb-bullseye b/files/build/versions/dockers/docker-base-bullseye/versions-deb-bullseye index 155d079c9110..26a7ad7d7b23 100644 --- a/files/build/versions/dockers/docker-base-bullseye/versions-deb-bullseye +++ b/files/build/versions/dockers/docker-base-bullseye/versions-deb-bullseye @@ -49,7 +49,6 @@ libsqlite3-0==3.34.1-3 libssh2-1==1.9.0-2 libssl-dev==1.1.1n-0+deb11u4+fips libssl1.1==1.1.1n-0+deb11u4+fips -libtinfo6==6.2+20201114-2+deb11u1 libwrap0==7.6.q-31 libxtables12==1.8.7-1 libzmq5==4.3.4-1 diff --git a/files/build/versions/dockers/docker-config-engine-bullseye/versions-deb-bullseye b/files/build/versions/dockers/docker-config-engine-bullseye/versions-deb-bullseye index 1dbd24b120d5..efd26e8f6ea0 100644 --- a/files/build/versions/dockers/docker-config-engine-bullseye/versions-deb-bullseye +++ b/files/build/versions/dockers/docker-config-engine-bullseye/versions-deb-bullseye @@ -14,7 +14,6 @@ gcc-10==10.2.1-6 libasan6==10.2.1-6 libbinutils==2.35.2-2 libc-dev-bin==2.31-13+deb11u6 -libc6==2.31-13+deb11u6 libc6-dev==2.31-13+deb11u6 libcc1-0==10.2.1-6 libcrypt-dev==1:4.4.18-4 @@ -50,7 +49,7 @@ libtsan0==10.2.1-6 libubsan1==10.2.1-6 libyang==1.0.73 libyang-cpp==1.0.73 -linux-libc-dev==5.10.178-3 +linux-libc-dev==5.10.179-1 make==4.3-4.1 patch==2.7.6-7 python3-dev==3.9.2-3 diff --git a/files/build/versions/dockers/docker-config-engine-bullseye/versions-py3 b/files/build/versions/dockers/docker-config-engine-bullseye/versions-py3 index e88c5d2c278b..ab9ffb3c8234 100644 --- a/files/build/versions/dockers/docker-config-engine-bullseye/versions-py3 +++ b/files/build/versions/dockers/docker-config-engine-bullseye/versions-py3 @@ -9,8 +9,8 @@ netaddr==0.8.0 pyang==2.5.3 pyangbind==0.8.1 pyyaml==5.4.1 -redis==4.5.4 +redis==4.5.5 redis-dump-load==1.1 -regex==2023.3.23 +regex==2023.5.5 six==1.16.0 xmltodict==0.12.0 \ 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 293cd59cc325..c744de056bb9 100644 --- a/files/build/versions/dockers/docker-config-engine-buster/versions-py3 +++ b/files/build/versions/dockers/docker-config-engine-buster/versions-py3 @@ -10,9 +10,9 @@ netaddr==0.8.0 pyang==2.5.3 pyangbind==0.8.1 pyyaml==5.4.1 -redis==4.5.4 +redis==4.5.5 redis-dump-load==1.1 -regex==2022.10.31 +regex==2023.5.5 six==1.16.0 typing_extensions==4.5.0 xmltodict==0.12.0 diff --git a/files/build/versions/dockers/docker-dhcp-relay/versions-deb-bullseye b/files/build/versions/dockers/docker-dhcp-relay/versions-deb-bullseye index bdc70c7e1d0d..741ce7a732e7 100644 --- a/files/build/versions/dockers/docker-dhcp-relay/versions-deb-bullseye +++ b/files/build/versions/dockers/docker-dhcp-relay/versions-deb-bullseye @@ -1,7 +1,7 @@ gdb==10.1-1.7 gdbserver==10.1-1.7 -isc-dhcp-relay==4.4.1-2.3+deb11u1 -isc-dhcp-relay-dbgsym==4.4.1-2.3+deb11u1 +isc-dhcp-relay==4.4.1-2.3+deb11u2 +isc-dhcp-relay-dbgsym==4.4.1-2.3+deb11u2 libbabeltrace1==1.5.8-1+b3 libboost-regex1.74.0==1.74.0-9 libboost-thread1.74.0==1.74.0-9 diff --git a/files/build/versions/dockers/docker-gbsyncd-broncos/versions-deb-bullseye b/files/build/versions/dockers/docker-gbsyncd-broncos/versions-deb-bullseye index 97b52d50f8d9..3f9319d30b8b 100644 --- a/files/build/versions/dockers/docker-gbsyncd-broncos/versions-deb-bullseye +++ b/files/build/versions/dockers/docker-gbsyncd-broncos/versions-deb-bullseye @@ -29,7 +29,7 @@ libsource-highlight4v5==3.1.9-3+b1 libswsscommon-dbgsym==1.0.0 libtirpc-dev==1.3.1-1+deb11u1 libunwind8==1.3.2-2 -linux-libc-dev==5.10.178-3 +linux-libc-dev==5.10.179-1 openssh-client==1:8.4p1-5+deb11u1 sshpass==1.09-1+b1 strace==5.10-1 diff --git a/files/build/versions/dockers/docker-orchagent/versions-deb-bullseye b/files/build/versions/dockers/docker-orchagent/versions-deb-bullseye index 841f33da39e2..e27fe5135232 100644 --- a/files/build/versions/dockers/docker-orchagent/versions-deb-bullseye +++ b/files/build/versions/dockers/docker-orchagent/versions-deb-bullseye @@ -66,7 +66,7 @@ libtirpc-dev==1.3.1-1+deb11u1 libtsan0==10.2.1-6 libubsan1==10.2.1-6 libunwind8==1.3.2-2 -linux-libc-dev==5.10.178-3 +linux-libc-dev==5.10.179-1 make==4.3-4.1 ndisc6==1.0.4-2 ndppd==0.2.5-6 diff --git a/files/build/versions/dockers/docker-platform-monitor/versions-deb-bullseye b/files/build/versions/dockers/docker-platform-monitor/versions-deb-bullseye index 1ecedb66cb69..fbe368bb1f0a 100644 --- a/files/build/versions/dockers/docker-platform-monitor/versions-deb-bullseye +++ b/files/build/versions/dockers/docker-platform-monitor/versions-deb-bullseye @@ -90,7 +90,6 @@ libthai0==0.1.28-3 libtirpc-dev==1.3.1-1+deb11u1 libtsan0==10.2.1-6 libubsan1==10.2.1-6 -libudev1==247.3-7+deb11u2 libunwind8==1.3.2-2 libx11-6==2:1.7.2-1 libx11-data==2:1.7.2-1 @@ -102,7 +101,7 @@ libxdmcp6==1:1.1.2-3 libxext6==2:1.3.3-1.1 libxml2==2.9.10+dfsg-6.7+deb11u4 libxrender1==1:0.9.10-1 -linux-libc-dev==5.10.178-3 +linux-libc-dev==5.10.179-1 lm-sensors==1:3.6.0-7 lm-sensors-dbgsym==1:3.6.0-7 make==4.3-4.1 diff --git a/files/build/versions/dockers/docker-ptf/versions-deb-buster b/files/build/versions/dockers/docker-ptf/versions-deb-buster index 21e127d24279..e9143ddc94b4 100644 --- a/files/build/versions/dockers/docker-ptf/versions-deb-buster +++ b/files/build/versions/dockers/docker-ptf/versions-deb-buster @@ -69,9 +69,9 @@ libasan5==8.3.0-6 libassuan0==2.5.2-1 libatomic1==8.3.0-6 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 libbabeltrace1==1.5.6-2+deb10u1 libbinutils==2.31.1-16 libblas3==3.8.0-2 @@ -192,7 +192,7 @@ libjsoncpp1==1.7.4-3 libk5crypto3==1.17-3+deb10u5 libkeyutils1==1.6-6 libkmod2==26-1 -libkpathsea6==2018.20181218.49446-1 +libkpathsea6==2018.20181218.49446-1+deb10u1 libkrb5-3==1.17-3+deb10u5 libkrb5support0==1.17-3+deb10u5 libksba8==1.3.5-2+deb10u2 @@ -254,7 +254,7 @@ libpopt0==1.16-12 libpotrace0==1.15-1 libprocps7==2:3.3.15-2 libpsl5==0.20.2-2 -libptexenc1==2018.20181218.49446-1 +libptexenc1==2018.20181218.49446-1+deb10u1 libpython-dev==2.7.16-1 libpython-stdlib==2.7.16-1 libpython2-dev==2.7.16-1 @@ -288,7 +288,7 @@ libssh2-1==1.8.0-2.1 libssl-dev==1.1.1n-0+deb10u4 libssl1.1==1.1.1n-0+deb10u4 libstdc++-8-dev==8.3.0-6 -libsynctex2==2018.20181218.49446-1 +libsynctex2==2018.20181218.49446-1+deb10u1 libsystemd0==241-7~deb10u9 libtacacs+1==4.0.4.27a-3 libtasn1-6==4.13-3+deb10u1 @@ -297,9 +297,9 @@ libteam-utils==1.28-1 libteam5==1.28-1 libteamdctl0==1.28-1 libteckit0==2.5.8+ds2-5 -libtexlua52==2018.20181218.49446-1 -libtexlua53==2018.20181218.49446-1 -libtexluajit2==2018.20181218.49446-1 +libtexlua52==2018.20181218.49446-1+deb10u1 +libtexlua53==2018.20181218.49446-1+deb10u1 +libtexluajit2==2018.20181218.49446-1+deb10u1 libtext-iconv-perl==1.7-5+b7 libthai-data==0.1.28-2 libthai0==0.1.28-2 @@ -478,13 +478,13 @@ tcpdump==4.9.3-1~deb10u2 telnet==0.17-41.2 tex-common==6.11 texlive-base==2018.20190227-2 -texlive-binaries==2018.20181218.49446-1 +texlive-binaries==2018.20181218.49446-1+deb10u1 texlive-latex-base==2018.20190227-2 tk8.6-blt2.5==2.5.3+dfsg-4 tmux==2.8-3+deb10u1 traceroute==1:2.1.0-2 ttf-bitstream-vera==1.10-8 -tzdata==2021a-0+deb10u10 +tzdata==2021a-0+deb10u11 ucf==3.0038+nmu1 unzip==6.0-23+deb10u3 vim==2:8.1.0875-5+deb10u4 diff --git a/files/build/versions/dockers/docker-ptf/versions-py2 b/files/build/versions/dockers/docker-ptf/versions-py2 index 641047569664..f0672ed6fd5a 100644 --- a/files/build/versions/dockers/docker-ptf/versions-py2 +++ b/files/build/versions/dockers/docker-ptf/versions-py2 @@ -62,6 +62,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-mlnx/versions-deb-bullseye b/files/build/versions/dockers/docker-saiserverv2-mlnx/versions-deb-bullseye index 6d15f2127efe..cc17560d7004 100644 --- a/files/build/versions/dockers/docker-saiserverv2-mlnx/versions-deb-bullseye +++ b/files/build/versions/dockers/docker-saiserverv2-mlnx/versions-deb-bullseye @@ -89,7 +89,7 @@ libuv1==1.40.0-2 libxml2==2.9.10+dfsg-6.7+deb11u4 libxml2-utils==2.9.10+dfsg-6.7+deb11u4 libxslt1.1==1.1.34-4+deb11u1 -linux-libc-dev==5.10.178-3 +linux-libc-dev==5.10.179-1 mailcap==3.69 make==4.3-4.1 mft==4.22.1-15 diff --git a/files/build/versions/dockers/docker-snmp/versions-deb-bullseye b/files/build/versions/dockers/docker-snmp/versions-deb-bullseye index 1493028db842..02bac1bd2f63 100644 --- a/files/build/versions/dockers/docker-snmp/versions-deb-bullseye +++ b/files/build/versions/dockers/docker-snmp/versions-deb-bullseye @@ -59,7 +59,7 @@ libtirpc-dev==1.3.1-1+deb11u1 libtsan0==10.2.1-6 libubsan1==10.2.1-6 libunwind8==1.3.2-2 -linux-libc-dev==5.10.178-3 +linux-libc-dev==5.10.179-1 locales==2.31-13+deb11u6 make==4.3-4.1 openssh-client==1:8.4p1-5+deb11u1 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-py3 b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3 index bfa8c9e5d03d..837df5b61daa 100644 --- a/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3 +++ b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3 @@ -4,8 +4,8 @@ charset-normalizer==3.1.0 click==8.1.3 clickclick==20.10.2 connexion==2.7.0 -flask==2.2.4 -grpcio==1.54.0 +flask==2.2.5 +grpcio==1.54.2 grpcio-tools==1.20.0 idna==3.4 importlib-resources==5.12.0 @@ -18,10 +18,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.23.1 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 urllib3==1.26.5 diff --git a/files/build/versions/dockers/docker-sonic-vs/versions-py3 b/files/build/versions/dockers/docker-sonic-vs/versions-py3 index 8a04e4c4a524..ed59c949266f 100644 --- a/files/build/versions/dockers/docker-sonic-vs/versions-py3 +++ b/files/build/versions/dockers/docker-sonic-vs/versions-py3 @@ -1,11 +1,11 @@ blessed==1.20.0 -certifi==2022.12.7 +certifi==2023.5.7 charset-normalizer==3.1.0 click==7.0 click-log==0.4.0 colorful==0.5.5 dbus-python==1.3.2 -docker==6.0.1 +docker==6.1.2 docker-image-py==0.1.12 enlighten==1.11.2 filelock==3.12.0 @@ -25,13 +25,13 @@ pygments==2.15.1 pygobject==3.44.1 pyparsing==3.0.9 pyroute2==0.5.14 -requests==2.29.0 +requests==2.30.0 scapy==2.4.4 semantic-version==2.10.0 systemd-python==235 tabulate==0.8.2 toposort==1.6 -urllib3==1.26.15 +urllib3==2.0.2 wcwidth==0.2.6 websocket-client==1.5.1 www-authenticate==0.9.2 \ No newline at end of file diff --git a/files/build/versions/dockers/docker-syncd-brcm-dnx-rpc/versions-deb-bullseye b/files/build/versions/dockers/docker-syncd-brcm-dnx-rpc/versions-deb-bullseye index 6856113e7bfc..4ff318b3f620 100644 --- a/files/build/versions/dockers/docker-syncd-brcm-dnx-rpc/versions-deb-bullseye +++ b/files/build/versions/dockers/docker-syncd-brcm-dnx-rpc/versions-deb-bullseye @@ -55,7 +55,7 @@ libtsan0==10.2.1-6 libubsan1==10.2.1-6 libuv1==1.40.0-2 libxml2==2.9.10+dfsg-6.7+deb11u4 -linux-libc-dev==5.10.178-3 +linux-libc-dev==5.10.179-1 mailcap==3.69 make==4.3-4.1 mime-support==3.66 diff --git a/files/build/versions/dockers/docker-syncd-brcm-rpc/versions-deb-bullseye b/files/build/versions/dockers/docker-syncd-brcm-rpc/versions-deb-bullseye index 6856113e7bfc..4ff318b3f620 100644 --- a/files/build/versions/dockers/docker-syncd-brcm-rpc/versions-deb-bullseye +++ b/files/build/versions/dockers/docker-syncd-brcm-rpc/versions-deb-bullseye @@ -55,7 +55,7 @@ libtsan0==10.2.1-6 libubsan1==10.2.1-6 libuv1==1.40.0-2 libxml2==2.9.10+dfsg-6.7+deb11u4 -linux-libc-dev==5.10.178-3 +linux-libc-dev==5.10.179-1 mailcap==3.69 make==4.3-4.1 mime-support==3.66 diff --git a/files/build/versions/dockers/docker-syncd-mlnx/versions-deb-bullseye b/files/build/versions/dockers/docker-syncd-mlnx/versions-deb-bullseye index 9ea0234fe0c7..1adbeae520aa 100644 --- a/files/build/versions/dockers/docker-syncd-mlnx/versions-deb-bullseye +++ b/files/build/versions/dockers/docker-syncd-mlnx/versions-deb-bullseye @@ -44,7 +44,7 @@ libswsscommon-dbgsym==1.0.0 libtirpc-dev==1.3.1-1+deb11u1 libunwind8==1.3.2-2 libxml2==2.9.10+dfsg-6.7+deb11u4 -linux-libc-dev==5.10.178-3 +linux-libc-dev==5.10.179-1 mailcap==3.69 mft==4.22.1-15 mime-support==3.66 diff --git a/files/build/versions/dockers/docker-syncd-mrvl/versions-deb-bullseye-armhf b/files/build/versions/dockers/docker-syncd-mrvl/versions-deb-bullseye-armhf index 44f115ddbb69..92d7997901bb 100644 --- a/files/build/versions/dockers/docker-syncd-mrvl/versions-deb-bullseye-armhf +++ b/files/build/versions/dockers/docker-syncd-mrvl/versions-deb-bullseye-armhf @@ -25,7 +25,7 @@ libsensors4-dev==1:3.6.0-7 libsensors5==1:3.6.0-7 mailcap==3.69 mime-support==3.66 -mrvllibsai==1.10.2-3 +mrvllibsai==1.10.2-4 nfs-common==1:1.3.4-6 pkg-config==0.29.2-1 python-dev-is-python2==2.7.18-9 diff --git a/files/build/versions/dockers/sonic-slave-bullseye/versions-deb-bullseye b/files/build/versions/dockers/sonic-slave-bullseye/versions-deb-bullseye index 2375edc180d4..4c46dd27cdf9 100644 --- a/files/build/versions/dockers/sonic-slave-bullseye/versions-deb-bullseye +++ b/files/build/versions/dockers/sonic-slave-bullseye/versions-deb-bullseye @@ -95,7 +95,7 @@ docbook-utils==0.6.14-3.4 docbook-xml==4.5-9 docker-ce==5:20.10.14~3-0~debian-bullseye docker-ce-cli==5:20.10.14~3-0~debian-bullseye -docker-ce-rootless-extras==5:23.0.5-1~debian.11~bullseye +docker-ce-rootless-extras==5:24.0.1-1~debian.11~bullseye docker-scan-plugin==0.23.0~debian-bullseye docutils-common==0.16+dfsg-4 dosfstools==4.2-1 @@ -360,7 +360,6 @@ libc-ares2==1.17.1-1+deb11u2 libc-dev-bin==2.31-13+deb11u6 libc-devtools==2.31-13+deb11u6 libc-l10n==2.31-13+deb11u6 -libc6==2.31-13+deb11u6 libc6-dbg==2.31-13+deb11u6 libc6-dev==2.31-13+deb11u6 libc6-dev-i386==2.31-13+deb11u6 @@ -745,7 +744,7 @@ libkadm5clnt-mit12==1.18.3-6+deb11u3 libkadm5srv-mit12==1.18.3-6+deb11u3 libkdb5-10==1.18.3-6+deb11u3 libkmod2==28-1 -libkpathsea6==2020.20200327.54578-7 +libkpathsea6==2020.20200327.54578-7+deb11u1 libkrb5-dev==1.18.3-6+deb11u3 libksba8==1.5.0-3+deb11u2 liblab-gamut1==2.42.2-5 @@ -992,7 +991,7 @@ libproxy1v5==0.4.17-1 libpsl5==0.21.0-1.2 libpsm-infinipath1==3.3+20.604758e7-6.1 libpsm2-2==11.2.185-1 -libptexenc1==2020.20200327.54578-7 +libptexenc1==2020.20200327.54578-7+deb11u1 libpthread-stubs0-dev==0.4-1 libpulse0==14.2-2 libpython2-dev==2.7.18-3 @@ -1125,11 +1124,10 @@ libsurefire-java==2.22.3-1 libswitch-perl==2.17-2.1 libswresample3==7:4.3.6-0+deb11u1 libswscale5==7:4.3.6-0+deb11u1 -libsynctex2==2020.20200327.54578-7 +libsynctex2==2020.20200327.54578-7+deb11u1 libsys-cpuaffinity-perl==1.13~03-1 libsys-hostname-long-perl==1.5-2 libsystemd-dev==247.3-7+deb11u2 -libsystemd0==247.3-7+deb11u2 libtag1v5==1.11.1+dfsg.1-3 libtag1v5-vanilla==1.11.1+dfsg.1-3 libtask-weaken-perl==1.06-1 @@ -1138,8 +1136,8 @@ libtcmalloc-minimal4==2.8.1-1 libteckit0==2.5.10+ds1-3 libtemplate-perl==2.27-1+b3 libterm-readkey-perl==2.38-1+b2 -libtexlua53==2020.20200327.54578-7 -libtexluajit2==2020.20200327.54578-7 +libtexlua53==2020.20200327.54578-7+deb11u1 +libtexluajit2==2020.20200327.54578-7+deb11u1 libtext-charwidth-perl==0.04-10+b1 libtext-glob-perl==0.11-1 libtext-hogan-perl==2.03-1 @@ -1159,7 +1157,6 @@ libtiff5==4.2.0-1+deb11u4 libtime-duration-perl==1.21-1 libtime-moment-perl==0.44-1+b3 libtimedate-perl==2.3300-2 -libtinfo6==6.2+20201114-2+deb11u1 libtinyxml2-8==8.0.0+dfsg-2 libtinyxml2-dev==8.0.0+dfsg-2 libtirpc-dev==1.3.1-1+deb11u1 @@ -1176,7 +1173,6 @@ libubsan1==10.2.1-6 libuchardet0==0.0.7-1 libucx0==1.10.1~rc1+really.1.10.0-1 libudev-dev==247.3-7+deb11u2 -libudev1==247.3-7+deb11u2 libudfread0==1.1.1-1 libunbound8==1.13.1-1+deb11u1 libunicode-utf8-perl==0.62-1+b2 @@ -1368,12 +1364,12 @@ libzvbi0==0.2.35-18 libzzip-0-13==0.13.62-3.3+deb11u1 licensecheck==3.1.1-2 lintian==2.104.0 -linux-compiler-gcc-10-x86==5.10.178-3 -linux-headers-5.10.0-22-amd64==5.10.178-3 -linux-headers-5.10.0-22-common==5.10.178-3 -linux-headers-amd64==5.10.178-3 -linux-kbuild-5.10==5.10.178-3 -linux-libc-dev==5.10.178-3 +linux-compiler-gcc-10-x86==5.10.179-1 +linux-headers-5.10.0-23-amd64==5.10.179-1 +linux-headers-5.10.0-23-common==5.10.179-1 +linux-headers-amd64==5.10.179-1 +linux-kbuild-5.10==5.10.179-1 +linux-libc-dev==5.10.179-1 linuxdoc-tools==0.9.82-1 llvm-11==1:11.0.1-2 llvm-11-dev==1:11.0.1-2 @@ -1687,7 +1683,7 @@ tex-gyre==20180621-3.1 texi2html==1.82+dfsg1-6 texinfo==6.7.0.dfsg.2-6 texlive-base==2020.20210202-3 -texlive-binaries==2020.20200327.54578-7 +texlive-binaries==2020.20200327.54578-7+deb11u1 texlive-fonts-recommended==2020.20210202-3 texlive-formats-extra==2020.20210202-3 texlive-latex-base==2020.20210202-3 diff --git a/files/build/versions/dockers/sonic-slave-bullseye/versions-deb-bullseye-arm64 b/files/build/versions/dockers/sonic-slave-bullseye/versions-deb-bullseye-arm64 index 470ad88a9a5d..f32bcf2382c3 100644 --- a/files/build/versions/dockers/sonic-slave-bullseye/versions-deb-bullseye-arm64 +++ b/files/build/versions/dockers/sonic-slave-bullseye/versions-deb-bullseye-arm64 @@ -1,19 +1,15 @@ -base-files==11.1+deb11u7 binutils-aarch64-linux-gnu==2.35.2-2 binutils-arm-linux-gnueabihf==2.35.2-2 cpp-10-arm-linux-gnueabihf==10.2.1-6cross1 cpp-arm-linux-gnueabihf==4:10.2.1-1 dctrl-tools==2.24-3 -debian-archive-keyring==2021.1.1+deb11u1 dvipng==1.15-1.1 gcc-10-arm-linux-gnueabihf==10.2.1-6cross1 gcc-10-arm-linux-gnueabihf-base==10.2.1-6cross1 gcc-10-cross-base==10.2.1-6cross1 gcc-arm-linux-gnueabihf==4:10.2.1-1 -grep==3.6-1+deb11u1 libasan6-armhf-cross==10.2.1-6cross1 libatomic1-armhf-cross==10.2.1-6cross1 -libc-bin==2.31-13+deb11u6 libc6-armhf-cross==2.31-9cross4 libgcc-10-dev-armhf-cross==10.2.1-6cross1 libgcc-s1-armhf-cross==10.2.1-6cross1 @@ -21,9 +17,6 @@ libgomp1-armhf-cross==10.2.1-6cross1 libstdc++6-armhf-cross==10.2.1-6cross1 libubsan1-armhf-cross==10.2.1-6cross1 libxslt1-dev==1.1.34-4+deb11u1 -linux-headers-5.10.0-22-arm64==5.10.178-3 -linux-headers-arm64==5.10.178-3 -ncurses-base==6.2+20201114-2+deb11u1 -ncurses-bin==6.2+20201114-2+deb11u1 -nodejs==14.21.3-deb-1nodesource1 -tzdata==2021a-1+deb11u10 \ No newline at end of file +linux-headers-5.10.0-23-arm64==5.10.179-1 +linux-headers-arm64==5.10.179-1 +nodejs==14.21.3-deb-1nodesource1 \ No newline at end of file diff --git a/files/build/versions/dockers/sonic-slave-bullseye/versions-deb-bullseye-armhf b/files/build/versions/dockers/sonic-slave-bullseye/versions-deb-bullseye-armhf index 1a99d2f7582d..8b0437a29018 100644 --- a/files/build/versions/dockers/sonic-slave-bullseye/versions-deb-bullseye-armhf +++ b/files/build/versions/dockers/sonic-slave-bullseye/versions-deb-bullseye-armhf @@ -1,8 +1,6 @@ -base-files==11.1+deb11u7 binutils-arm-linux-gnueabihf==2.35.2-2 bubblewrap==0.4.1-3 dctrl-tools==2.24-3 -debian-archive-keyring==2021.1.1+deb11u1 doxygen==1.9.1-2 dvipng==1.15-1.1 faketime==0.9.8-9 @@ -11,8 +9,6 @@ gir1.2-poppler-0.18==20.09.0-3.1+deb11u1 gir1.2-rsvg-2.0==2.50.3+dfsg-1 golang-1.15-go==1.15.15-1~deb11u4 golang-1.15-src==1.15.15-1~deb11u4 -grep==3.6-1+deb11u1 -libc-bin==2.31-13+deb11u6 libclang-11-dev==1:11.0.1-2 libemail-date-format-perl==1.005-1.1 libfaketime==0.9.8-9 @@ -39,13 +35,11 @@ libxapian-dev==1.4.18-3+deb11u1 libxslt1-dev==1.1.34-4+deb11u1 libxstring-perl==0.005-1+b1 libyaml-tiny-perl==1.73-1 -linux-compiler-gcc-10-arm==5.10.178-3 -linux-headers-5.10.0-22-armmp==5.10.178-3 -linux-headers-armmp==5.10.178-3 +linux-compiler-gcc-10-arm==5.10.179-1 +linux-headers-5.10.0-23-armmp==5.10.179-1 +linux-headers-armmp==5.10.179-1 mat2==0.12.1-2+deb11u1 nasm==2.15.05-1 -ncurses-base==6.2+20201114-2+deb11u1 -ncurses-bin==6.2+20201114-2+deb11u1 nodejs==14.21.3-deb-1nodesource1 ps2eps==1.68+binaryfree-3 python3-cairo==1.16.2-4+b2 @@ -57,5 +51,4 @@ sassc==3.6.1+20201027-1 texlive-extra-utils==2020.20210202-3 texlive-font-utils==2020.20210202-3 texlive-luatex==2020.20210202-3 -tzdata==2021a-1+deb11u10 yui-compressor==2.4.8-2.1 \ No newline at end of file diff --git a/files/build/versions/dockers/sonic-slave-bullseye/versions-py3 b/files/build/versions/dockers/sonic-slave-bullseye/versions-py3 index 488cf2e439ff..2b2caa108c44 100644 --- a/files/build/versions/dockers/sonic-slave-bullseye/versions-py3 +++ b/files/build/versions/dockers/sonic-slave-bullseye/versions-py3 @@ -85,8 +85,8 @@ python-magic==0.4.20 pytz==2021.1 pyxdg==0.27 pyyaml==5.4.1 -redis==4.5.4 -regex==2023.3.23 +redis==4.5.5 +regex==2023.5.5 requests==2.25.1 roman==2.0.0 service-identity==18.1.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 76bac1f4b499..859f53823fc0 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 @@ -270,9 +270,9 @@ libaugeas0==1.11.0-3 libauparse-dev==1:2.8.4-3 libauparse0==1:2.8.4-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 @@ -721,7 +721,7 @@ libkadm5srv-mit11==1.17-3+deb10u5 libkdb5-9==1.17-3+deb10u5 libkeyutils1==1.6-6 libkmod2==26-1 -libkpathsea6==2018.20181218.49446-1 +libkpathsea6==2018.20181218.49446-1+deb10u1 libkrb5-3==1.17-3+deb10u5 libkrb5-dev==1.17-3+deb10u5 libkrb5support0==1.17-3+deb10u5 @@ -957,7 +957,7 @@ 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 +libptexenc1==2018.20181218.49446-1+deb10u1 libpthread-stubs0-dev==0.4-1 libpulse0==12.2-4+deb10u1 libpython-all-dev==2.7.16-1 @@ -1110,7 +1110,7 @@ libsurefire-java==2.22.1-1 libswitch-perl==2.17-2 libswresample3==7:4.1.10-0+deb10u1 libswscale5==7:4.1.10-0+deb10u1 -libsynctex2==2018.20181218.49446-1 +libsynctex2==2018.20181218.49446-1+deb10u1 libsys-hostname-long-perl==1.5-1 libsystemd-dev==241-7~deb10u9 libtag1v5==1.11.1+dfsg.1-0.3+deb10u1 @@ -1125,9 +1125,9 @@ libtemplate-perl==2.27-1+b1 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 +libtexlua52==2018.20181218.49446-1+deb10u1 +libtexlua53==2018.20181218.49446-1+deb10u1 +libtexluajit2==2018.20181218.49446-1+deb10u1 libtext-charwidth-perl==0.04-7.1+b1 libtext-glob-perl==0.10-1 libtext-iconv-perl==1.7-5+b7 @@ -1350,9 +1350,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.282-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-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 @@ -1514,7 +1514,7 @@ 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-ipaddress==1.0.17-1+deb10u1 python-isort==4.3.4+ds1-1.1 python-jinja2==2.10-2 python-keyring==17.1.1-1 @@ -1717,7 +1717,7 @@ 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-binaries==2018.20181218.49446-1+deb10u1 texlive-fonts-recommended==2018.20190227-2 texlive-formats-extra==2018.20190227-2 texlive-generic-recommended==2018.20190227-2 diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-py3 b/files/build/versions/dockers/sonic-slave-buster/versions-py3 index 23a376c78b53..f054c9df9781 100644 --- a/files/build/versions/dockers/sonic-slave-buster/versions-py3 +++ b/files/build/versions/dockers/sonic-slave-buster/versions-py3 @@ -63,8 +63,8 @@ python-magic==0.4.16 pytz==2019.1 pyxdg==0.25 pyyaml==5.4.1 -redis==4.5.4 -regex==2022.10.31 +redis==4.5.5 +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-bullseye b/files/build/versions/host-image/versions-deb-bullseye index 67dcd810658b..83be5264d5bd 100644 --- a/files/build/versions/host-image/versions-deb-bullseye +++ b/files/build/versions/host-image/versions-deb-bullseye @@ -305,9 +305,9 @@ libyang==1.0.73 libyang-cpp==1.0.73 linux-base==4.6 linux-image-5.10.0-18-2-amd64-unsigned==5.10.140-1 -linux-libc-dev==5.10.178-3 -linux-perf==5.10.178-3 -linux-perf-5.10==5.10.178-3 +linux-libc-dev==5.10.179-1 +linux-perf==5.10.179-1 +linux-perf-5.10==5.10.179-1 locales==2.31-13+deb11u6 logrotate==3.18.0-2+deb11u1 lsb-release==11.1.0 @@ -326,13 +326,13 @@ ndisc6==1.0.4-2 net-tools==1.60+git20181103.0eebece-1 netbase==6.3 netfilter-persistent==1.0.15 -ntp==1:4.2.8p15+dfsg-1+deb10u2 +ntp==1:4.2.8p15+dfsg-1 ntpstat==0.0.0.1-2+b1 opennsl-modules==7.1.0.0 -openssh-client==1:8.4p1-5+deb11u1+fips -openssh-server==1:8.4p1-5+deb11u1+fips -openssh-sftp-server==1:8.4p1-5+deb11u1+fips -openssl==1.1.1n-0+deb11u4+fips +openssh-client==1:8.4p1-5+deb11u1 +openssh-server==1:8.4p1-5+deb11u1 +openssh-sftp-server==1:8.4p1-5+deb11u1 +openssl==1.1.1n-0+deb11u4 patch==2.7.6-7 pci.ids==0.0~2021.02.08-1 pciutils==1:3.7.0-5 diff --git a/files/build/versions/host-image/versions-deb-bullseye-arm64 b/files/build/versions/host-image/versions-deb-bullseye-arm64 index f689d9d3d249..236923f2aa22 100644 --- a/files/build/versions/host-image/versions-deb-bullseye-arm64 +++ b/files/build/versions/host-image/versions-deb-bullseye-arm64 @@ -8,6 +8,11 @@ libxml2-dev==2.9.10+dfsg-6.7+deb11u4 libxslt1-dev==1.1.34-4+deb11u1 libxslt1.1==1.1.34-4+deb11u1 linux-image-5.10.0-18-2-arm64-unsigned==5.10.140-1 +ntp==1:4.2.8p15+dfsg-1+deb10u2 ntpstat==0.0.0.1-2 +openssh-client==1:8.4p1-5+deb11u1+fips +openssh-server==1:8.4p1-5+deb11u1+fips +openssh-sftp-server==1:8.4p1-5+deb11u1+fips +openssl==1.1.1n-0+deb11u4+fips picocom==3.1-2 tsingma-bsp==1.0 \ No newline at end of file diff --git a/files/build/versions/host-image/versions-deb-bullseye-armhf b/files/build/versions/host-image/versions-deb-bullseye-armhf index d55ee678551b..1f446a146439 100644 --- a/files/build/versions/host-image/versions-deb-bullseye-armhf +++ b/files/build/versions/host-image/versions-deb-bullseye-armhf @@ -10,9 +10,6 @@ libxslt1-dev==1.1.34-4+deb11u1 libxslt1.1==1.1.34-4+deb11u1 linux-image-5.10.0-18-2-armmp==5.10.140-1 mrvlprestera==1.0 +ntp==1:4.2.8p15+dfsg-1+deb10u2 ntpstat==0.0.0.1-2 -openssh-client==1:8.4p1-5+deb11u1 -openssh-server==1:8.4p1-5+deb11u1 -openssh-sftp-server==1:8.4p1-5+deb11u1 -openssl==1.1.1n-0+deb11u4 picocom==3.1-2 \ 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 a8c6a0e07fbd..cc95e32c284e 100644 --- a/files/build/versions/host-image/versions-py3 +++ b/files/build/versions/host-image/versions-py3 @@ -4,7 +4,7 @@ azure-nspkg==3.0.2 azure-storage==0.36.0 bitarray==1.5.3 blessed==1.20.0 -certifi==2022.12.7 +certifi==2023.5.7 cffi==1.15.1 charset-normalizer==3.1.0 click==7.0 @@ -12,7 +12,7 @@ click-log==0.4.0 colorful==0.5.5 cryptography==40.0.2 dbus-python==1.2.16 -docker==5.0.3 +docker==6.1.1 docker-image-py==0.1.12 enlighten==1.11.2 filelock==3.12.0 @@ -35,6 +35,7 @@ markupsafe==2.1.2 natsort==6.2.1 netaddr==0.8.0 netifaces==0.11.0 +packaging==23.1 pathtools==0.1.2 pddf-platform==1.0 pexpect==4.8.0 @@ -54,9 +55,9 @@ pyroute2==0.5.19 python-apt==2.2.1 python-dateutil==2.8.2 pyyaml==5.4.1 -redis==4.5.4 -regex==2023.3.23 -requests==2.29.0 +redis==4.5.5 +regex==2023.5.5 +requests==2.30.0 scapy==2.4.4 semantic-version==2.10.0 six==1.16.0 @@ -64,7 +65,7 @@ systemd-python==235 tabulate==0.8.2 thrift==0.13.0 toposort==1.6 -urllib3==1.26.15 +urllib3==2.0.2 watchdog==0.10.3 wcwidth==0.2.6 websocket-client==1.5.1 From 8d1b4d1428f594a1267a08c1f1f9b2adb192befb Mon Sep 17 00:00:00 2001 From: mssonicbld <79238446+mssonicbld@users.noreply.github.com> Date: Mon, 22 May 2023 02:49:02 +0800 Subject: [PATCH 113/193] [submodule] Update submodule sonic-platform-common to the latest HEAD automatically (#15173) src/sonic-platform-common * fbab896 - (HEAD -> 202205, origin/202205) Change Y cable simulator log level from error to warning due to false alarm (6 hours ago) [ShiyanWangMS] --- 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 ff728111268d..fbab89696a5d 160000 --- a/src/sonic-platform-common +++ b/src/sonic-platform-common @@ -1 +1 @@ -Subproject commit ff728111268d6dde9c214d6e82ee450084400a4b +Subproject commit fbab89696a5defb4954e30bf0faac4d880125356 From 036b8d131593b57f2eb1fa9d4b8969bde7cc3333 Mon Sep 17 00:00:00 2001 From: mssonicbld <79238446+mssonicbld@users.noreply.github.com> Date: Tue, 23 May 2023 20:43:44 +0800 Subject: [PATCH 114/193] [ci/build]: Upgrade SONiC package versions (#15192) --- .../versions-deb-bullseye-arm64 | 2 ++ .../build-sonic-slave-bullseye/versions-py3 | 2 +- .../versions-py3-all-arm64 | 4 ++++ .../versions-py3-all-armhf | 2 +- .../build-sonic-slave-buster/versions-py3 | 2 +- files/build/versions/default/versions-git | 8 ++++---- files/build/versions/default/versions-mirror | 20 +++++++++---------- .../docker-config-engine-buster/versions-py3 | 2 +- .../dockers/docker-ptf/versions-deb-buster | 2 +- .../docker-sonic-mgmt-framework/versions-py3 | 4 ++-- .../dockers/docker-sonic-vs/versions-py3 | 4 ++-- .../versions-deb-bullseye | 6 +++--- .../sonic-slave-buster/versions-deb-buster | 14 ++++++------- .../dockers/sonic-slave-buster/versions-py3 | 2 +- files/build/versions/host-image/versions-py3 | 4 ++-- 15 files changed, 42 insertions(+), 36 deletions(-) create mode 100644 files/build/versions/build/build-sonic-slave-bullseye/versions-py3-all-arm64 diff --git a/files/build/versions/build/build-sonic-slave-bullseye/versions-deb-bullseye-arm64 b/files/build/versions/build/build-sonic-slave-bullseye/versions-deb-bullseye-arm64 index 5aa489f5de91..3f9e16d7fe7d 100644 --- a/files/build/versions/build/build-sonic-slave-bullseye/versions-deb-bullseye-arm64 +++ b/files/build/versions/build/build-sonic-slave-bullseye/versions-deb-bullseye-arm64 @@ -1 +1,3 @@ +libnl-3-200==3.5.0-1 +libnl-route-3-200==3.5.0-1 linux-headers-5.10.0-18-2-arm64==5.10.140-1 \ No newline at end of file diff --git a/files/build/versions/build/build-sonic-slave-bullseye/versions-py3 b/files/build/versions/build/build-sonic-slave-bullseye/versions-py3 index a15ce5500f47..9044c9691996 100644 --- a/files/build/versions/build/build-sonic-slave-bullseye/versions-py3 +++ b/files/build/versions/build/build-sonic-slave-bullseye/versions-py3 @@ -28,6 +28,6 @@ tabulate==0.8.2 thrift==0.14.1 toposort==1.6 wcwidth==0.2.6 -websocket-client==1.5.1 +websocket-client==1.5.2 www-authenticate==0.9.2 xmltodict==0.12.0 \ No newline at end of file diff --git a/files/build/versions/build/build-sonic-slave-bullseye/versions-py3-all-arm64 b/files/build/versions/build/build-sonic-slave-bullseye/versions-py3-all-arm64 new file mode 100644 index 000000000000..74eed0040072 --- /dev/null +++ b/files/build/versions/build/build-sonic-slave-bullseye/versions-py3-all-arm64 @@ -0,0 +1,4 @@ +bitarray==1.5.3 +click==7.0 +requests==2.31.0 +zipp==1.2.0 \ No newline at end of file diff --git a/files/build/versions/build/build-sonic-slave-bullseye/versions-py3-all-armhf b/files/build/versions/build/build-sonic-slave-bullseye/versions-py3-all-armhf index 2c38507f3e6d..74eed0040072 100644 --- a/files/build/versions/build/build-sonic-slave-bullseye/versions-py3-all-armhf +++ b/files/build/versions/build/build-sonic-slave-bullseye/versions-py3-all-armhf @@ -1,4 +1,4 @@ bitarray==1.5.3 click==7.0 -requests==2.30.0 +requests==2.31.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 index 3a40efee2d2d..4f2dcc7bd232 100644 --- a/files/build/versions/build/build-sonic-slave-buster/versions-py3 +++ b/files/build/versions/build/build-sonic-slave-buster/versions-py3 @@ -27,6 +27,6 @@ tabulate==0.8.2 thrift==0.14.1 toposort==1.6 wcwidth==0.2.6 -websocket-client==1.5.1 +websocket-client==1.5.2 www-authenticate==0.9.2 xmltodict==0.12.0 \ No newline at end of file diff --git a/files/build/versions/default/versions-git b/files/build/versions/default/versions-git index af630e3e72f4..643c56af75e7 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==4d73c057d82ac5994d992f0b1f57ca6d513c3554 +https://chromium.googlesource.com/chromium/tools/depot_tools.git==63d20c330ba3ba5f644ade9e50b22ef3be09c1b8 https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f -https://github.com/CESNET/libyang.git==9a4e5b2ce30b9696116d6e654ee55caab5aafed8 +https://github.com/CESNET/libyang.git==ea94c8b9f513f8a6ddc6ce1540fa41eaf4c8922a https://github.com/daveolson53/audisp-tacplus.git==559c9f22edd4f2dea0ecedffb3ad9502b12a75b6 https://github.com/daveolson53/libnss-tacplus.git==19008ab68d9d504aa58eb34d5f564755a1613b8b https://github.com/dyninc/OpenBFDD.git==e35f43ad8d2b3f084e96a84c392528a90d05a287 -https://github.com/flashrom/flashrom.git==0f541c216ad1c2ed3587353f4122318809e53174 -https://github.com/FreeRADIUS/freeradius-server.git==433970a3ed074e101da488f0ec6b349daeac9f2e +https://github.com/flashrom/flashrom.git==f15e6a105b1cf589476042e62b8d0bb64a938e38 +https://github.com/FreeRADIUS/freeradius-server.git==550d77402f30fb55db74a799f569dbfca2e43c66 https://github.com/FreeRADIUS/pam_radius.git==8d373539bb9f13b0abfe8bcae0095a930a00fad0 https://github.com/jeroennijhof/pam_tacplus.git==4284d9016e64def2bb81d5f50f96dc3b59bfdc39 https://github.com/jpirko/libteam.git==61e27812c1074a865d7e1a778c0ce442837c28d7 diff --git a/files/build/versions/default/versions-mirror b/files/build/versions/default/versions-mirror index 8e763427ea84..24ccd272d01d 100644 --- a/files/build/versions/default/versions-mirror +++ b/files/build/versions/default/versions-mirror @@ -1,15 +1,15 @@ deb.nodesource.com_node%5f14.x_dists_bullseye==2023-02-17T00:35:28Z deb.nodesource.com_node%5f14.x_dists_buster==2023-02-17T00:35:28Z -debian==20230521T000208Z -debian-security==20230521T000209Z +debian==20230523T000124Z +debian-security==20230523T000204Z download.docker.com_linux_debian_dists_bullseye==2023-05-19T22:46:29Z download.docker.com_linux_debian_dists_buster==2023-05-19T22:46:29Z packages.microsoft.com_repos_sonic-dev_dists_jessie==2022-10-31T19:34:29Z -packages.trafficmanager.net_snapshot_debian-security_20230521T000209Z_dists_bullseye-security==2023-05-20T20:52:21Z -packages.trafficmanager.net_snapshot_debian-security_20230521T000209Z_dists_buster_updates==2023-05-20T20:52:21Z -packages.trafficmanager.net_snapshot_debian_20230521T000208Z_dists_bullseye==2023-04-29T09:31:02Z -packages.trafficmanager.net_snapshot_debian_20230521T000208Z_dists_bullseye-backports==2023-05-20T20:10:57Z -packages.trafficmanager.net_snapshot_debian_20230521T000208Z_dists_bullseye-updates==2023-05-20T20:10:57Z -packages.trafficmanager.net_snapshot_debian_20230521T000208Z_dists_buster==2022-09-10T11:30:54Z -packages.trafficmanager.net_snapshot_debian_20230521T000208Z_dists_buster-backports==2023-05-20T20:10:57Z -packages.trafficmanager.net_snapshot_debian_20230521T000208Z_dists_buster-updates==2023-05-20T20:10:57Z \ No newline at end of file +packages.trafficmanager.net_snapshot_debian-security_20230523T000204Z_dists_bullseye-security==2023-05-22T11:22:40Z +packages.trafficmanager.net_snapshot_debian-security_20230523T000204Z_dists_buster_updates==2023-05-22T11:22:40Z +packages.trafficmanager.net_snapshot_debian_20230523T000124Z_dists_bullseye==2023-04-29T09:31:02Z +packages.trafficmanager.net_snapshot_debian_20230523T000124Z_dists_bullseye-backports==2023-05-22T20:11:25Z +packages.trafficmanager.net_snapshot_debian_20230523T000124Z_dists_bullseye-updates==2023-05-22T20:11:25Z +packages.trafficmanager.net_snapshot_debian_20230523T000124Z_dists_buster==2022-09-10T11:30:54Z +packages.trafficmanager.net_snapshot_debian_20230523T000124Z_dists_buster-backports==2023-05-22T20:11:25Z +packages.trafficmanager.net_snapshot_debian_20230523T000124Z_dists_buster-updates==2023-05-22T20:11:25Z \ 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 c744de056bb9..936a1fb6e77c 100644 --- a/files/build/versions/dockers/docker-config-engine-buster/versions-py3 +++ b/files/build/versions/dockers/docker-config-engine-buster/versions-py3 @@ -14,6 +14,6 @@ redis==4.5.5 redis-dump-load==1.1 regex==2023.5.5 six==1.16.0 -typing_extensions==4.5.0 +typing_extensions==4.6.0 xmltodict==0.12.0 zipp==3.15.0 \ No newline at end of file diff --git a/files/build/versions/dockers/docker-ptf/versions-deb-buster b/files/build/versions/dockers/docker-ptf/versions-deb-buster index e9143ddc94b4..d9db811cfb8d 100644 --- a/files/build/versions/dockers/docker-ptf/versions-deb-buster +++ b/files/build/versions/dockers/docker-ptf/versions-deb-buster @@ -90,7 +90,7 @@ libcdt5==2.40.1-6+deb10u1 libcgraph6==2.40.1-6+deb10u1 libcryptsetup12==2:2.1.0-5+deb10u2 libcups2==2.2.10-6+deb10u6 -libcupsfilters1==1.21.6-5 +libcupsfilters1==1.21.6-5+deb10u1 libcupsimage2==2.2.10-6+deb10u6 libcurl3-gnutls==7.64.0-4+deb10u6 libcurl4==7.64.0-4+deb10u6 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 837df5b61daa..a1bcf74717e1 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.5 -grpcio==1.54.2 +grpcio==1.55.0 grpcio-tools==1.20.0 idna==3.4 importlib-resources==5.12.0 @@ -21,7 +21,7 @@ pkgutil_resolve_name==1.3.10 protobuf==4.23.1 pyrsistent==0.19.3 python-dateutil==2.6.0 -requests==2.30.0 +requests==2.31.0 rfc3339-validator==0.1.4 six==1.11.0 urllib3==1.26.5 diff --git a/files/build/versions/dockers/docker-sonic-vs/versions-py3 b/files/build/versions/dockers/docker-sonic-vs/versions-py3 index ed59c949266f..0976cbbf7058 100644 --- a/files/build/versions/dockers/docker-sonic-vs/versions-py3 +++ b/files/build/versions/dockers/docker-sonic-vs/versions-py3 @@ -25,7 +25,7 @@ pygments==2.15.1 pygobject==3.44.1 pyparsing==3.0.9 pyroute2==0.5.14 -requests==2.30.0 +requests==2.31.0 scapy==2.4.4 semantic-version==2.10.0 systemd-python==235 @@ -33,5 +33,5 @@ tabulate==0.8.2 toposort==1.6 urllib3==2.0.2 wcwidth==0.2.6 -websocket-client==1.5.1 +websocket-client==1.5.2 www-authenticate==0.9.2 \ No newline at end of file diff --git a/files/build/versions/dockers/sonic-slave-bullseye/versions-deb-bullseye b/files/build/versions/dockers/sonic-slave-bullseye/versions-deb-bullseye index 4c46dd27cdf9..1acd63727704 100644 --- a/files/build/versions/dockers/sonic-slave-bullseye/versions-deb-bullseye +++ b/files/build/versions/dockers/sonic-slave-bullseye/versions-deb-bullseye @@ -1225,9 +1225,9 @@ libwayland-cursor0==1.18.0-2~exp1.1 libwayland-dev==1.18.0-2~exp1.1 libwayland-egl1==1.18.0-2~exp1.1 libwayland-server0==1.18.0-2~exp1.1 -libwebp6==0.6.1-2.1 -libwebpdemux2==0.6.1-2.1 -libwebpmux3==0.6.1-2.1 +libwebp6==0.6.1-2.1+deb11u1 +libwebpdemux2==0.6.1-2.1+deb11u1 +libwebpmux3==0.6.1-2.1+deb11u1 libwebsocket-api-java==1.1-2 libwmf0.2-7==0.2.8.4-17 libwoff1==1.0.2-1+b1 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 859f53823fc0..ead3c2879028 100644 --- a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster +++ b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster @@ -189,9 +189,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+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 +imagemagick==8:6.9.10.23+dfsg-2.1+deb10u5 +imagemagick-6-common==8:6.9.10.23+dfsg-2.1+deb10u5 +imagemagick-6.q16==8:6.9.10.23+dfsg-2.1+deb10u5 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 @@ -414,7 +414,7 @@ libcrystalhd3==1:0.0~git20110715.fdd2f19-13 libcunit1==2.1-3-dfsg-2+b12 libcunit1-dev==2.1-3-dfsg-2+b12 libcups2==2.2.10-6+deb10u6 -libcupsfilters1==1.21.6-5 +libcupsfilters1==1.21.6-5+deb10u1 libcupsimage2==2.2.10-6+deb10u6 libcurl3-gnutls==7.64.0-4+deb10u6 libcurl4==7.64.0-4+deb10u6 @@ -759,9 +759,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+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 +libmagickcore-6.q16-6==8:6.9.10.23+dfsg-2.1+deb10u5 +libmagickcore-6.q16-6-extra==8:6.9.10.23+dfsg-2.1+deb10u5 +libmagickwand-6.q16-6==8:6.9.10.23+dfsg-2.1+deb10u5 libmail-sendmail-perl==0.80-1 libmailtools-perl==2.18-1 libmariadb-dev==1:10.3.38-0+deb10u1 diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-py3 b/files/build/versions/dockers/sonic-slave-buster/versions-py3 index f054c9df9781..5a99d3467119 100644 --- a/files/build/versions/dockers/sonic-slave-buster/versions-py3 +++ b/files/build/versions/dockers/sonic-slave-buster/versions-py3 @@ -71,7 +71,7 @@ secretstorage==2.3.1 six==1.12.0 sphinx==1.8.4 sphinx-rtd-theme==0.4.3 -typing_extensions==4.5.0 +typing_extensions==4.6.0 unattended-upgrades==0.1 unidiff==0.5.4 urllib3==1.24.1 diff --git a/files/build/versions/host-image/versions-py3 b/files/build/versions/host-image/versions-py3 index cc95e32c284e..f55b17dec953 100644 --- a/files/build/versions/host-image/versions-py3 +++ b/files/build/versions/host-image/versions-py3 @@ -57,7 +57,7 @@ python-dateutil==2.8.2 pyyaml==5.4.1 redis==4.5.5 regex==2023.5.5 -requests==2.30.0 +requests==2.31.0 scapy==2.4.4 semantic-version==2.10.0 six==1.16.0 @@ -68,6 +68,6 @@ toposort==1.6 urllib3==2.0.2 watchdog==0.10.3 wcwidth==0.2.6 -websocket-client==1.5.1 +websocket-client==1.5.2 www-authenticate==0.9.2 xmltodict==0.12.0 \ No newline at end of file From f3ac3dd46e78eb3d16fa2710baf936677574f7f0 Mon Sep 17 00:00:00 2001 From: Yaqiang Zhu Date: Fri, 26 May 2023 23:49:26 +0800 Subject: [PATCH 115/193] [202205][minigraph] Add rack_mgmt_rack parse support in minigraph.py (#15064) (#15177) Why I did it We need to store information of power shelf in config_db for SONiC MX switch. Current minigraph parser cannot parse rack_mgmt_map field. Work item tracking Microsoft ADO (number only): 22179645 How I did it Add support for parsing rack_mgmt_map. --- src/sonic-config-engine/minigraph.py | 11 +++++++++-- .../tests/simple-sample-graph-case.xml | 5 +++++ src/sonic-config-engine/tests/test_minigraph_case.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 6458aad17936..9a7902928e76 100644 --- a/src/sonic-config-engine/minigraph.py +++ b/src/sonic-config-engine/minigraph.py @@ -985,6 +985,7 @@ def parse_meta(meta, hname): redundancy_type = None downstream_redundancy_types = None qos_profile = None + rack_mgmt_map = None device_metas = meta.find(str(QName(ns, "Devices"))) for device in device_metas.findall(str(QName(ns1, "DeviceMetadata"))): @@ -1034,7 +1035,9 @@ def parse_meta(meta, hname): downstream_redundancy_types = value 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, switch_id, switch_type, max_cores, kube_data, macsec_profile, downstream_redundancy_types, redundancy_type, qos_profile + elif name == "RackMgmtMap": + rack_mgmt_map = value + return syslog_servers, dhcp_servers, dhcpv6_servers, ntp_servers, tacacs_servers, mgmt_routes, erspan_dst, deployment_id, region, cloudtype, resource_type, downstream_subrole, switch_id, switch_type, max_cores, kube_data, macsec_profile, downstream_redundancy_types, redundancy_type, qos_profile, rack_mgmt_map def parse_linkmeta(meta, hname): @@ -1460,6 +1463,7 @@ def parse_xml(filename, platform=None, port_config_file=None, asic_name=None, hw downstream_redundancy_types = None redundancy_type = None qos_profile = None + rack_mgmt_map = None hwsku_qn = QName(ns, "HwSku") hostname_qn = QName(ns, "Hostname") @@ -1492,7 +1496,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, switch_id, switch_type, max_cores, kube_data, macsec_profile, downstream_redundancy_types, redundancy_type, qos_profile) = 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, switch_id, switch_type, max_cores, kube_data, macsec_profile, downstream_redundancy_types, redundancy_type, qos_profile, rack_mgmt_map) = parse_meta(child, hostname) elif child.tag == str(QName(ns, "LinkMetadataDeclaration")): linkmetas = parse_linkmeta(child, hostname) elif child.tag == str(QName(ns, "DeviceInfos")): @@ -1536,6 +1540,9 @@ def parse_xml(filename, platform=None, port_config_file=None, asic_name=None, hw if deployment_id is not None: results['DEVICE_METADATA']['localhost']['deployment_id'] = deployment_id + if rack_mgmt_map is not None: + results['DEVICE_METADATA']['localhost']['rack_mgmt_map'] = rack_mgmt_map + cluster = [devices[key] for key in devices if key.lower() == hostname.lower()][0].get('cluster', "") if cluster: results['DEVICE_METADATA']['localhost']['cluster'] = cluster 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 89b0ca9e0d9d..aaade89d5d49 100644 --- a/src/sonic-config-engine/tests/simple-sample-graph-case.xml +++ b/src/sonic-config-engine/tests/simple-sample-graph-case.xml @@ -537,6 +537,11 @@ Mixed + + RackMgmtMap + + dummy_value + diff --git a/src/sonic-config-engine/tests/test_minigraph_case.py b/src/sonic-config-engine/tests/test_minigraph_case.py index d265be199c19..23d2b0cac8a3 100644 --- a/src/sonic-config-engine/tests/test_minigraph_case.py +++ b/src/sonic-config-engine/tests/test_minigraph_case.py @@ -194,6 +194,11 @@ def test_minigraph_deployment_id(self): output = self.run_script(argument) self.assertEqual(output.strip(), "1") + def test_minigraph_rack_mgmt_map(self): + argument = '-m "' + self.sample_graph + '" -p "' + self.port_config + '" -v "DEVICE_METADATA[\'localhost\'][\'rack_mgmt_map\']"' + output = self.run_script(argument) + self.assertEqual(output.strip(), "dummy_value") + def test_minigraph_cluster(self): argument = '-m "' + self.sample_graph + '" -p "' + self.port_config + '" -v "DEVICE_METADATA[\'localhost\'][\'cluster\']"' output = self.run_script(argument) From b11e5b66efdecf8b8d0d6b6c205311936b4547f5 Mon Sep 17 00:00:00 2001 From: Akhilesh Samineni <47657796+AkhileshSamineni@users.noreply.github.com> Date: Fri, 26 May 2023 21:36:11 +0530 Subject: [PATCH 116/193] SONiC Yang model support for IPv6 link local (#15182) This is backport of #14757 SONiC Yang model support for IPv6 link local What I did Created SONiC Yang model for IPv6 link local How I did it Defined Yang models for IPv6 link local based on https://github.com/sonic-net/SONiC/blob/master/doc/ipv6/ipv6_link_local.md How to verify it Added enable test case. Signed-off-by: Akhilesh Samineni --- src/sonic-yang-models/doc/Configuration.md | 24 ++++- .../tests/files/sample_config_db.json | 9 +- .../yang_model_tests/tests/interface.json | 7 ++ .../yang_model_tests/tests/portchannel.json | 7 ++ .../tests/yang_model_tests/tests/vlan.json | 7 ++ .../tests_config/interface.json | 56 ++++++++++++ .../tests_config/portchannel.json | 74 ++++++++++++++++ .../yang_model_tests/tests_config/vlan.json | 88 +++++++++++++++++++ .../yang-models/sonic-interface.yang | 6 ++ .../yang-models/sonic-portchannel.yang | 6 ++ .../yang-models/sonic-vlan.yang | 6 ++ 11 files changed, 286 insertions(+), 4 deletions(-) diff --git a/src/sonic-yang-models/doc/Configuration.md b/src/sonic-yang-models/doc/Configuration.md index cf4656882f15..25deed912a8c 100644 --- a/src/sonic-yang-models/doc/Configuration.md +++ b/src/sonic-yang-models/doc/Configuration.md @@ -27,7 +27,8 @@ Table of Contents * [Device neighbor metada](#device-neighbor-metada) * [DHCP_RELAY](#dhcp_relay) * [DSCP_TO_TC_MAP](#dscp_to_tc_map) - * [FLEX_COUNTER_TABLE](#flex_counter_table) + * [FLEX_COUNTER_TABLE](#flex_counter_table) + * [IPv6 Link-local] (#ipv6-link-local) * [KDUMP](#kdump) * [L2 Neighbors](#l2-neighbors) * [Loopback Interface](#loopback-interface) @@ -938,6 +939,27 @@ instance is supported in SONiC. ``` +### IPv6 Link-local +``` +{ + "INTERFACE": { + "Ethernet8": { + "ipv6_use_link_local_only": "disable" + } + }, + "PORTCHANNEL_INTERFACE": { + "PortChannel01": { + "ipv6_use_link_local_only": "enable" + } + }, + "VLAN_INTERFACE": { + "Vlan1000": { + "ipv6_use_link_local_only": "enable" + } + } +} +``` + ### KDUMP ``` diff --git a/src/sonic-yang-models/tests/files/sample_config_db.json b/src/sonic-yang-models/tests/files/sample_config_db.json index 3713ae131828..1c14152fd8ef 100644 --- a/src/sonic-yang-models/tests/files/sample_config_db.json +++ b/src/sonic-yang-models/tests/files/sample_config_db.json @@ -106,7 +106,8 @@ "PORTCHANNEL_INTERFACE": { "PortChannel0003": { "nat_zone": "1", - "loopback_action": "drop" + "loopback_action": "drop", + "ipv6_use_link_local_only": "enable" }, "PortChannel0004": {"vrf_name": "Vrf_blue"}, "PortChannel42|10.1.0.1/31": {}, @@ -122,7 +123,8 @@ "VLAN_INTERFACE": { "Vlan111": { "nat_zone": "0", - "loopback_action": "forward" + "loopback_action": "forward", + "ipv6_use_link_local_only": "disable" }, "Vlan777": {}, "Vlan111|2a04:5555:45:6709::1/64": { @@ -950,7 +952,8 @@ "Ethernet16": {}, "Ethernet18": { "nat_zone": "1", - "loopback_action": "forward" + "loopback_action": "forward", + "ipv6_use_link_local_only": "enable" }, "Ethernet112|2a04:5555:40:a709::2/126": { "scope": "global", diff --git a/src/sonic-yang-models/tests/yang_model_tests/tests/interface.json b/src/sonic-yang-models/tests/yang_model_tests/tests/interface.json index ed561f25bc2a..b0532d90e129 100644 --- a/src/sonic-yang-models/tests/yang_model_tests/tests/interface.json +++ b/src/sonic-yang-models/tests/yang_model_tests/tests/interface.json @@ -22,5 +22,12 @@ "desc": "INCORRECT LOOPBACK ACTION IN INTERFACE TABLE.", "eStrKey" : "Pattern", "eStr": ["drop|forward"] + }, + "INTERFACE_ENABLE_IPV6_LINK_LOCAL": { + "desc": "Enable the ipv6 link-local." + }, + "INTERFACE_INVALID_ENABLE_IPV6_LINK_LOCAL": { + "desc": "Enable the ipv6 link-local as true.", + "eStr": "Invalid value \"true\" in \"ipv6_use_link_local_only\" element." } } diff --git a/src/sonic-yang-models/tests/yang_model_tests/tests/portchannel.json b/src/sonic-yang-models/tests/yang_model_tests/tests/portchannel.json index bcd21ebd541b..cfdaf489dc86 100644 --- a/src/sonic-yang-models/tests/yang_model_tests/tests/portchannel.json +++ b/src/sonic-yang-models/tests/yang_model_tests/tests/portchannel.json @@ -68,5 +68,12 @@ "desc": "INCORRECT LOOPBACK ACTION IN PORTCHANNEL_INTERFACE TABLE.", "eStrKey" : "Pattern", "eStr": ["drop|forward"] + }, + "PORTCHANNEL_INTERFACE_ENABLE_IPV6_LINK_LOCAL": { + "desc": "Enable the ipv6 link-local." + }, + "PORTCHANNEL_INTERFACE_INVALID_ENABLE_IPV6_LINK_LOCAL": { + "desc": "Enable the ipv6 link-local as true.", + "eStr": "Invalid value \"true\" in \"ipv6_use_link_local_only\" element." } } diff --git a/src/sonic-yang-models/tests/yang_model_tests/tests/vlan.json b/src/sonic-yang-models/tests/yang_model_tests/tests/vlan.json index cf5fccf02bc0..7f1cb4eb3523 100644 --- a/src/sonic-yang-models/tests/yang_model_tests/tests/vlan.json +++ b/src/sonic-yang-models/tests/yang_model_tests/tests/vlan.json @@ -79,5 +79,12 @@ "desc": "INCORRECT LOOPBACK ACTION IN VLAN_INTERFACE TABLE.", "eStrKey" : "Pattern", "eStr": ["drop|forward"] + }, + "VLAN_INTERFACE_ENABLE_IPV6_LINK_LOCAL": { + "desc": "Enable the ipv6 link-local." + }, + "VLAN_INTERFACE_INVALID_ENABLE_IPV6_LINK_LOCAL": { + "desc": "Enable the ipv6 link-local as true.", + "eStr": "Invalid value \"true\" in \"ipv6_use_link_local_only\" element." } } diff --git a/src/sonic-yang-models/tests/yang_model_tests/tests_config/interface.json b/src/sonic-yang-models/tests/yang_model_tests/tests_config/interface.json index 2f20f8475b64..b0b9fdb68197 100644 --- a/src/sonic-yang-models/tests/yang_model_tests/tests_config/interface.json +++ b/src/sonic-yang-models/tests/yang_model_tests/tests_config/interface.json @@ -209,5 +209,61 @@ ] } } + }, + "INTERFACE_ENABLE_IPV6_LINK_LOCAL": { + "sonic-interface:sonic-interface": { + "sonic-interface:INTERFACE": { + "INTERFACE_LIST": [ + { + "name": "Ethernet8", + "ipv6_use_link_local_only": "enable" + } + ] + } + }, + "sonic-port:sonic-port": { + "sonic-port:PORT": { + "PORT_LIST": [ + { + "admin_status": "up", + "alias": "eth8", + "description": "Ethernet8", + "fec": "rs", + "lanes": "65", + "mtu": 9000, + "name": "Ethernet8", + "speed": 25000 + } + ] + } + } + }, + "INTERFACE_INVALID_ENABLE_IPV6_LINK_LOCAL": { + "sonic-interface:sonic-interface": { + "sonic-interface:INTERFACE": { + "INTERFACE_LIST": [ + { + "name": "Ethernet8", + "ipv6_use_link_local_only": "true" + } + ] + } + }, + "sonic-port:sonic-port": { + "sonic-port:PORT": { + "PORT_LIST": [ + { + "admin_status": "up", + "alias": "eth8", + "description": "Ethernet8", + "fec": "rs", + "lanes": "65", + "mtu": 9000, + "name": "Ethernet8", + "speed": 25000 + } + ] + } + } } } diff --git a/src/sonic-yang-models/tests/yang_model_tests/tests_config/portchannel.json b/src/sonic-yang-models/tests/yang_model_tests/tests_config/portchannel.json index 21a61b9f1c36..9ea260f4e2f8 100644 --- a/src/sonic-yang-models/tests/yang_model_tests/tests_config/portchannel.json +++ b/src/sonic-yang-models/tests/yang_model_tests/tests_config/portchannel.json @@ -412,5 +412,79 @@ ] } } + }, + "PORTCHANNEL_INTERFACE_ENABLE_IPV6_LINK_LOCAL": { + "sonic-port:sonic-port": { + "sonic-port:PORT": { + "PORT_LIST": [ + { + "admin_status": "up", + "alias": "eth0", + "description": "Ethernet0", + "lanes": "65", + "mtu": 9000, + "name": "Ethernet0", + "speed": 25000 + } + ] + } + }, + "sonic-portchannel:sonic-portchannel": { + "sonic-portchannel:PORTCHANNEL": { + "PORTCHANNEL_LIST": [ + { + "admin_status": "up", + "min_links": "1", + "mtu": "9100", + "name": "PortChannel0001" + } + ] + }, + "sonic-portchannel:PORTCHANNEL_INTERFACE": { + "PORTCHANNEL_INTERFACE_LIST": [ + { + "name": "PortChannel0001", + "ipv6_use_link_local_only": "enable" + } + ] + } + } + }, + "PORTCHANNEL_INTERFACE_INVALID_ENABLE_IPV6_LINK_LOCAL": { + "sonic-port:sonic-port": { + "sonic-port:PORT": { + "PORT_LIST": [ + { + "admin_status": "up", + "alias": "eth0", + "description": "Ethernet0", + "lanes": "65", + "mtu": 9000, + "name": "Ethernet0", + "speed": 25000 + } + ] + } + }, + "sonic-portchannel:sonic-portchannel": { + "sonic-portchannel:PORTCHANNEL": { + "PORTCHANNEL_LIST": [ + { + "admin_status": "up", + "min_links": "1", + "mtu": "9100", + "name": "PortChannel0001" + } + ] + }, + "sonic-portchannel:PORTCHANNEL_INTERFACE": { + "PORTCHANNEL_INTERFACE_LIST": [ + { + "name": "PortChannel0001", + "ipv6_use_link_local_only": "true" + } + ] + } + } } } diff --git a/src/sonic-yang-models/tests/yang_model_tests/tests_config/vlan.json b/src/sonic-yang-models/tests/yang_model_tests/tests_config/vlan.json index c5934bc39c93..c4db119b7fa5 100644 --- a/src/sonic-yang-models/tests/yang_model_tests/tests_config/vlan.json +++ b/src/sonic-yang-models/tests/yang_model_tests/tests_config/vlan.json @@ -626,5 +626,93 @@ ] } } + }, + "VLAN_INTERFACE_ENABLE_IPV6_LINK_LOCAL": { + "sonic-port:sonic-port": { + "sonic-port:PORT": { + "PORT_LIST": [ + { + "admin_status": "up", + "alias": "eth0", + "description": "Ethernet0", + "mtu": 9000, + "lanes": "1", + "name": "Ethernet0", + "speed": 25000 + } + ] + } + }, + "sonic-vlan:sonic-vlan": { + "sonic-vlan:VLAN": { + "VLAN_LIST": [ + { + "description": "vlan_nat", + "name": "Vlan100" + } + ] + }, + "sonic-vlan:VLAN_MEMBER": { + "VLAN_MEMBER_LIST": [ + { + "port": "Ethernet0", + "tagging_mode": "tagged", + "name": "Vlan100" + } + ] + }, + "sonic-vlan:VLAN_INTERFACE": { + "VLAN_INTERFACE_LIST": [ + { + "name": "Vlan100", + "ipv6_use_link_local_only": "enable" + } + ] + } + } + }, + "VLAN_INTERFACE_INVALID_ENABLE_IPV6_LINK_LOCAL": { + "sonic-port:sonic-port": { + "sonic-port:PORT": { + "PORT_LIST": [ + { + "admin_status": "up", + "alias": "eth0", + "description": "Ethernet0", + "mtu": 9000, + "lanes": "1", + "name": "Ethernet0", + "speed": 25000 + } + ] + } + }, + "sonic-vlan:sonic-vlan": { + "sonic-vlan:VLAN": { + "VLAN_LIST": [ + { + "description": "vlan_nat", + "name": "Vlan100" + } + ] + }, + "sonic-vlan:VLAN_MEMBER": { + "VLAN_MEMBER_LIST": [ + { + "port": "Ethernet0", + "tagging_mode": "tagged", + "name": "Vlan100" + } + ] + }, + "sonic-vlan:VLAN_INTERFACE": { + "VLAN_INTERFACE_LIST": [ + { + "name": "Vlan100", + "ipv6_use_link_local_only": "true" + } + ] + } + } } } diff --git a/src/sonic-yang-models/yang-models/sonic-interface.yang b/src/sonic-yang-models/yang-models/sonic-interface.yang index 74f241fed0d4..386b7c491da5 100644 --- a/src/sonic-yang-models/yang-models/sonic-interface.yang +++ b/src/sonic-yang-models/yang-models/sonic-interface.yang @@ -75,6 +75,12 @@ module sonic-interface { } } + leaf ipv6_use_link_local_only { + description "Enable/Disable IPv6 link local address on interface"; + type stypes:mode-status; + default disable; + } + leaf loopback_action { description "Packet action when a packet ingress and gets routed on the same IP interface"; type stypes:loopback_action; diff --git a/src/sonic-yang-models/yang-models/sonic-portchannel.yang b/src/sonic-yang-models/yang-models/sonic-portchannel.yang index 0c40e48def53..eab80176f9d6 100644 --- a/src/sonic-yang-models/yang-models/sonic-portchannel.yang +++ b/src/sonic-yang-models/yang-models/sonic-portchannel.yang @@ -177,6 +177,12 @@ module sonic-portchannel { enum disable; } } + + leaf ipv6_use_link_local_only { + description "Enable/Disable IPv6 link local address on portchannel interface"; + type stypes:mode-status; + default disable; + } } /* end of list PORTCHANNEL_INTERFACE_LIST */ list PORTCHANNEL_INTERFACE_IPPREFIX_LIST { diff --git a/src/sonic-yang-models/yang-models/sonic-vlan.yang b/src/sonic-yang-models/yang-models/sonic-vlan.yang index 48ec466b825b..e4fc2d4b5968 100644 --- a/src/sonic-yang-models/yang-models/sonic-vlan.yang +++ b/src/sonic-yang-models/yang-models/sonic-vlan.yang @@ -102,6 +102,12 @@ module sonic-vlan { } } + leaf ipv6_use_link_local_only { + description "Enable/Disable IPv6 link local address on vlan interface"; + type stypes:mode-status; + default disable; + } + leaf loopback_action { description "Packet action when a packet ingress and gets routed on the same IP interface"; type stypes:loopback_action; From 9f8a250f6101a388edc272bc724f68e405ca4b13 Mon Sep 17 00:00:00 2001 From: arista-nwolfe <94405414+arista-nwolfe@users.noreply.github.com> Date: Fri, 26 May 2023 09:08:40 -0700 Subject: [PATCH 117/193] Add soc property sai_pfc_dlr_init_capability=0 to missing DNX SKUs (#15155) --- .../0/j2p-a7800r3a-36d-36x400G.config.bcm | 1 + .../1/j2p-a7800r3a-36d-36x400G.config.bcm | 1 + .../0/j2p-a7800r3a-36d-36x400G.config.bcm | 1 + .../1/j2p-a7800r3a-36d-36x400G.config.bcm | 1 + 4 files changed, 4 insertions(+) diff --git a/device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-C36/0/j2p-a7800r3a-36d-36x400G.config.bcm b/device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-C36/0/j2p-a7800r3a-36d-36x400G.config.bcm index 3ffb6b93ee08..daf5cea87ab7 100644 --- a/device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-C36/0/j2p-a7800r3a-36d-36x400G.config.bcm +++ b/device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-C36/0/j2p-a7800r3a-36d-36x400G.config.bcm @@ -1013,5 +1013,6 @@ serdes_tx_taps_36=nrz:-8:89:-29:0:0:0 appl_param_nof_ports_per_modid=64 xflow_macsec_secure_chan_to_num_secure_assoc_encrypt=2 xflow_macsec_secure_chan_to_num_secure_assoc_decrypt=2 +sai_pfc_dlr_init_capability=0 sai_disable_srcmacqedstmac_ctrl=1 diff --git a/device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-C36/1/j2p-a7800r3a-36d-36x400G.config.bcm b/device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-C36/1/j2p-a7800r3a-36d-36x400G.config.bcm index d2509fd6b6c0..ca9a76473068 100644 --- a/device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-C36/1/j2p-a7800r3a-36d-36x400G.config.bcm +++ b/device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-C36/1/j2p-a7800r3a-36d-36x400G.config.bcm @@ -1013,5 +1013,6 @@ serdes_tx_taps_36=nrz:-7:85:-25:0:0:0 appl_param_nof_ports_per_modid=64 xflow_macsec_secure_chan_to_num_secure_assoc_encrypt=2 xflow_macsec_secure_chan_to_num_secure_assoc_decrypt=2 +sai_pfc_dlr_init_capability=0 sai_disable_srcmacqedstmac_ctrl=1 diff --git a/device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-D36/0/j2p-a7800r3a-36d-36x400G.config.bcm b/device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-D36/0/j2p-a7800r3a-36d-36x400G.config.bcm index be5897e0efd4..59ea93a3d416 100644 --- a/device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-D36/0/j2p-a7800r3a-36d-36x400G.config.bcm +++ b/device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-D36/0/j2p-a7800r3a-36d-36x400G.config.bcm @@ -1050,5 +1050,6 @@ serdes_tx_taps_36=pam4:-16:137:-12:2:0:-3 appl_param_nof_ports_per_modid=64 xflow_macsec_secure_chan_to_num_secure_assoc_encrypt=2 xflow_macsec_secure_chan_to_num_secure_assoc_decrypt=4 +sai_pfc_dlr_init_capability=0 sai_disable_srcmacqedstmac_ctrl=1 diff --git a/device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-D36/1/j2p-a7800r3a-36d-36x400G.config.bcm b/device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-D36/1/j2p-a7800r3a-36d-36x400G.config.bcm index b197a426eb98..fcd11ad2c658 100644 --- a/device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-D36/1/j2p-a7800r3a-36d-36x400G.config.bcm +++ b/device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-D36/1/j2p-a7800r3a-36d-36x400G.config.bcm @@ -1050,5 +1050,6 @@ serdes_tx_taps_36=pam4:-16:137:-12:2:0:-3 appl_param_nof_ports_per_modid=64 xflow_macsec_secure_chan_to_num_secure_assoc_encrypt=2 xflow_macsec_secure_chan_to_num_secure_assoc_decrypt=4 +sai_pfc_dlr_init_capability=0 sai_disable_srcmacqedstmac_ctrl=1 From 21aa832da3f142866210e5a425917660c82a7094 Mon Sep 17 00:00:00 2001 From: mssonicbld <79238446+mssonicbld@users.noreply.github.com> Date: Sat, 27 May 2023 00:13:20 +0800 Subject: [PATCH 118/193] [submodule] Update submodule sonic-platform-daemons to the latest HEAD automatically (#15205) src/sonic-platform-daemons * f9547b7 - (HEAD -> 202205, origin/202205) Use tx_disable_channel with media_lanes_mask (#353) (28 hours ago) [rajann] --- 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 f913e9c13701..f9547b763a12 160000 --- a/src/sonic-platform-daemons +++ b/src/sonic-platform-daemons @@ -1 +1 @@ -Subproject commit f913e9c137012a8b1c31124c08e2c3b450f57833 +Subproject commit f9547b763a126293ea1eea6608b1f7da5a010806 From 151a1942129e088e8d0ba5bd3ea346966dc157f7 Mon Sep 17 00:00:00 2001 From: mssonicbld <79238446+mssonicbld@users.noreply.github.com> Date: Sat, 27 May 2023 05:23:00 +0800 Subject: [PATCH 119/193] [YANG] Add MgmtLeafRouter to Device Neighbor Metadata element type list (#15202) (#15231) Why I did it Introduce a new valid neighbor element type to YANG. Work item tracking Microsoft ADO (number only): 23994521 How I did it Add MgmtLeafRouter to element network type list. How to verify it Passes UTs Co-authored-by: Jing Kan --- .../yang-models/sonic-device_neighbor_metadata.yang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/sonic-yang-models/yang-models/sonic-device_neighbor_metadata.yang b/src/sonic-yang-models/yang-models/sonic-device_neighbor_metadata.yang index 76526f801c92..0b8a5ad1ee57 100644 --- a/src/sonic-yang-models/yang-models/sonic-device_neighbor_metadata.yang +++ b/src/sonic-yang-models/yang-models/sonic-device_neighbor_metadata.yang @@ -83,7 +83,7 @@ module sonic-device_neighbor_metadata { leaf type { description "Network element type"; type string { - pattern "ToRRouter|LeafRouter|SpineChassisFrontendRouter|ChassisBackendRouter|ASIC|Asic|Supervior|MgmtToRRouter|SpineRouter|BackEndToRRouter|BackEndLeafRouter|EPMS|MgmtTsToR|BmcMgmtToRRouter|Server|MiniPower|SmartCable|Ixia|not-provisioned"; + pattern "ToRRouter|LeafRouter|SpineChassisFrontendRouter|ChassisBackendRouter|ASIC|Asic|Supervior|MgmtToRRouter|MgmtLeafRouter|SpineRouter|BackEndToRRouter|BackEndLeafRouter|EPMS|MgmtTsToR|BmcMgmtToRRouter|Server|MiniPower|SmartCable|Ixia|not-provisioned"; } } From 294292b1cba1b8464ada60ef06d33715bf656a52 Mon Sep 17 00:00:00 2001 From: mssonicbld <79238446+mssonicbld@users.noreply.github.com> Date: Sat, 27 May 2023 05:24:04 +0800 Subject: [PATCH 120/193] [submodule] Update submodule sonic-platform-common to the latest HEAD automatically (#15235) src/sonic-platform-common * f1f1dd3 - (HEAD -> 202205, origin/202205) Update CMIS api's rendering max-duration (#375) (3 minutes ago) [rajann] --- 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 fbab89696a5d..f1f1dd357686 160000 --- a/src/sonic-platform-common +++ b/src/sonic-platform-common @@ -1 +1 @@ -Subproject commit fbab89696a5defb4954e30bf0faac4d880125356 +Subproject commit f1f1dd35768665cc07e1f8059578d98d466f0cde From 934cf5d4c6edecfe64032dcda5f059c3dc222116 Mon Sep 17 00:00:00 2001 From: mssonicbld <79238446+mssonicbld@users.noreply.github.com> Date: Sat, 27 May 2023 05:24:41 +0800 Subject: [PATCH 121/193] [submodule] Update submodule sonic-platform-daemons to the latest HEAD automatically (#15236) src/sonic-platform-daemons * 2466680 - (HEAD -> 202205, origin/202205) add async notification support in active-active topo; refactor code for ycable tasks for change events (#327) (5 minutes ago) [vdahiya12] * a07bc21 - [ycabled] refactor code for onboarding async client changes;refactor (#355) (5 minutes ago) [vdahiya12] --- 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 f9547b763a12..2466680e93cd 160000 --- a/src/sonic-platform-daemons +++ b/src/sonic-platform-daemons @@ -1 +1 @@ -Subproject commit f9547b763a126293ea1eea6608b1f7da5a010806 +Subproject commit 2466680e93cde3eaf91f2224974876e16fa7a4d2 From a4633d32ed3ee0e91e9fc698b3378f41295ac3e0 Mon Sep 17 00:00:00 2001 From: mssonicbld <79238446+mssonicbld@users.noreply.github.com> Date: Sat, 27 May 2023 05:27:55 +0800 Subject: [PATCH 122/193] Clean up the old version container images (#14978) (#15232) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Why I did it Our k8s feature will pull new version container images for each upgrade, the container images inside sonic will be more and more, but for now we don’t have a way to clean up the old version container images, the disk may be filled up. Need to add cleaning up the old version container images logic. Work item tracking Microsoft ADO (number only): 17979809 How I did it Remove the old version container images besides the feature's current version and last version image, last version image is saved for supporting fallback. How to verify it Check whether the old version images are removed Co-authored-by: lixiaoyuner <35456895+lixiaoyuner@users.noreply.github.com> --- src/sonic-ctrmgrd/ctrmgr/container | 26 +++++ src/sonic-ctrmgrd/ctrmgr/container_startup.py | 13 ++- src/sonic-ctrmgrd/ctrmgr/ctrmgrd.py | 38 ++++++- src/sonic-ctrmgrd/ctrmgr/kube_commands.py | 64 ++++++++++++ .../ctrmgr/remote_ctr.config.json | 3 +- src/sonic-ctrmgrd/tests/common_test.py | 14 +++ .../tests/container_startup_test.py | 6 +- src/sonic-ctrmgrd/tests/container_test.py | 3 +- src/sonic-ctrmgrd/tests/ctrmgrd_test.py | 21 +++- src/sonic-ctrmgrd/tests/kube_commands_test.py | 98 +++++++++++++++++++ 10 files changed, 270 insertions(+), 16 deletions(-) diff --git a/src/sonic-ctrmgrd/ctrmgr/container b/src/sonic-ctrmgrd/ctrmgr/container index ca2394b057bb..9be2a5b3fe3b 100755 --- a/src/sonic-ctrmgrd/ctrmgr/container +++ b/src/sonic-ctrmgrd/ctrmgr/container @@ -27,6 +27,7 @@ REMOTE_STATE = "remote_state" VERSION = "container_version" SYSTEM_STATE = "system_state" STATE = "state" +ST_FEAT_CTR_STABLE_VER = "container_stable_version" KUBE_LABEL_TABLE = "KUBE_LABELS" KUBE_LABEL_SET_KEY = "SET" @@ -132,6 +133,26 @@ def docker_action(action, feature, **kwargs): return FAILURE +def container_version(feature): + """ Get container image version """ + version = None + try: + client = docker.from_env() + container = client.containers.get(feature) + envs = container.attrs['Config']['Env'] + for env in envs: + if env.startswith("IMAGE_VERSION="): + version = env.split('=')[1] + + syslog.syslog(syslog.LOG_INFO, "docker get image version for {}".format(feature)) + + except (docker.errors.NotFound, docker.errors.APIError) as err: + syslog.syslog(syslog.LOG_ERR, "docker get image version for {} failed with {}". + format(feature, str(err))) + + return version + + def set_label(feature, create): """ Set/drop label as required Update is done in state-db. @@ -374,6 +395,11 @@ def container_wait(feature, **kwargs): pend_wait_secs = 0 ret = SUCCESS + if docker_id == feature: + version = container_version(feature) + if version: + update_data(feature, {ST_FEAT_CTR_STABLE_VER: version}) + if not docker_id and fallback: pend_wait_secs = get_config_data( SONIC_CTR_CONFIG_PEND_SECS, DEFAULT_PEND_SECS) diff --git a/src/sonic-ctrmgrd/ctrmgr/container_startup.py b/src/sonic-ctrmgrd/ctrmgr/container_startup.py index 2af8e0b3845a..d94b4ef97bc2 100755 --- a/src/sonic-ctrmgrd/ctrmgr/container_startup.py +++ b/src/sonic-ctrmgrd/ctrmgr/container_startup.py @@ -36,6 +36,11 @@ def _get_version_key(feature, version): return "{}_{}_enabled".format(feature, version) +def _get_local_version_key(feature): + # Coin label for track laster local version + return "{}_local".format(feature) + + def read_data(feature): state_data = { CURRENT_OWNER: "none", @@ -87,8 +92,8 @@ def check_version_blocked(state_db, feature, version): # tbl = swsscommon.Table(state_db, KUBE_LABEL_TABLE) labels = dict(tbl.get(KUBE_LABEL_SET_KEY)[1]) - key = _get_version_key(feature, version) - return (key in labels) and (labels[key].lower() == "false") + key = _get_local_version_key(feature) + return (key in labels) and (labels[key].lower() == version.lower()) def drop_label(state_db, feature, version): @@ -97,8 +102,8 @@ def drop_label(state_db, feature, version): # ctrmgrd sets it with kube API server per reaschability tbl = swsscommon.Table(state_db, KUBE_LABEL_TABLE) - name = _get_version_key(feature, version) - tbl.set(KUBE_LABEL_SET_KEY, [ (name, "false")]) + name = _get_local_version_key(feature) + tbl.set(KUBE_LABEL_SET_KEY, [(name, version)]) def update_data(state_db, feature, data): diff --git a/src/sonic-ctrmgrd/ctrmgr/ctrmgrd.py b/src/sonic-ctrmgrd/ctrmgr/ctrmgrd.py index b6b3d0bba283..27648dd22d02 100755 --- a/src/sonic-ctrmgrd/ctrmgr/ctrmgrd.py +++ b/src/sonic-ctrmgrd/ctrmgr/ctrmgrd.py @@ -48,6 +48,8 @@ ST_FEAT_UPDATE_TS = "update_time" ST_FEAT_CTR_ID = "container_id" ST_FEAT_CTR_VER = "container_version" +ST_FEAT_CTR_STABLE_VER = "container_stable_version" +ST_FEAT_CTR_LAST_VER = "container_last_version" ST_FEAT_REMOTE_STATE = "remote_state" ST_FEAT_SYS_STATE = "system_state" @@ -59,6 +61,7 @@ OWNER_KUBE = "kube" OWNER_LOCAL = "local" OWNER_NONE = "none" +REMOTE_RUNNING = "running" REMOTE_READY = "ready" REMOTE_PENDING = "pending" REMOTE_STOPPED = "stopped" @@ -91,6 +94,8 @@ ST_FEAT_UPDATE_TS: "", ST_FEAT_CTR_ID: "", ST_FEAT_CTR_VER: "", + ST_FEAT_CTR_STABLE_VER: "", + ST_FEAT_CTR_LAST_VER: "", ST_FEAT_REMOTE_STATE: "none", ST_FEAT_SYS_STATE: "" } @@ -100,18 +105,20 @@ LABEL_RETRY = "retry_labels_update_seconds" TAG_IMAGE_LATEST = "tag_latest_image_on_wait_seconds" TAG_RETRY = "retry_tag_latest_seconds" +CLEAN_IMAGE_RETRY = "retry_clean_image_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, + TAG_IMAGE_LATEST: 5, TAG_RETRY: 5, + CLEAN_IMAGE_RETRY: 5, USE_K8S_PROXY: "" } -ENABLED_FEATURE_SET = {"telemetry", "snmp"} +DISABLED_FEATURE_SET = {"database"} def log_debug(m): msg = "{}: {}".format(inspect.stack()[1][3], m) @@ -271,7 +278,7 @@ def run(self): key, op, fvs = subscriber.pop() if not key: continue - if subscriber.getTableName() == FEATURE_TABLE and key not in ENABLED_FEATURE_SET: + if subscriber.getTableName() == FEATURE_TABLE and key in DISABLED_FEATURE_SET: continue log_debug("Received message : '%s'" % str((key, op, fvs))) for callback in (self.callbacks @@ -545,7 +552,7 @@ 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"): + if (remote_state == REMOTE_RUNNING) and (old_remote_state != remote_state): # Tag latest start_time = datetime.datetime.now() + datetime.timedelta( seconds=remote_ctr_config[TAG_IMAGE_LATEST]) @@ -583,6 +590,29 @@ def do_tag_latest(self, feat, docker_id, image_ver): log_debug("Tag latest as local failed retry after {} seconds @{}". format(remote_ctr_config[TAG_RETRY], self.start_time)) + else: + last_version = self.st_data[feat][ST_FEAT_CTR_STABLE_VER] + if last_version == image_ver: + last_version = self.st_data[feat][ST_FEAT_CTR_LAST_VER] + self.server.mod_db_entry(STATE_DB_NAME, FEATURE_TABLE, feat, + {ST_FEAT_CTR_STABLE_VER: image_ver, + ST_FEAT_CTR_LAST_VER: last_version}) + self.st_data[ST_FEAT_CTR_LAST_VER] = last_version + self.st_data[ST_FEAT_CTR_STABLE_VER] = image_ver + self.do_clean_image(feat, image_ver, last_version) + + def do_clean_image(self, feat, current_version, last_version): + ret = kube_commands.clean_image(feat, current_version, last_version) + if ret != 0: + # Clean up old version images failed. Retry after an interval + self.start_time = datetime.datetime.now() + self.start_time += datetime.timedelta( + seconds=remote_ctr_config[CLEAN_IMAGE_RETRY]) + self.server.register_timer(self.start_time, self.do_clean_image, (feat, current_version, last_version)) + + log_debug("Clean up old version images failed retry after {} seconds @{}". + format(remote_ctr_config[CLEAN_IMAGE_RETRY], self.start_time)) + # # Label re-sync diff --git a/src/sonic-ctrmgrd/ctrmgr/kube_commands.py b/src/sonic-ctrmgrd/ctrmgr/kube_commands.py index 6576f2580079..fe37c0c8424c 100755 --- a/src/sonic-ctrmgrd/ctrmgr/kube_commands.py +++ b/src/sonic-ctrmgrd/ctrmgr/kube_commands.py @@ -483,6 +483,70 @@ def tag_latest(feat, docker_id, image_ver): log_error(err) return ret +def _do_clean(feat, current_version, last_version): + err = "" + out = "" + ret = 0 + DOCKER_ID = "docker_id" + REPO = "repo" + _, image_info, err = _run_command("docker images |grep {} |grep -v latest |awk '{{print $1,$2,$3}}'".format(feat)) + if image_info: + version_dict = {} + version_dict_default = {} + for info in image_info.split("\n"): + rep, version, docker_id = info.split() + if len(rep.split("/")) == 1: + version_dict_default[version] = {DOCKER_ID: docker_id, REPO: rep} + else: + version_dict[version] = {DOCKER_ID: docker_id, REPO: rep} + + if current_version in version_dict: + image_prefix = version_dict[current_version][REPO] + del version_dict[current_version] + else: + out = "Current version {} doesn't exist.".format(current_version) + ret = 0 + return ret, out, err + # should be only one item in version_dict_default + for k, v in version_dict_default.items(): + local_version, local_repo, local_docker_id = k, v[REPO], v[DOCKER_ID] + tag_res, _, err = _run_command("docker tag {} {}:{} && docker rmi {}:{}".format( + local_docker_id, image_prefix, local_version, local_repo, local_version)) + if tag_res == 0: + msg = "Tag {} local version images successfully".format(feat) + log_debug(msg) + else: + ret = 1 + err = "Failed to tag {} local version images. Err: {}".format(feat, err) + return ret, out, err + + if last_version in version_dict: + del version_dict[last_version] + + versions = [item[DOCKER_ID] for item in version_dict.values()] + if versions: + clean_res, _, err = _run_command("docker rmi {} --force".format(" ".join(versions))) + else: + clean_res = 0 + if clean_res == 0: + out = "Clean {} old version images successfully".format(feat) + else: + err = "Failed to clean {} old version images. Err: {}".format(feat, err) + ret = 1 + else: + err = "Failed to docker images |grep {} |awk '{{print $3}}'".format(feat) + ret = 1 + + return ret, out, err + +def clean_image(feat, current_version, last_version): + ret, out, err = _do_clean(feat, current_version, last_version) + if ret == 0: + log_debug(out) + else: + log_error(err) + return ret + def main(): syslog.openlog("kube_commands") parser=argparse.ArgumentParser(description= diff --git a/src/sonic-ctrmgrd/ctrmgr/remote_ctr.config.json b/src/sonic-ctrmgrd/ctrmgr/remote_ctr.config.json index b6d26334865b..45701430ff57 100644 --- a/src/sonic-ctrmgrd/ctrmgr/remote_ctr.config.json +++ b/src/sonic-ctrmgrd/ctrmgr/remote_ctr.config.json @@ -2,9 +2,10 @@ "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": 360, "tag_latest_image_on_wait_seconds": 600, "retry_tag_latest_seconds": 30, + "retry_clean_image_seconds": 30, "use_k8s_as_http_proxy": "n" } diff --git a/src/sonic-ctrmgrd/tests/common_test.py b/src/sonic-ctrmgrd/tests/common_test.py index 59f774596a4e..45f81d150d13 100755 --- a/src/sonic-ctrmgrd/tests/common_test.py +++ b/src/sonic-ctrmgrd/tests/common_test.py @@ -185,6 +185,7 @@ def __init__(self, name): self.actions = [] self.name = name self.image = mock_image(self.actions) + self.attrs = {"Config": {"Env": ["IMAGE_VERSION=20201231.11"]}} def start(self): @@ -547,6 +548,19 @@ def set_mock_kube(kube_labels, kube_join, kube_reset): kube_reset.side_effect = kube_reset_side_effect +def clean_image_side_effect(feat, current_version, last_version): + return 0 + + +def tag_latest_side_effect(feat, docker_id, image_ver): + return 0 + + +def set_mock_image_op(clean_image, tag_latest): + clean_image.side_effect = clean_image_side_effect + tag_latest.side_effect = tag_latest_side_effect + + def str_comp(needle, hay): nlen = len(needle) hlen = len(hay) diff --git a/src/sonic-ctrmgrd/tests/container_startup_test.py b/src/sonic-ctrmgrd/tests/container_startup_test.py index b21fe855662c..23523f66b106 100755 --- a/src/sonic-ctrmgrd/tests/container_startup_test.py +++ b/src/sonic-ctrmgrd/tests/container_startup_test.py @@ -36,7 +36,7 @@ }, common_test.KUBE_LABEL_TABLE: { "SET": { - "snmp_20201230.11_enabled": "false" + "snmp_local": "20201230.11" } } } @@ -345,7 +345,7 @@ }, common_test.KUBE_LABEL_TABLE: { "SET": { - "snmp_20201230.11_enabled": "false" + "snmp_local": "20201230.11" } } } @@ -363,7 +363,7 @@ }, common_test.KUBE_LABEL_TABLE: { "SET": { - "snmp_20201230.11_enabled": "false" + "snmp_local": "20201230.11" } } } diff --git a/src/sonic-ctrmgrd/tests/container_test.py b/src/sonic-ctrmgrd/tests/container_test.py index 4581111015e5..8d1534f8b03d 100755 --- a/src/sonic-ctrmgrd/tests/container_test.py +++ b/src/sonic-ctrmgrd/tests/container_test.py @@ -416,7 +416,8 @@ "remote_state": "none", "system_state": "up", "current_owner": "local", - "container_id": "snmp" + "container_id": "snmp", + "container_stable_version": "20201231.11" } } } diff --git a/src/sonic-ctrmgrd/tests/ctrmgrd_test.py b/src/sonic-ctrmgrd/tests/ctrmgrd_test.py index 0a298dd60308..0304985224ea 100755 --- a/src/sonic-ctrmgrd/tests/ctrmgrd_test.py +++ b/src/sonic-ctrmgrd/tests/ctrmgrd_test.py @@ -291,7 +291,7 @@ common_test.STATE_DB_NO: { common_test.FEATURE_TABLE: { "snmp": { - "remote_state": "pending" + "remote_state": "ready" } } } @@ -307,7 +307,19 @@ common_test.STATE_DB_NO: { common_test.FEATURE_TABLE: { "snmp": { - "remote_state": "running" + "remote_state": "running", + "container_version": "20201231.74", + "container_stable_version": "20201231.64" + } + } + } + }, + common_test.POST: { + common_test.STATE_DB_NO: { + common_test.FEATURE_TABLE: { + "snmp": { + "container_last_version": "20201231.64", + "container_stable_version": "20201231.74" } } } @@ -473,13 +485,16 @@ def test_server(self, mock_kube_wr, mock_kube_join, mock_kube_rst, mock_subs, @patch("ctrmgrd.kube_commands.kube_reset_master") @patch("ctrmgrd.kube_commands.kube_join_master") @patch("ctrmgrd.kube_commands.kube_write_labels") - def test_feature(self, mock_kube_wr, mock_kube_join, mock_kube_rst, mock_subs, + @patch("ctrmgrd.kube_commands.tag_latest") + @patch("ctrmgrd.kube_commands.clean_image") + def test_feature(self, mock_clean_image, mock_tag_latest, mock_kube_wr, mock_kube_join, mock_kube_rst, mock_subs, mock_select, mock_table, mock_conn): self.init() ret = 0 common_test.set_mock(mock_table, mock_conn) common_test.set_mock_sel(mock_select, mock_subs) common_test.set_mock_kube(mock_kube_wr, mock_kube_join, mock_kube_rst) + common_test.set_mock_image_op(mock_clean_image, mock_tag_latest) for (i, ct_data) in feature_test_data.items(): common_test.do_start_test("ctrmgrd:feature", i, ct_data) diff --git a/src/sonic-ctrmgrd/tests/kube_commands_test.py b/src/sonic-ctrmgrd/tests/kube_commands_test.py index 9b4dd6842bb8..40b8ab180b9a 100755 --- a/src/sonic-ctrmgrd/tests/kube_commands_test.py +++ b/src/sonic-ctrmgrd/tests/kube_commands_test.py @@ -309,6 +309,93 @@ } } +clean_image_test_data = { + 0: { + common_test.DESCR: "Clean image successfuly(kube to kube)", + common_test.RETVAL: 0, + common_test.ARGS: ["snmp", "20201231.84", "20201231.74"], + common_test.PROC_CMD: [ + "docker images |grep snmp |grep -v latest |awk '{print $1,$2,$3}'", + "docker rmi 744d3a09062f --force" + ], + common_test.PROC_OUT: [ + "sonick8scue.azurecr.io/docker-sonic-telemetry 20201231.74 507f8d28bf6e\n\ + sonick8scue.azurecr.io/docker-sonic-telemetry 20201231.96 744d3a09062f\n\ + sonick8scue.azurecr.io/docker-sonic-telemetry 20201231.84 507f8d28bf6e", + "" + ], + common_test.PROC_CODE: [ + 0, + 0 + ] + }, + 1: { + common_test.DESCR: "Clean image failed(delete image failed)", + common_test.RETVAL: 1, + common_test.ARGS: ["snmp", "20201231.84", "20201231.74"], + common_test.PROC_CMD: [ + "docker images |grep snmp |grep -v latest |awk '{print $1,$2,$3}'", + "docker rmi 744d3a09062f --force" + ], + common_test.PROC_OUT: [ + "sonick8scue.azurecr.io/docker-sonic-telemetry 20201231.74 507f8d28bf6e\n\ + sonick8scue.azurecr.io/docker-sonic-telemetry 20201231.96 744d3a09062f\n\ + sonick8scue.azurecr.io/docker-sonic-telemetry 20201231.84 507f8d28bf6e", + "" + ], + common_test.PROC_CODE: [ + 0, + 1 + ] + }, + 2: { + common_test.DESCR: "Clean image failed(no image found)", + common_test.RETVAL: 1, + common_test.ARGS: ["snmp", "20201231.84", "20201231.74"], + common_test.PROC_CMD: [ + "docker images |grep snmp |grep -v latest |awk '{print $1,$2,$3}'" + ], + common_test.PROC_OUT: [ + "" + ] + }, + 3: { + common_test.DESCR: "Clean image failed(current image doesn't exist)", + common_test.RETVAL: 0, + common_test.ARGS: ["snmp", "20201231.84", "20201231.74"], + common_test.PROC_CMD: [ + "docker images |grep snmp |grep -v latest |awk '{print $1,$2,$3}'", + "" + ], + common_test.PROC_OUT: [ + "sonick8scue.azurecr.io/docker-sonic-telemetry 20201231.74 507f8d28bf6e\n\ + sonick8scue.azurecr.io/docker-sonic-telemetry 20201231.96 744d3a09062f", + "" + ], + common_test.PROC_CODE: [ + 0 + ] + }, + 4: { + common_test.DESCR: "Clean image successfuly(local to kube)", + common_test.RETVAL: 0, + common_test.ARGS: ["snmp", "20201231.84", ""], + common_test.PROC_CMD: [ + "docker images |grep snmp |grep -v latest |awk '{print $1,$2,$3}'", + "docker tag 507f8d28bf6e sonick8scue.azurecr.io/docker-sonic-telemetry:20201231.74 && docker rmi docker-sonic-telemetry:20201231.74" + ], + common_test.PROC_OUT: [ + "docker-sonic-telemetry 20201231.74 507f8d28bf6e\n\ + sonick8scue.azurecr.io/docker-sonic-telemetry 20201231.84 507f8d28bf6e", + "" + ], + common_test.PROC_CODE: [ + 0, + 0 + ] + }, +} + class TestKubeCommands(object): def init(self): @@ -467,3 +554,14 @@ def test_tag_latest(self, mock_subproc): ret = kube_commands.tag_latest(*ct_data[common_test.ARGS]) if common_test.RETVAL in ct_data: assert ret == ct_data[common_test.RETVAL] + + @patch("kube_commands.subprocess.Popen") + def test_clean_image(self, mock_subproc): + common_test.set_kube_mock(mock_subproc) + + for (i, ct_data) in clean_image_test_data.items(): + common_test.do_start_test("clean:image", i, ct_data) + + ret = kube_commands.clean_image(*ct_data[common_test.ARGS]) + if common_test.RETVAL in ct_data: + assert ret == ct_data[common_test.RETVAL] From 8661e9de2c8bcecb47de9a3f76dd354b849e3be8 Mon Sep 17 00:00:00 2001 From: Neetha John Date: Fri, 26 May 2023 14:29:34 -0700 Subject: [PATCH 123/193] [202205] Update SOC properties for DLR_INIT based pfcwd recovery (#15217) Why I did it Update soc properties for certain roles that need to use pfcwd dlr init based recovery mechanism How to verify it Updated the templates on a 7050cx3 dual tor and 7260 T1 which satisfies these conditions and validated pfcwd recovery which uses DLR_INIT based mechanism. Also validated that this mechanism is not used on 7050cx3 single tor with the updated templates Signed-off-by: Neetha John --- .../Arista-7050CX3-32S-C32/config.bcm.j2 | 7 +++++++ .../Arista-7050CX3-32S-D48C8/config.bcm.j2 | 7 +++++++ .../Arista-7260CX3-C64/config.bcm.j2 | 7 +++++++ .../Arista-7260CX3-D108C10/config.bcm.j2 | 7 +++++++ .../Arista-7260CX3-D108C8/config.bcm.j2 | 7 +++++++ .../Arista-7260CX3-Q64/config.bcm.j2 | 7 +++++++ .../tests/data/j2_template/config.bcm.j2 | 7 +++++++ .../sample_output/py3/arista7050cx3-dualtor.config.bcm | 3 +++ .../tests/sample_output/py3/arista7260-dualtor.config.bcm | 3 +++ .../tests/sample_output/py3/arista7260-t1.config.bcm | 3 +++ 10 files changed, 58 insertions(+) diff --git a/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/config.bcm.j2 b/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/config.bcm.j2 index 6cc4540921e4..1b7eec5d5f1d 100644 --- a/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/config.bcm.j2 +++ b/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/config.bcm.j2 @@ -1,16 +1,23 @@ {# Construct config.bcm to include additional soc properties per specific device metadata requirement #} {%- set map_prio = '' -%} +{%- set pfcwd_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 map_prio = 'sai_remap_prio_on_tnl_egress=1' -%} {%- endif %} {%- endif %} +{%- if SYSTEM_DEFAULTS is defined and 'tunnel_qos_remap' in SYSTEM_DEFAULTS and SYSTEM_DEFAULTS['tunnel_qos_remap']['status'] == 'enabled' -%} +{%- set pfcwd_sock = 'hybrid_pfc_deadlock_enable=1 + pfc_deadlock_seq_control=1 + sai_pfc_dlr_init_capability=1' -%} +{%- endif %} sai_load_hw_config=/etc/bcm/flex/bcm56870_a0_premium_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 }} +{{ pfcwd_sock }} 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/config.bcm.j2 b/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/config.bcm.j2 index a68ff78bab3c..1c928e3c61a1 100644 --- a/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/config.bcm.j2 +++ b/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/config.bcm.j2 @@ -1,16 +1,23 @@ {# Construct config.bcm to include additional soc properties per specific device metadata requirement #} {%- set map_prio = '' -%} +{%- set pfcwd_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 map_prio = 'sai_remap_prio_on_tnl_egress=1' -%} {%- endif %} {%- endif %} +{%- if SYSTEM_DEFAULTS is defined and 'tunnel_qos_remap' in SYSTEM_DEFAULTS and SYSTEM_DEFAULTS['tunnel_qos_remap']['status'] == 'enabled' -%} +{%- set pfcwd_sock = 'hybrid_pfc_deadlock_enable=1 + pfc_deadlock_seq_control=1 + sai_pfc_dlr_init_capability=1' -%} +{%- endif %} sai_load_hw_config=/etc/bcm/flex/bcm56870_a0_premium_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 }} +{{ pfcwd_sock }} 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 7ad0311ab888..d4b9000c378a 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 @@ -2,6 +2,7 @@ {%- set mmu_sock = 'mmu_init_config="MSFT-TH2-Tier1"' -%} {%- set IPinIP_sock = '' -%} {%- set map_prio = '' -%} +{%- set pfcwd_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'] -%} @@ -20,11 +21,17 @@ {%- endif %} {%- endif %} {%- endif %} +{%- if SYSTEM_DEFAULTS is defined and 'tunnel_qos_remap' in SYSTEM_DEFAULTS and SYSTEM_DEFAULTS['tunnel_qos_remap']['status'] == 'enabled' -%} +{%- set pfcwd_sock = 'hybrid_pfc_deadlock_enable=1 + pfc_deadlock_seq_control=1 + sai_pfc_dlr_init_capability=1' -%} +{%- 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 {{ map_prio }} +{{ pfcwd_sock }} 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-D108C10/config.bcm.j2 b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D108C10/config.bcm.j2 index 2255d7149b6b..c2d1c888d8ea 100644 --- 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 @@ -1,6 +1,7 @@ {# Construct config.bcm to include additional soc properties per specific device metadata requirement #} {%- set IPinIP_sock = '' -%} {%- set map_prio = '' -%} +{%- set pfcwd_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() %} @@ -11,10 +12,16 @@ {%- set map_prio = 'sai_remap_prio_on_tnl_egress=1' -%} {%- endif %} {%- endif %} +{%- if SYSTEM_DEFAULTS is defined and 'tunnel_qos_remap' in SYSTEM_DEFAULTS and SYSTEM_DEFAULTS['tunnel_qos_remap']['status'] == 'enabled' -%} +{%- set pfcwd_sock = 'hybrid_pfc_deadlock_enable=1 + pfc_deadlock_seq_control=1 + sai_pfc_dlr_init_capability=1' -%} +{%- 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 }} +{{ pfcwd_sock }} 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 642b36312d5c..cd6cd22c0343 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,6 +1,7 @@ {# Construct config.bcm to include additional soc properties per specific device metadata requirement #} {%- set IPinIP_sock = '' -%} {%- set map_prio = '' -%} +{%- set pfcwd_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() %} @@ -11,10 +12,16 @@ {%- set map_prio = 'sai_remap_prio_on_tnl_egress=1' -%} {%- endif %} {%- endif %} +{%- if SYSTEM_DEFAULTS is defined and 'tunnel_qos_remap' in SYSTEM_DEFAULTS and SYSTEM_DEFAULTS['tunnel_qos_remap']['status'] == 'enabled' -%} +{%- set pfcwd_sock = 'hybrid_pfc_deadlock_enable=1 + pfc_deadlock_seq_control=1 + sai_pfc_dlr_init_capability=1' -%} +{%- 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 }} +{{ pfcwd_sock }} 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 5ff359e06b72..55b4c4ba8002 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 @@ -2,6 +2,7 @@ {%- set mmu_sock = 'mmu_init_config="MSFT-TH2-Tier1"' -%} {%- set IPinIP_sock = '' -%} {%- set map_prio = '' -%} +{%- set pfcwd_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'] -%} @@ -20,10 +21,16 @@ {%- endif %} {%- endif %} {%- endif %} +{%- if SYSTEM_DEFAULTS is defined and 'tunnel_qos_remap' in SYSTEM_DEFAULTS and SYSTEM_DEFAULTS['tunnel_qos_remap']['status'] == 'enabled' -%} +{%- set pfcwd_sock = 'hybrid_pfc_deadlock_enable=1 + pfc_deadlock_seq_control=1 + sai_pfc_dlr_init_capability=1' -%} +{%- 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 }} +{{ pfcwd_sock }} PHY_AN_ALLOW_PLL_CHANGE=1 arl_clean_timeout_usec=15000000 asf_mem_profile=2 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 index 187d40af2d4e..9ecc43478d6d 100644 --- a/src/sonic-config-engine/tests/data/j2_template/config.bcm.j2 +++ b/src/sonic-config-engine/tests/data/j2_template/config.bcm.j2 @@ -2,6 +2,7 @@ {%- set mmu_sock = 'mmu_init_config="MSFT-TH2-Tier1"' -%} {%- set IPinIP_sock = '' -%} {%- set map_prio = '' -%} +{%- set pfcwd_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'] -%} @@ -20,9 +21,15 @@ {%- endif %} {%- endif %} {%- endif %} +{%- if SYSTEM_DEFAULTS is defined and 'tunnel_qos_remap' in SYSTEM_DEFAULTS and SYSTEM_DEFAULTS['tunnel_qos_remap']['status'] == 'enabled' -%} +{%- set pfcwd_sock = 'hybrid_pfc_deadlock_enable=1 + pfc_deadlock_seq_control=1 + sai_pfc_dlr_init_capability=1' -%} +{%- 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 }} +{{ pfcwd_sock }} 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 index 7d21ac82f120..84a04ee72ba1 100644 --- 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 @@ -6,3 +6,6 @@ sai_tunnel_support=1 sai_tunnel_underlay_route_mode=1 host_as_route_disable=1 l3_ecmp_levels=2 +hybrid_pfc_deadlock_enable=1 + pfc_deadlock_seq_control=1 + sai_pfc_dlr_init_capability=1 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 index 7d21ac82f120..84a04ee72ba1 100644 --- 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 @@ -6,3 +6,6 @@ sai_tunnel_support=1 sai_tunnel_underlay_route_mode=1 host_as_route_disable=1 l3_ecmp_levels=2 +hybrid_pfc_deadlock_enable=1 + pfc_deadlock_seq_control=1 + sai_pfc_dlr_init_capability=1 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 index 84a917290f24..bfa22e50fe84 100644 --- 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 @@ -3,3 +3,6 @@ l3_alpm_hit_skip=1 mmu_init_config="MSFT-TH2-Tier1" +hybrid_pfc_deadlock_enable=1 + pfc_deadlock_seq_control=1 + sai_pfc_dlr_init_capability=1 From d00dd1fca71df523eb8359ac252db72b0fa97bcd Mon Sep 17 00:00:00 2001 From: mssonicbld <79238446+mssonicbld@users.noreply.github.com> Date: Sat, 27 May 2023 20:17:51 +0800 Subject: [PATCH 124/193] [ci/build]: Upgrade SONiC package versions (#15243) --- .../versions-py3-all-arm64 | 3 +-- files/build/versions/default/versions-docker | 24 +++++++++---------- files/build/versions/default/versions-git | 12 +++++----- files/build/versions/default/versions-mirror | 24 +++++++++---------- .../docker-config-engine-buster/versions-py3 | 2 +- .../dockers/docker-ptf/versions-deb-buster | 14 +++++------ .../docker-sonic-mgmt-framework/versions-py3 | 4 ++-- .../docker-sonic-vs/versions-deb-buster | 14 +++++------ .../dockers/docker-sonic-vs/versions-py2 | 2 +- .../docker-syncd-bfn-rpc/versions-deb-buster | 14 +++++------ .../versions-deb-buster | 14 +++++------ .../versions-deb-buster-arm64 | 14 +++++------ .../versions-deb-bullseye | 4 ++-- .../sonic-slave-buster/versions-deb-buster | 14 +++++------ .../dockers/sonic-slave-buster/versions-py3 | 2 +- 15 files changed, 80 insertions(+), 81 deletions(-) diff --git a/files/build/versions/build/build-sonic-slave-bullseye/versions-py3-all-arm64 b/files/build/versions/build/build-sonic-slave-bullseye/versions-py3-all-arm64 index 74eed0040072..91b7ebfeb13b 100644 --- a/files/build/versions/build/build-sonic-slave-bullseye/versions-py3-all-arm64 +++ b/files/build/versions/build/build-sonic-slave-bullseye/versions-py3-all-arm64 @@ -1,4 +1,3 @@ bitarray==1.5.3 click==7.0 -requests==2.31.0 -zipp==1.2.0 \ No newline at end of file +requests==2.31.0 \ No newline at end of file diff --git a/files/build/versions/default/versions-docker b/files/build/versions/default/versions-docker index aa765a2347d1..88fb88010ad2 100644 --- a/files/build/versions/default/versions-docker +++ b/files/build/versions/default/versions-docker @@ -1,12 +1,12 @@ -amd64:amd64/debian:bullseye==sha256:32888a3c745e38e72a5f49161afc7bb52a263b8f5ea1b3b4a6af537678f29491 -amd64:amd64/debian:buster==sha256:ebc58102f66492508f6d0f0c5164978afbe27f4a69bd3431ed8bb015c82a8b80 -amd64:debian:bullseye==sha256:63d62ae233b588d6b426b7b072d79d1306bfd02a72bff1fc045b8511cc89ee09 -amd64:debian:buster==sha256:cca6bcced970f7634197ff1821aabb452024eb437958ab98bfc146ece96969c6 -arm64:arm64v8/debian:bullseye==sha256:ffc0fb46ea2b4c6e5462896ab380db366d1f142e565a0bfae4f91d0b511baae3 -arm64:arm64v8/debian:buster==sha256:4db99637cd48a7181532cbd61a0da9295ae135ac590f1948fea5cd7c9acfab0b -arm64:debian:bullseye==sha256:63d62ae233b588d6b426b7b072d79d1306bfd02a72bff1fc045b8511cc89ee09 -arm64:debian:buster==sha256:cca6bcced970f7634197ff1821aabb452024eb437958ab98bfc146ece96969c6 -armhf:arm32v7/debian:bullseye==sha256:b0f334e3bc529853a0fad8d2b5d85476d0316bff06ab5328d4628f90a7a789ab -armhf:arm32v7/debian:buster==sha256:9606bc9689ace2b3958d23babcf39a7bbcbebdc3ff99b9050014558273a95e4a -armhf:debian:bullseye==sha256:63d62ae233b588d6b426b7b072d79d1306bfd02a72bff1fc045b8511cc89ee09 -armhf:debian:buster==sha256:cca6bcced970f7634197ff1821aabb452024eb437958ab98bfc146ece96969c6 \ No newline at end of file +amd64:amd64/debian:bullseye==sha256:1bf0e24813ee8306c3fba1fe074793eb91c15ee580b61fff7f3f41662bc0031d +amd64:amd64/debian:buster==sha256:a067a9e8b39d5f19659b3bc9fd4348f6319afabd0d6ba1fe3b43df108926ea92 +amd64:debian:bullseye==sha256:432f545c6ba13b79e2681f4cc4858788b0ab099fc1cca799cc0fae4687c69070 +amd64:debian:buster==sha256:322859539526a04978dee1a2575b515295f6706f17d280f877a634299a7c1414 +arm64:arm64v8/debian:bullseye==sha256:0d1881fd981442bd6721e0e4ff40eb0ba705475c3a8469482ccee9029af56ebf +arm64:arm64v8/debian:buster==sha256:62a3eb2f5ace2f8415171855a84375616cb3cdb60b799d1811c3fda923b8dfbc +arm64:debian:bullseye==sha256:432f545c6ba13b79e2681f4cc4858788b0ab099fc1cca799cc0fae4687c69070 +arm64:debian:buster==sha256:322859539526a04978dee1a2575b515295f6706f17d280f877a634299a7c1414 +armhf:arm32v7/debian:bullseye==sha256:16aa677e45937a8c9f2e5a932ff1a611bc85b6416e47ab66532e05af2c08e066 +armhf:arm32v7/debian:buster==sha256:5340ee96c308b59f4590ec929adeeaf61ffe5a0758adcba09d0595a6619c3462 +armhf:debian:bullseye==sha256:432f545c6ba13b79e2681f4cc4858788b0ab099fc1cca799cc0fae4687c69070 +armhf:debian:buster==sha256:322859539526a04978dee1a2575b515295f6706f17d280f877a634299a7c1414 \ No newline at end of file diff --git a/files/build/versions/default/versions-git b/files/build/versions/default/versions-git index 643c56af75e7..63d96a36c4a0 100644 --- a/files/build/versions/default/versions-git +++ b/files/build/versions/default/versions-git @@ -1,24 +1,24 @@ -https://chromium.googlesource.com/chromium/tools/depot_tools.git==63d20c330ba3ba5f644ade9e50b22ef3be09c1b8 +https://chromium.googlesource.com/chromium/tools/depot_tools.git==04afb4b256a1aab562b0fcfaf7cd9ffe4ec42c1b https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f https://github.com/CESNET/libyang.git==ea94c8b9f513f8a6ddc6ce1540fa41eaf4c8922a https://github.com/daveolson53/audisp-tacplus.git==559c9f22edd4f2dea0ecedffb3ad9502b12a75b6 https://github.com/daveolson53/libnss-tacplus.git==19008ab68d9d504aa58eb34d5f564755a1613b8b https://github.com/dyninc/OpenBFDD.git==e35f43ad8d2b3f084e96a84c392528a90d05a287 -https://github.com/flashrom/flashrom.git==f15e6a105b1cf589476042e62b8d0bb64a938e38 -https://github.com/FreeRADIUS/freeradius-server.git==550d77402f30fb55db74a799f569dbfca2e43c66 +https://github.com/flashrom/flashrom.git==ffc75aa710efc8796f0f34c30216ce8a2b1e3954 +https://github.com/FreeRADIUS/freeradius-server.git==049f89875f8a0fb6843a1f276af66ae64da4ce69 https://github.com/FreeRADIUS/pam_radius.git==8d373539bb9f13b0abfe8bcae0095a930a00fad0 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==9dbae444204a2c27b33be698ce497d55926b8893 https://github.com/Mellanox/libpsample.git==62bb27d9a49424e45191eee81df7ce0d8c74e774 -https://github.com/opencomputeproject/SAI.git==c4ff21fda73be53d4e5b789bc933df96ddfea651 +https://github.com/opencomputeproject/SAI.git==fdaf928679dfa53ae21690f963b9b1f80032f2bf https://github.com/p4lang/scapy-vxlan.git==85ffe83da156568ee47a0750f638227e6e1d7479 -https://github.com/sflow/host-sflow==74f819f9695975fa9746c3e61888646d58c34ded +https://github.com/sflow/host-sflow==d61d7b3b52a1791d8b2782a32a7bdc391529ad31 https://github.com/sflow/sflowtool==4ce1223bb4c2cd0cbb1dd688dc0914561fcbb6c4 https://github.com/thom311/libnl==cbafad9ddf24caef5230fef715d34f0539603be0 https://salsa.debian.org/debian/libteam.git==48142125234a665ad5367b724af36a58fb484d3d -https://salsa.debian.org/kernel-team/ethtool/==68409b09a969b49a07fbf3930409f155b953434b +https://salsa.debian.org/kernel-team/ethtool/==97421dce8db53650dc08280f94bdd92cb4642cca https://salsa.debian.org/kernel-team/initramfs-tools.git==193dfbb7929e518976f89f6c8dd9201982e56f80 https://salsa.debian.org/sk-guest/monit.git==c9da7ebb1f35dfba17b50b5969a6e75e29cbec0d https://salsa.debian.org/ssh-team/openssh.git==4cb9ac54235e8f90a590a976e1404480fb521930 \ No newline at end of file diff --git a/files/build/versions/default/versions-mirror b/files/build/versions/default/versions-mirror index 24ccd272d01d..9b9bd6877a91 100644 --- a/files/build/versions/default/versions-mirror +++ b/files/build/versions/default/versions-mirror @@ -1,15 +1,15 @@ deb.nodesource.com_node%5f14.x_dists_bullseye==2023-02-17T00:35:28Z deb.nodesource.com_node%5f14.x_dists_buster==2023-02-17T00:35:28Z -debian==20230523T000124Z -debian-security==20230523T000204Z -download.docker.com_linux_debian_dists_bullseye==2023-05-19T22:46:29Z -download.docker.com_linux_debian_dists_buster==2023-05-19T22:46:29Z +debian==20230527T000125Z +debian-security==20230527T000128Z +download.docker.com_linux_debian_dists_bullseye==2023-05-26T07:49:37Z +download.docker.com_linux_debian_dists_buster==2023-05-26T07:49:38Z packages.microsoft.com_repos_sonic-dev_dists_jessie==2022-10-31T19:34:29Z -packages.trafficmanager.net_snapshot_debian-security_20230523T000204Z_dists_bullseye-security==2023-05-22T11:22:40Z -packages.trafficmanager.net_snapshot_debian-security_20230523T000204Z_dists_buster_updates==2023-05-22T11:22:40Z -packages.trafficmanager.net_snapshot_debian_20230523T000124Z_dists_bullseye==2023-04-29T09:31:02Z -packages.trafficmanager.net_snapshot_debian_20230523T000124Z_dists_bullseye-backports==2023-05-22T20:11:25Z -packages.trafficmanager.net_snapshot_debian_20230523T000124Z_dists_bullseye-updates==2023-05-22T20:11:25Z -packages.trafficmanager.net_snapshot_debian_20230523T000124Z_dists_buster==2022-09-10T11:30:54Z -packages.trafficmanager.net_snapshot_debian_20230523T000124Z_dists_buster-backports==2023-05-22T20:11:25Z -packages.trafficmanager.net_snapshot_debian_20230523T000124Z_dists_buster-updates==2023-05-22T20:11:25Z \ No newline at end of file +packages.trafficmanager.net_snapshot_debian-security_20230527T000128Z_dists_bullseye-security==2023-05-26T13:58:25Z +packages.trafficmanager.net_snapshot_debian-security_20230527T000128Z_dists_buster_updates==2023-05-26T13:58:25Z +packages.trafficmanager.net_snapshot_debian_20230527T000125Z_dists_bullseye==2023-04-29T09:31:02Z +packages.trafficmanager.net_snapshot_debian_20230527T000125Z_dists_bullseye-backports==2023-05-26T20:16:08Z +packages.trafficmanager.net_snapshot_debian_20230527T000125Z_dists_bullseye-updates==2023-05-26T20:16:08Z +packages.trafficmanager.net_snapshot_debian_20230527T000125Z_dists_buster==2022-09-10T11:30:54Z +packages.trafficmanager.net_snapshot_debian_20230527T000125Z_dists_buster-backports==2023-05-26T20:16:08Z +packages.trafficmanager.net_snapshot_debian_20230527T000125Z_dists_buster-updates==2023-05-26T20:16:08Z \ 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 936a1fb6e77c..384ba72b8f2b 100644 --- a/files/build/versions/dockers/docker-config-engine-buster/versions-py3 +++ b/files/build/versions/dockers/docker-config-engine-buster/versions-py3 @@ -14,6 +14,6 @@ redis==4.5.5 redis-dump-load==1.1 regex==2023.5.5 six==1.16.0 -typing_extensions==4.6.0 +typing_extensions==4.6.2 xmltodict==0.12.0 zipp==3.15.0 \ No newline at end of file diff --git a/files/build/versions/dockers/docker-ptf/versions-deb-buster b/files/build/versions/dockers/docker-ptf/versions-deb-buster index d9db811cfb8d..68d2faf33e7f 100644 --- a/files/build/versions/dockers/docker-ptf/versions-deb-buster +++ b/files/build/versions/dockers/docker-ptf/versions-deb-buster @@ -259,10 +259,10 @@ 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 +libpython2.7==2.7.16-2+deb10u2 +libpython2.7-dev==2.7.16-2+deb10u2 +libpython2.7-minimal==2.7.16-2+deb10u2 +libpython2.7-stdlib==2.7.16-2+deb10u2 libpython3-dev==3.7.3-1 libpython3-stdlib==3.7.3-1 libpython3.7==3.7.3-2+deb10u4 @@ -413,9 +413,9 @@ python-thrift==0.11.0-4 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 +python2.7==2.7.16-2+deb10u2 +python2.7-dev==2.7.16-2+deb10u2 +python2.7-minimal==2.7.16-2+deb10u2 python3==3.7.3-1 python3-asn1crypto==0.24.0-1 python3-cffi-backend==1.12.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 a1bcf74717e1..c0e70ab01b42 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.5 -grpcio==1.55.0 +grpcio==1.54.2 grpcio-tools==1.20.0 idna==3.4 importlib-resources==5.12.0 @@ -18,7 +18,7 @@ openapi-schema-validator==0.4.4 openapi-spec-validator==0.5.6 pathable==0.4.3 pkgutil_resolve_name==1.3.10 -protobuf==4.23.1 +protobuf==4.23.2 pyrsistent==0.19.3 python-dateutil==2.6.0 requests==2.31.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 a35226470813..f448201f57d9 100644 --- a/files/build/versions/dockers/docker-sonic-vs/versions-deb-buster +++ b/files/build/versions/dockers/docker-sonic-vs/versions-deb-buster @@ -121,10 +121,10 @@ 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 +libpython2.7==2.7.16-2+deb10u2 +libpython2.7-dev==2.7.16-2+deb10u2 +libpython2.7-minimal==2.7.16-2+deb10u2 +libpython2.7-stdlib==2.7.16-2+deb10u2 libpython3-dev==3.7.3-1 libpython3.7-dev==3.7.3-2+deb10u4 libqt5core5a==5.11.3+dfsg1-1+deb10u5 @@ -189,9 +189,9 @@ 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 +python2.7==2.7.16-2+deb10u2 +python2.7-dev==2.7.16-2+deb10u2 +python2.7-minimal==2.7.16-2+deb10u2 python3-dev==3.7.3-1 python3-mako==1.0.7+ds1-1+deb10u1 python3-markdown==3.0.1-3 diff --git a/files/build/versions/dockers/docker-sonic-vs/versions-py2 b/files/build/versions/dockers/docker-sonic-vs/versions-py2 index 1202ed030d5c..4583bc049e04 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.15 \ No newline at end of file +urllib3==1.26.16 \ 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 28f71a18bdf3..77c3f6af811d 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 @@ -35,10 +35,10 @@ 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 +libpython2.7==2.7.16-2+deb10u2 +libpython2.7-dev==2.7.16-2+deb10u2 +libpython2.7-minimal==2.7.16-2+deb10u2 +libpython2.7-stdlib==2.7.16-2+deb10u2 libqt5core5a==5.11.3+dfsg1-1+deb10u5 libqt5dbus5==5.11.3+dfsg1-1+deb10u5 libqt5network5==5.11.3+dfsg1-1+deb10u5 @@ -64,8 +64,8 @@ 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 +python2.7==2.7.16-2+deb10u2 +python2.7-dev==2.7.16-2+deb10u2 +python2.7-minimal==2.7.16-2+deb10u2 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-deb-buster b/files/build/versions/dockers/docker-syncd-centec-rpc/versions-deb-buster index 063b20d55a05..f0ae6faa5266 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 @@ -40,10 +40,10 @@ 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 +libpython2.7==2.7.16-2+deb10u2 +libpython2.7-dev==2.7.16-2+deb10u2 +libpython2.7-minimal==2.7.16-2+deb10u2 +libpython2.7-stdlib==2.7.16-2+deb10u2 libqt5core5a==5.11.3+dfsg1-1+deb10u5 libqt5dbus5==5.11.3+dfsg1-1+deb10u5 libqt5network5==5.11.3+dfsg1-1+deb10u5 @@ -71,8 +71,8 @@ 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 +python2.7==2.7.16-2+deb10u2 +python2.7-dev==2.7.16-2+deb10u2 +python2.7-minimal==2.7.16-2+deb10u2 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/versions-deb-buster-arm64 b/files/build/versions/dockers/docker-syncd-centec/versions-deb-buster-arm64 index ccab4a1c7a72..72a99709db8b 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 @@ -11,10 +11,10 @@ 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 +libpython2.7==2.7.16-2+deb10u2 +libpython2.7-dev==2.7.16-2+deb10u2 +libpython2.7-minimal==2.7.16-2+deb10u2 +libpython2.7-stdlib==2.7.16-2+deb10u2 libsensors-config==1:3.5.0-3 libsensors4-dev==1:3.5.0-3 libsensors5==1:3.5.0-3 @@ -27,9 +27,9 @@ 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 +python2.7==2.7.16-2+deb10u2 +python2.7-dev==2.7.16-2+deb10u2 +python2.7-minimal==2.7.16-2+deb10u2 rpcbind==1.2.5-0.3+deb10u1 sensible-utils==0.0.12 swig==3.0.12-2 diff --git a/files/build/versions/dockers/sonic-slave-bullseye/versions-deb-bullseye b/files/build/versions/dockers/sonic-slave-bullseye/versions-deb-bullseye index 1acd63727704..e2a237125102 100644 --- a/files/build/versions/dockers/sonic-slave-bullseye/versions-deb-bullseye +++ b/files/build/versions/dockers/sonic-slave-bullseye/versions-deb-bullseye @@ -95,7 +95,7 @@ docbook-utils==0.6.14-3.4 docbook-xml==4.5-9 docker-ce==5:20.10.14~3-0~debian-bullseye docker-ce-cli==5:20.10.14~3-0~debian-bullseye -docker-ce-rootless-extras==5:24.0.1-1~debian.11~bullseye +docker-ce-rootless-extras==5:24.0.2-1~debian.11~bullseye docker-scan-plugin==0.23.0~debian-bullseye docutils-common==0.16+dfsg-4 dosfstools==4.2-1 @@ -1102,7 +1102,7 @@ libspice-server1==0.14.3-2.1 libsqlite3-0==3.34.1-3 libsratom-0-0==0.6.8-1 libsrt1.4-gnutls==1.4.2-1.3 -libssh-gcrypt-4==0.9.5-1+deb11u1 +libssh-gcrypt-4==0.9.7-0+deb11u1 libssh2-1==1.9.0-2 libssl-dev==1.1.1n-0+deb11u4 libstdc++-10-dev==10.2.1-6 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 ead3c2879028..8b6af4d730c9 100644 --- a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster +++ b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster @@ -965,10 +965,10 @@ 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 +libpython2.7==2.7.16-2+deb10u2 +libpython2.7-dev==2.7.16-2+deb10u2 +libpython2.7-minimal==2.7.16-2+deb10u2 +libpython2.7-stdlib==2.7.16-2+deb10u2 libpython3-all-dbg==3.7.3-1 libpython3-all-dev==3.7.3-1 libpython3-dbg==3.7.3-1 @@ -1572,9 +1572,9 @@ 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 +python2.7==2.7.16-2+deb10u2 +python2.7-dev==2.7.16-2+deb10u2 +python2.7-minimal==2.7.16-2+deb10u2 python3==3.7.3-1 python3-alabaster==0.7.8-1 python3-all==3.7.3-1 diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-py3 b/files/build/versions/dockers/sonic-slave-buster/versions-py3 index 5a99d3467119..abee70bdd448 100644 --- a/files/build/versions/dockers/sonic-slave-buster/versions-py3 +++ b/files/build/versions/dockers/sonic-slave-buster/versions-py3 @@ -71,7 +71,7 @@ secretstorage==2.3.1 six==1.12.0 sphinx==1.8.4 sphinx-rtd-theme==0.4.3 -typing_extensions==4.6.0 +typing_extensions==4.6.2 unattended-upgrades==0.1 unidiff==0.5.4 urllib3==1.24.1 From 6cf6c59c8ca2f0f29aec705e294af1b0ce44c6bf Mon Sep 17 00:00:00 2001 From: mssonicbld <79238446+mssonicbld@users.noreply.github.com> Date: Sun, 28 May 2023 20:42:02 +0800 Subject: [PATCH 125/193] [ci/build]: Upgrade SONiC package versions (#15245) --- .../versions-py3-all-arm64 | 3 ++- files/build/versions/default/versions-git | 4 ++-- files/build/versions/default/versions-mirror | 20 +++++++++---------- 3 files changed, 14 insertions(+), 13 deletions(-) diff --git a/files/build/versions/build/build-sonic-slave-bullseye/versions-py3-all-arm64 b/files/build/versions/build/build-sonic-slave-bullseye/versions-py3-all-arm64 index 91b7ebfeb13b..74eed0040072 100644 --- a/files/build/versions/build/build-sonic-slave-bullseye/versions-py3-all-arm64 +++ b/files/build/versions/build/build-sonic-slave-bullseye/versions-py3-all-arm64 @@ -1,3 +1,4 @@ bitarray==1.5.3 click==7.0 -requests==2.31.0 \ No newline at end of file +requests==2.31.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 63d96a36c4a0..82d0ed83d6ae 100644 --- a/files/build/versions/default/versions-git +++ b/files/build/versions/default/versions-git @@ -4,8 +4,8 @@ https://github.com/CESNET/libyang.git==ea94c8b9f513f8a6ddc6ce1540fa41eaf4c8922a https://github.com/daveolson53/audisp-tacplus.git==559c9f22edd4f2dea0ecedffb3ad9502b12a75b6 https://github.com/daveolson53/libnss-tacplus.git==19008ab68d9d504aa58eb34d5f564755a1613b8b https://github.com/dyninc/OpenBFDD.git==e35f43ad8d2b3f084e96a84c392528a90d05a287 -https://github.com/flashrom/flashrom.git==ffc75aa710efc8796f0f34c30216ce8a2b1e3954 -https://github.com/FreeRADIUS/freeradius-server.git==049f89875f8a0fb6843a1f276af66ae64da4ce69 +https://github.com/flashrom/flashrom.git==385b3374e37fe1919177978a32fe2f48f2217817 +https://github.com/FreeRADIUS/freeradius-server.git==182e6fe91d4c5a66f720506c7349afefef9a64ec https://github.com/FreeRADIUS/pam_radius.git==8d373539bb9f13b0abfe8bcae0095a930a00fad0 https://github.com/jeroennijhof/pam_tacplus.git==4284d9016e64def2bb81d5f50f96dc3b59bfdc39 https://github.com/jpirko/libteam.git==61e27812c1074a865d7e1a778c0ce442837c28d7 diff --git a/files/build/versions/default/versions-mirror b/files/build/versions/default/versions-mirror index 9b9bd6877a91..80ed3b7297bd 100644 --- a/files/build/versions/default/versions-mirror +++ b/files/build/versions/default/versions-mirror @@ -1,15 +1,15 @@ deb.nodesource.com_node%5f14.x_dists_bullseye==2023-02-17T00:35:28Z deb.nodesource.com_node%5f14.x_dists_buster==2023-02-17T00:35:28Z -debian==20230527T000125Z -debian-security==20230527T000128Z +debian==20230528T000207Z +debian-security==20230528T000210Z download.docker.com_linux_debian_dists_bullseye==2023-05-26T07:49:37Z download.docker.com_linux_debian_dists_buster==2023-05-26T07:49:38Z packages.microsoft.com_repos_sonic-dev_dists_jessie==2022-10-31T19:34:29Z -packages.trafficmanager.net_snapshot_debian-security_20230527T000128Z_dists_bullseye-security==2023-05-26T13:58:25Z -packages.trafficmanager.net_snapshot_debian-security_20230527T000128Z_dists_buster_updates==2023-05-26T13:58:25Z -packages.trafficmanager.net_snapshot_debian_20230527T000125Z_dists_bullseye==2023-04-29T09:31:02Z -packages.trafficmanager.net_snapshot_debian_20230527T000125Z_dists_bullseye-backports==2023-05-26T20:16:08Z -packages.trafficmanager.net_snapshot_debian_20230527T000125Z_dists_bullseye-updates==2023-05-26T20:16:08Z -packages.trafficmanager.net_snapshot_debian_20230527T000125Z_dists_buster==2022-09-10T11:30:54Z -packages.trafficmanager.net_snapshot_debian_20230527T000125Z_dists_buster-backports==2023-05-26T20:16:08Z -packages.trafficmanager.net_snapshot_debian_20230527T000125Z_dists_buster-updates==2023-05-26T20:16:08Z \ No newline at end of file +packages.trafficmanager.net_snapshot_debian-security_20230528T000210Z_dists_bullseye-security==2023-05-27T22:52:33Z +packages.trafficmanager.net_snapshot_debian-security_20230528T000210Z_dists_buster_updates==2023-05-27T22:52:33Z +packages.trafficmanager.net_snapshot_debian_20230528T000207Z_dists_bullseye==2023-04-29T09:31:02Z +packages.trafficmanager.net_snapshot_debian_20230528T000207Z_dists_bullseye-backports==2023-05-27T20:25:46Z +packages.trafficmanager.net_snapshot_debian_20230528T000207Z_dists_bullseye-updates==2023-05-27T20:25:46Z +packages.trafficmanager.net_snapshot_debian_20230528T000207Z_dists_buster==2022-09-10T11:30:54Z +packages.trafficmanager.net_snapshot_debian_20230528T000207Z_dists_buster-backports==2023-05-27T20:25:46Z +packages.trafficmanager.net_snapshot_debian_20230528T000207Z_dists_buster-updates==2023-05-27T20:25:45Z \ No newline at end of file From d5abda649ab166387e08f09359b7a49bb01f3eae Mon Sep 17 00:00:00 2001 From: xumia <59720581+xumia@users.noreply.github.com> Date: Fri, 19 May 2023 02:37:49 +0800 Subject: [PATCH 126/193] Change the docker image from alpine to debian in Makefile (#15132) Why I did it For security and consistency consideration, change the docker image from alpine to Debian in Makefile Work item tracking Microsoft ADO (number only): 23077660 How I did it change the docker image from alpine to Debian in Makefile --- Makefile.work | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.work b/Makefile.work index facb17222c6d..462f2736aa38 100644 --- a/Makefile.work +++ b/Makefile.work @@ -196,7 +196,7 @@ endif DOCKER_LOCKFILE_SAVE := $(DOCKER_LOCKDIR)/docker_save.lock $(shell mkdir -m 0777 -p $(DOCKER_LOCKDIR)) $(shell [ -f $(DOCKER_LOCKFILE_SAVE) ] || (touch $(DOCKER_LOCKFILE_SAVE) && chmod 0777 $(DOCKER_LOCKFILE_SAVE))) -$(docker run --rm -v $(DOCKER_ROOT)\:/mount alpine sh -c 'rm -rf /mount/') +$(shell [ -d $(DOCKER_ROOT) ] && docker run --rm -v $(DOCKER_ROOT)\:/mount debian sh -c 'rm -rf /mount/*') $(mkdir -p $(DOCKER_ROOT)) ifeq ($(DOCKER_BUILDER_MOUNT),) From 9f66b28068e87787be2600afa67492d490ecdf23 Mon Sep 17 00:00:00 2001 From: Neetha John Date: Tue, 30 May 2023 16:15:32 -0700 Subject: [PATCH 127/193] [202205][brcm] Fix alignment of soc properties (#15240) Why I did it To improve readability of config.bcm, fixed the alignment of soc properties How to verify it Build sonic_config_engine-1.0-py3-none-any.whl successfully Signed-off-by: Neetha John --- .../Arista-7050CX3-32S-C32/config.bcm.j2 | 7 ++++--- .../Arista-7050CX3-32S-D48C8/config.bcm.j2 | 7 ++++--- .../Arista-7260CX3-C64/config.bcm.j2 | 16 +++++++++------- .../Arista-7260CX3-D108C10/config.bcm.j2 | 16 +++++++++------- .../Arista-7260CX3-D108C8/config.bcm.j2 | 16 +++++++++------- .../Arista-7260CX3-Q64/config.bcm.j2 | 16 +++++++++------- .../tests/data/j2_template/config.bcm.j2 | 16 +++++++++------- .../py3/arista7050cx3-dualtor.config.bcm | 10 +++++----- .../py3/arista7260-dualtor.config.bcm | 10 +++++----- .../sample_output/py3/arista7260-t1.config.bcm | 4 ++-- 10 files changed, 65 insertions(+), 53 deletions(-) diff --git a/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/config.bcm.j2 b/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/config.bcm.j2 index 1b7eec5d5f1d..6da9bc47c401 100644 --- a/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/config.bcm.j2 +++ b/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/config.bcm.j2 @@ -8,9 +8,10 @@ {%- endif %} {%- endif %} {%- if SYSTEM_DEFAULTS is defined and 'tunnel_qos_remap' in SYSTEM_DEFAULTS and SYSTEM_DEFAULTS['tunnel_qos_remap']['status'] == 'enabled' -%} -{%- set pfcwd_sock = 'hybrid_pfc_deadlock_enable=1 - pfc_deadlock_seq_control=1 - sai_pfc_dlr_init_capability=1' -%} +{%- set pfcwd_sock = +'hybrid_pfc_deadlock_enable=1 +pfc_deadlock_seq_control=1 +sai_pfc_dlr_init_capability=1' -%} {%- endif %} sai_load_hw_config=/etc/bcm/flex/bcm56870_a0_premium_issu/b870.6.4.1/ l3_alpm_hit_skip=1 diff --git a/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/config.bcm.j2 b/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/config.bcm.j2 index 1c928e3c61a1..d54eee299f52 100644 --- a/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/config.bcm.j2 +++ b/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/config.bcm.j2 @@ -8,9 +8,10 @@ {%- endif %} {%- endif %} {%- if SYSTEM_DEFAULTS is defined and 'tunnel_qos_remap' in SYSTEM_DEFAULTS and SYSTEM_DEFAULTS['tunnel_qos_remap']['status'] == 'enabled' -%} -{%- set pfcwd_sock = 'hybrid_pfc_deadlock_enable=1 - pfc_deadlock_seq_control=1 - sai_pfc_dlr_init_capability=1' -%} +{%- set pfcwd_sock = +'hybrid_pfc_deadlock_enable=1 +pfc_deadlock_seq_control=1 +sai_pfc_dlr_init_capability=1' -%} {%- endif %} sai_load_hw_config=/etc/bcm/flex/bcm56870_a0_premium_issu/b870.6.4.1/ l3_alpm_hit_skip=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 d4b9000c378a..97040d332ced 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,18 +13,20 @@ {%- 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 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 %} {%- if SYSTEM_DEFAULTS is defined and 'tunnel_qos_remap' in SYSTEM_DEFAULTS and SYSTEM_DEFAULTS['tunnel_qos_remap']['status'] == 'enabled' -%} -{%- set pfcwd_sock = 'hybrid_pfc_deadlock_enable=1 - pfc_deadlock_seq_control=1 - sai_pfc_dlr_init_capability=1' -%} +{%- set pfcwd_sock = +'hybrid_pfc_deadlock_enable=1 +pfc_deadlock_seq_control=1 +sai_pfc_dlr_init_capability=1' -%} {%- endif %} {# The following is the common soc properties that used to be named "th2-a7260cx3-64-64x100G-t1.config.bcm" #} 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 index c2d1c888d8ea..019f556edb8f 100644 --- 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 @@ -5,17 +5,19 @@ {%- 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 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 %} {%- if SYSTEM_DEFAULTS is defined and 'tunnel_qos_remap' in SYSTEM_DEFAULTS and SYSTEM_DEFAULTS['tunnel_qos_remap']['status'] == 'enabled' -%} -{%- set pfcwd_sock = 'hybrid_pfc_deadlock_enable=1 - pfc_deadlock_seq_control=1 - sai_pfc_dlr_init_capability=1' -%} +{%- set pfcwd_sock = +'hybrid_pfc_deadlock_enable=1 +pfc_deadlock_seq_control=1 +sai_pfc_dlr_init_capability=1' -%} {%- 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 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 cd6cd22c0343..1efa8ef69567 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,17 +5,19 @@ {%- 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 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 %} {%- if SYSTEM_DEFAULTS is defined and 'tunnel_qos_remap' in SYSTEM_DEFAULTS and SYSTEM_DEFAULTS['tunnel_qos_remap']['status'] == 'enabled' -%} -{%- set pfcwd_sock = 'hybrid_pfc_deadlock_enable=1 - pfc_deadlock_seq_control=1 - sai_pfc_dlr_init_capability=1' -%} +{%- set pfcwd_sock = +'hybrid_pfc_deadlock_enable=1 +pfc_deadlock_seq_control=1 +sai_pfc_dlr_init_capability=1' -%} {%- 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 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 55b4c4ba8002..de7cac15435a 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,18 +13,20 @@ {%- 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 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 %} {%- if SYSTEM_DEFAULTS is defined and 'tunnel_qos_remap' in SYSTEM_DEFAULTS and SYSTEM_DEFAULTS['tunnel_qos_remap']['status'] == 'enabled' -%} -{%- set pfcwd_sock = 'hybrid_pfc_deadlock_enable=1 - pfc_deadlock_seq_control=1 - sai_pfc_dlr_init_capability=1' -%} +{%- set pfcwd_sock = +'hybrid_pfc_deadlock_enable=1 +pfc_deadlock_seq_control=1 +sai_pfc_dlr_init_capability=1' -%} {%- endif %} {# The following is the common soc properties that used to be named "th2-a7260cx3-64-64x40G.config.bcm" #} l3_alpm_hit_skip=1 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 index 9ecc43478d6d..61aeb0eff901 100644 --- a/src/sonic-config-engine/tests/data/j2_template/config.bcm.j2 +++ b/src/sonic-config-engine/tests/data/j2_template/config.bcm.j2 @@ -13,18 +13,20 @@ {%- 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 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 %} {%- if SYSTEM_DEFAULTS is defined and 'tunnel_qos_remap' in SYSTEM_DEFAULTS and SYSTEM_DEFAULTS['tunnel_qos_remap']['status'] == 'enabled' -%} -{%- set pfcwd_sock = 'hybrid_pfc_deadlock_enable=1 - pfc_deadlock_seq_control=1 - sai_pfc_dlr_init_capability=1' -%} +{%- set pfcwd_sock = +'hybrid_pfc_deadlock_enable=1 +pfc_deadlock_seq_control=1 +sai_pfc_dlr_init_capability=1' -%} {%- endif %} {# The following is the common soc properties that used to be named "th2-a7260cx3-64-64x100G-t1.config.bcm" #} 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 index 84a04ee72ba1..0f61b372e838 100644 --- 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 @@ -3,9 +3,9 @@ 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 +sai_tunnel_underlay_route_mode=1 +host_as_route_disable=1 +l3_ecmp_levels=2 hybrid_pfc_deadlock_enable=1 - pfc_deadlock_seq_control=1 - sai_pfc_dlr_init_capability=1 +pfc_deadlock_seq_control=1 +sai_pfc_dlr_init_capability=1 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 index 84a04ee72ba1..0f61b372e838 100644 --- 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 @@ -3,9 +3,9 @@ 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 +sai_tunnel_underlay_route_mode=1 +host_as_route_disable=1 +l3_ecmp_levels=2 hybrid_pfc_deadlock_enable=1 - pfc_deadlock_seq_control=1 - sai_pfc_dlr_init_capability=1 +pfc_deadlock_seq_control=1 +sai_pfc_dlr_init_capability=1 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 index bfa22e50fe84..a76c2173f436 100644 --- 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 @@ -4,5 +4,5 @@ l3_alpm_hit_skip=1 mmu_init_config="MSFT-TH2-Tier1" hybrid_pfc_deadlock_enable=1 - pfc_deadlock_seq_control=1 - sai_pfc_dlr_init_capability=1 +pfc_deadlock_seq_control=1 +sai_pfc_dlr_init_capability=1 From a82895659fb476c4c816ee854d53eb494e8f18f8 Mon Sep 17 00:00:00 2001 From: Ye Jianquan Date: Wed, 31 May 2023 09:37:46 +0800 Subject: [PATCH 128/193] [CI/CD] Refine PR test templates and test_plan.py to be ready to migrate to Elastictest (#15258) --- .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 4021541e01d0..6cd658082c15 100644 --- a/.azure-pipelines/run-test-scheduler-template.yml +++ b/.azure-pipelines/run-test-scheduler-template.yml @@ -65,7 +65,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) @@ -78,7 +78,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: @@ -91,7 +91,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: @@ -102,7 +102,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: @@ -113,7 +113,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 36b1341b11b2fc1b3f5fb00425bfd4190e794d40 Mon Sep 17 00:00:00 2001 From: mssonicbld <79238446+mssonicbld@users.noreply.github.com> Date: Thu, 1 Jun 2023 01:53:59 +0800 Subject: [PATCH 129/193] [Mellanox] Update hw-mgmt to 7.0020.4301 (#15260) (#15281) --- 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 f7e49691b634..6270e43a8ccb 100644 --- a/platform/mellanox/hw-management.mk +++ b/platform/mellanox/hw-management.mk @@ -16,7 +16,7 @@ # # Mellanox HW Management -MLNX_HW_MANAGEMENT_VERSION = 7.0020.4104 +MLNX_HW_MANAGEMENT_VERSION = 7.0020.4301 export MLNX_HW_MANAGEMENT_VERSION diff --git a/platform/mellanox/hw-management/hw-mgmt b/platform/mellanox/hw-management/hw-mgmt index 9c3f6b2d6ac4..c036e38b3969 160000 --- a/platform/mellanox/hw-management/hw-mgmt +++ b/platform/mellanox/hw-management/hw-mgmt @@ -1 +1 @@ -Subproject commit 9c3f6b2d6ac4be2eda936522f369ff8920deb4e2 +Subproject commit c036e38b3969e1b0eebbf36ef367bb14cd52bcfb From 6ddd1dd9f17f8d9a46348bb57ef0549903f2855d Mon Sep 17 00:00:00 2001 From: Ye Jianquan Date: Fri, 2 Jun 2023 10:38:58 +0800 Subject: [PATCH 130/193] [CI/CD] Migrate to SONiC Elastictest (#15274) --- azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index b3248b1329b8..27cea8979a84 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -83,7 +83,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 336697d7f6f19389e7cf887791521344e3fd61c7 Mon Sep 17 00:00:00 2001 From: Ye Jianquan Date: Fri, 2 Jun 2023 16:33:38 +0800 Subject: [PATCH 131/193] [CI/CD] Refine pr test definition, remove old test jobs and testbedv2 flags (#15304) --- .../run-test-scheduler-template.yml | 13 ++- azure-pipelines.yml | 89 +++---------------- 2 files changed, 18 insertions(+), 84 deletions(-) diff --git a/.azure-pipelines/run-test-scheduler-template.yml b/.azure-pipelines/run-test-scheduler-template.yml index 6cd658082c15..49c89f4586c7 100644 --- a/.azure-pipelines/run-test-scheduler-template.yml +++ b/.azure-pipelines/run-test-scheduler-template.yml @@ -52,7 +52,7 @@ steps: # always use the test plan script from master branch. wget -O ./.azure-pipelines/test_plan.py https://github.com/raw/sonic-net/sonic-mgmt/master/.azure-pipelines/test_plan.py wget -O ./.azure-pipelines/pr_test_scripts.yaml https://github.com/raw/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 @@ -77,7 +77,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 @@ -88,9 +88,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 @@ -101,7 +100,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 @@ -112,7 +111,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 27cea8979a84..a5353ffb2001 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -139,41 +139,10 @@ stages: testResultsFiles: '**/tr.xml' testRunTitle: vstest - - job: t0_part1 - pool: sonictest - displayName: "kvmtest-t0-part1" - timeoutInMinutes: 360 - 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: 360 - 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 @@ -183,11 +152,10 @@ stages: MAX_WORKER: $(T0_INSTANCE_NUM) MGMT_BRANCH: 202205 - - 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 @@ -199,25 +167,10 @@ stages: DEPLOY_MG_EXTRA_PARAMS: "-e vlan_config=two_vlan_a" MGMT_BRANCH: 202205 - - job: t1_lag_classic - pool: sonictest-t1-lag - displayName: "kvmtest-t1-lag classic" - timeoutInMinutes: 360 - 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 @@ -227,26 +180,10 @@ stages: MAX_WORKER: $(T1_LAG_INSTANCE_NUM) MGMT_BRANCH: 202205 - - job: - pool: sonictest-sonic-t0 - displayName: "kvmtest-t0-sonic" - timeoutInMinutes: 360 - condition: and(succeeded(), eq(variables.BUILD_IMG_RUN_CLASSICAL_TEST, 'YES')) - continueOnError: false - steps: - - template: .azure-pipelines/run-test-template.yml - parameters: - dut: vlab-02 - tbname: vms-kvm-t0-64-32 - ptf_name: ptf_vms6-1 - tbtype: t0-sonic - vmtype: vsonic - - - job: sonic_t0_testbedv2 + - job: sonic_t0_elastictest pool: ubuntu-20.04 - displayName: "kvmtest-t0-sonic by TestbedV2" + displayName: "kvmtest-t0-sonic 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 @@ -260,11 +197,10 @@ stages: SPECIFIED_PARAMS: '{\"test_pretest.py\":[\"--completeness_level=confident\",\"--allow_recover\"],\"test_posttest.py\":[\"--completeness_level=confident\",\"--allow_recover\"]}' MGMT_BRANCH: 202205 - - 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 @@ -275,11 +211,10 @@ stages: COMMON_EXTRA_PARAMS: "--disable_loganalyzer " MGMT_BRANCH: 202205 - - job: multi_asic_testbedv2 + - job: multi_asic_elastictest pool: ubuntu-20.04 - displayName: "kvmtest-multi-asic-t1-lag by TestbedV2" + displayName: "kvmtest-multi-asic-t1-lag by Elastictest" timeoutInMinutes: 1080 - condition: and(succeeded(), eq(variables.BUILD_IMG_RUN_TESTBEDV2_TEST, 'YES')) continueOnError: false steps: - template: .azure-pipelines/run-test-scheduler-template.yml From feb8671601a4d327f68e9ab171eeb74c9d881bee Mon Sep 17 00:00:00 2001 From: Samuel Angebault Date: Fri, 2 Jun 2023 08:36:18 -0700 Subject: [PATCH 132/193] [202205] Implement zram compression for docker in RAM (#15137) * [Arista] Fix boot0 code for docker_inram Enable docker_inram for all systems with 4GB or less of flash. This is mandatory to allow these systems to store 2 SONiC images. This change also fixes the missing docker_inram attribute when installing a new image from SONiC. Because the SWI image can ship with additional kernel parameters within such as `sonic_fips=` this lead to a conflict. To prevent the conflict, the extra kernel parameters from the SWI are now stored in the file `kernel-cmdline-append` which isn't used anywhere. * Add optional zram compression for docker_inram Some devices running SONiC have a small storage device (2G and 4G mainly) The SONiC image growth over time has made it impossible to install 2 images on a single device. Some mitigations have been implemented in the past for some devices but there is a need to do more. One such mitigation is `docker_inram` which creates a `tmpfs` and extracts `dockerfs.tar.gz` in it. This all happens in the SONiC initramfs and by ensuring the installation process does not extract `dockerfs.tar.gz` on the flash but keep the file as is. This mitigation does a tradeoff by using more RAM to reduce the disk footprint. It however creates new issues for devices with 4G of system memory since the extracted `dockerfs.tar.gz` nears the 1.6G. Considering debian upgrades (with dual base images) and the continuous stream of features this is only going to get bigger. This change introduces an alternative to the `tmpfs` by allowing a system to extract the `dockerfs.tar.gz` inside a `zram` device thus bringing compression in play at the detriment of performance. Introduce 2 new optional kernel parameters to be consumed by SONiC initramfs. - `docker_inram_size` which represent the max physical size of the `zram` or `tmpfs` volume (defaults to DOCKER_RAMFS_SIZE) - `docker_inram_algo` which is the method to use to extract the `dockerfs.tar.gz` (defaults to `tmpfs`) other values are considered to be compression algorithm for `zram` (e.g `zstd`, `zlo-rle`, `lz4`) Refactored the logic to mount the docker fs in the SONiC initramfs under the `union-mount` script. Moved the code into a function to make it cleaner and separated the inram volume creation and docker extraction. On Arista platform with a flash smaller or equal to 4GB set `docker_inram_algo` to `zstd` which produces the best compression ratio at the detriment of a slower write performance and a similar read performance to other `zram` compression algorithms. --- build_image.sh | 8 +-- files/Aboot/boot0.j2 | 35 +++++++---- files/initramfs-tools/modules | 1 + files/initramfs-tools/union-mount.j2 | 89 +++++++++++++++++++++------- 4 files changed, 97 insertions(+), 36 deletions(-) diff --git a/build_image.sh b/build_image.sh index 03303fbb41eb..4ec4b5a50653 100755 --- a/build_image.sh +++ b/build_image.sh @@ -202,12 +202,12 @@ elif [ "$IMAGE_TYPE" = "aboot" ]; then zip -g $OUTPUT_ABOOT_IMAGE .platforms_asic if [ "$ENABLE_FIPS" = "y" ]; then - echo "sonic_fips=1" > kernel-cmdline + echo "sonic_fips=1" >> kernel-cmdline-append else - echo "sonic_fips=0" > kernel-cmdline + echo "sonic_fips=0" >> kernel-cmdline-append fi - zip -g $OUTPUT_ABOOT_IMAGE kernel-cmdline - rm kernel-cmdline + zip -g $OUTPUT_ABOOT_IMAGE kernel-cmdline-append + rm kernel-cmdline-append zip -g $OUTPUT_ABOOT_IMAGE $ABOOT_BOOT_IMAGE rm $ABOOT_BOOT_IMAGE diff --git a/files/Aboot/boot0.j2 b/files/Aboot/boot0.j2 index a0b67eeb0f9a..b89acde3265e 100644 --- a/files/Aboot/boot0.j2 +++ b/files/Aboot/boot0.j2 @@ -402,7 +402,7 @@ extract_image() { extract_image_secureboot() { info "Extracting necessary swi content" # NOTE: boot/ is not used by the boot process but only extracted for kdump - unzip -oq "$swipath" 'boot/*' .imagehash -d "$image_path" + unzip -oq "$swipath" 'boot/*' .imagehash kernel-cmdline-append -d "$image_path" ## Extract platform.tar.gz info "Extracting platform.tar.gz" @@ -442,7 +442,7 @@ write_machine_config() { ## Detect SKU and create a hardware description file aboot_version=$(cmdline_get Aboot | sed 's/^.*norcal.-//') if [ -x /bin/sysinit ]; then - aboot_build_date=$(stat -c %y /bin/sysinit | sed 's/ /T/') + aboot_build_date=$(stat -c %y /bin/sysinit | sed 's/ /T/g') else aboot_build_date="unknown" fi @@ -650,10 +650,11 @@ write_platform_specific_cmdline() { else varlog_size=256 cmdline_add logs_inram=on + cmdline_add docker_inram=on + cmdline_add docker_inram_algo=zstd 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 fi @@ -749,13 +750,19 @@ write_cmdline() { 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 + # NOTE: SONiC might need to provide some extra kernel parameter to change the + # next boot behavior. The following lines lookup allowed parameters and + # append them to the cmdline. + # - kernel-cmdline is still modified but its usage should ideally be deprecated over time + # - kernel-cmdline-append is for the user (SONiC) to use. + # this file can be either packaged in the swi or generated from userland + for cpath in "$image_path/kernel-cmdline" "$image_path/kernel-cmdline-append"; do + if [ -f "$cpath" ]; then + for field in $cmdline_allowlist; do + cat "$cpath" | tr ' ' '\n' | grep -E "$field" | tail -n 1 | cmdline_append + done + fi + done # FIXME: legacy configuration files used by fast-reboot and eos2sonic # these should be deprecated over time. @@ -832,11 +839,15 @@ regular_install() { mkdir -p $image_path + info "Generating boot-config, machine.conf and cmdline" + write_regular_configs "$image_path" + info "Installing image under $image_path" extract_image - info "Generating boot-config, machine.conf and cmdline" - write_regular_configs "$image_path" + # NOTE: this call is necessary to process the kernel-cmdline-append file coming + # from the just extracted swi + write_cmdline run_hooks post-install } diff --git a/files/initramfs-tools/modules b/files/initramfs-tools/modules index 349bf37619e4..546660daefe7 100644 --- a/files/initramfs-tools/modules +++ b/files/initramfs-tools/modules @@ -5,3 +5,4 @@ nls_ascii nls_cp437 nls_utf8 nvme +zstd diff --git a/files/initramfs-tools/union-mount.j2 b/files/initramfs-tools/union-mount.j2 index 291806f951e6..fccd21f415ef 100644 --- a/files/initramfs-tools/union-mount.j2 +++ b/files/initramfs-tools/union-mount.j2 @@ -12,6 +12,8 @@ case $1 in esac docker_inram=false +docker_inram_algo=tmpfs +docker_inram_size={{ DOCKER_RAMFS_SIZE }} logs_inram=false secureboot=false bootloader=generic @@ -27,6 +29,12 @@ for x in $(cat /proc/cmdline); do docker_inram=on) docker_inram=true ;; + docker_inram_algo=*) + docker_inram_algo="${x#docker_inram_algo=}" + ;; + docker_inram_size=*) + docker_inram_size="${x#docker_inram_size=}" + ;; logs_inram=on) logs_inram=true ;; @@ -95,6 +103,63 @@ remove_not_in_allowlist_files() rm -f $allowlist_pattern_file } +mount_docker_inram() +{ + if [ "$docker_inram_algo" = "tmpfs" ]; then + echo "Creating tmpfs to extract {{ FILESYSTEM_DOCKERFS }}" + mount -t tmpfs -o "rw,nodev,size=$docker_inram_size" tmpfs "${rootmnt}/var/lib/docker" + else + echo "Creating zram to extract {{ FILESYSTEM_DOCKERFS }}" + modprobe zram num_devices=0 + # create new zram device + local zid="$(cat /sys/class/zram-control/hot_add)" + local zname="zram$zid" + # attempt to use desired algorithm + if ! echo $docker_inram_algo > /sys/block/$zname/comp_algorithm 2>/dev/null; then + echo "zram algorithm $docker_inram_algo is not supported" + echo "using default instead: $(cat /sys/block/$zname/comp_algorithm)" + fi + echo $docker_inram_size > /sys/block/$zname/disksize + # create filesystem on the newly created zram block device + mkfs.ext4 -m 0 -L dockerfs -O '^has_journal' -q /dev/$zname + mount -o rw,nodev /dev/$zname "${rootmnt}/var/lib/docker" + fi +} + +extract_dockerfs() +{ + echo "Extracting {{ FILESYSTEM_DOCKERFS }}" + if [ -f "${rootmnt}/host/$image_dir/{{ FILESYSTEM_DOCKERFS }}" ] && [ "$secureboot" = false ]; then + # Extract dockerfs.tar.gz into /var/lib/docker unless the system booted with secureboot + # In secureboot dockerfs.tar.gz cannot be trusted as it does not have a signature + tar xz --numeric-owner -f ${rootmnt}/host/$image_dir/{{ FILESYSTEM_DOCKERFS }} -C ${rootmnt}/var/lib/docker + elif [ "$bootloader" = "aboot" ] && unzip -l "$swi_path" | grep -q {{ FILESYSTEM_DOCKERFS }}; then + # Aboot swi images also support extracting dockerfs.tar.gz directly from them + unzip -qp "$swi_path" {{ FILESYSTEM_DOCKERFS }} | tar xz --numeric-owner -C ${rootmnt}/var/lib/docker + else + # Warn but allow the system to boot to at least have ssh access + echo "No {{ FILESYSTEM_DOCKERFS }} to extract, SONiC will be broken" + fi +} + +mount_docker() +{ + if [ "$in_kdump" = true ]; then + # There is no point in mounting the docker filesystem in kdump environment + # Especially when there is some space mitigation in place + return + fi + + if [ "$docker_inram" = true ]; then + # Create an in memory filesystem (tmpfs, zram) and extract dockerfs.tar.gz + mount_docker_inram + extract_dockerfs + else + # Mount the working directory of docker engine in the raw partition, bypass the overlay + mount --bind ${rootmnt}/host/$image_dir/{{ DOCKERFS_DIR }} ${rootmnt}/var/lib/docker + fi +} + ## Mount the overlay file system: rw layer over squashfs image_dir=$(cat /proc/cmdline | sed -e 's/.*loop=\(\S*\)\/.*/\1/') rw_dir=${rootmnt}/host/$image_dir/rw @@ -137,30 +202,14 @@ case "${ROOT}" in ;; esac +## Mount the docker storage path mkdir -p ${rootmnt}/var/lib/docker -if [ "$in_kdump" = false ]; then - if [ "$secureboot" = true ]; then - mount -t tmpfs -o rw,nodev,size={{ DOCKER_RAMFS_SIZE }} tmpfs ${rootmnt}/var/lib/docker - if [ "$bootloader" = "aboot" ]; then - unzip -qp "$swi_path" dockerfs.tar.gz | tar xz --numeric-owner -C ${rootmnt}/var/lib/docker - ## Boot folder is not extracted during secureboot since content would inherently become unsafe - mkdir -p ${rootmnt}/host/$image_dir/boot - else - echo "secureboot unsupported for bootloader $bootloader" 1>&2 - exit 1 - fi - elif [ -f ${rootmnt}/host/$image_dir/{{ FILESYSTEM_DOCKERFS }} ]; then - ## mount tmpfs and extract docker into it - mount -t tmpfs -o rw,nodev,size={{ DOCKER_RAMFS_SIZE }} tmpfs ${rootmnt}/var/lib/docker - tar xz --numeric-owner -f ${rootmnt}/host/$image_dir/{{ FILESYSTEM_DOCKERFS }} -C ${rootmnt}/var/lib/docker - else - ## Mount the working directory of docker engine in the raw partition, bypass the overlay - mount --bind ${rootmnt}/host/$image_dir/{{ DOCKERFS_DIR }} ${rootmnt}/var/lib/docker - fi -fi +mount_docker ## Mount the boot directory in the raw partition, bypass the overlay mkdir -p ${rootmnt}/boot +# make sure that the boot folder exists before attempting a mount +mkdir -p ${rootmnt}/host/$image_dir/boot mount --bind ${rootmnt}/host/$image_dir/boot ${rootmnt}/boot ## Mount loop device or tmpfs for /var/log From 723c508a30e0e712ff6e99e97c64830fbd178cc7 Mon Sep 17 00:00:00 2001 From: vmittal-msft <46945843+vmittal-msft@users.noreply.github.com> Date: Fri, 2 Jun 2023 15:48:11 -0700 Subject: [PATCH 133/193] Update PG headroom settings ports based on port speed/cable length (#15287) Why I did it Update cable length for uplink/downlink ports for chassis and and update PG/pool headroom size accordingly. Work item tracking 17880812 How I did it Updated cable length as well as buffer config in HWSKU files. --- .../buffers_defaults_t2.j2 | 11 +- .../buffers_defaults_t2.j2 | 11 +- .../0/buffers_defaults_t2.j2 | 11 +- .../1/buffers_defaults_t2.j2 | 11 +- .../0/buffers_defaults_t2.j2 | 11 +- .../1/buffers_defaults_t2.j2 | 11 +- .../0/buffers_defaults_t2.j2 | 11 +- .../1/buffers_defaults_t2.j2 | 11 +- .../0/buffers_defaults_t2.j2 | 11 +- .../1/buffers_defaults_t2.j2 | 11 +- .../0/buffers_defaults_t2.j2 | 11 +- .../1/buffers_defaults_t2.j2 | 11 +- files/build_templates/buffers_config.j2 | 4 +- ...e-arista-7800r3-48cqm2-lc-t2-minigraph.xml | 2786 +++++++++ ...ista-7800r3a-36dm2-c36-lc-t2-minigraph.xml | 5541 +++++++++++++++++ ...ista-7800r3a-36dm2-d36-lc-t2-minigraph.xml | 5539 ++++++++++++++++ ...le-nokia-ixr7250e-36x100g-t2-minigraph.xml | 5457 ++++++++++++++++ ...le-nokia-ixr7250e-36x400g-t2-minigraph.xml | 2973 +++++++++ .../py2/buffer-arista7800r3-48cq2-lc.json | 2 +- .../py2/buffer-arista7800r3-48cqm2-lc.json | 1517 +++++ .../buffer-arista7800r3a-36dm2-c36-lc.json | 1299 ++++ .../buffer-arista7800r3a-36dm2-d36-lc.json | 1299 ++++ .../py2/buffer-nokia-ixr7250e-36x100g.json | 1083 ++++ .../py2/buffer-nokia-ixr7250e-36x400g.json | 759 +++ .../py2/qos-arista7800r3-48cqm2-lc.json | 1535 +++++ .../py2/qos-arista7800r3a-36dm2-c36-lc.json | 698 +++ .../py2/qos-arista7800r3a-36dm2-d36-lc.json | 698 +++ .../py2/qos-nokia-ixr7250e-36x100g.json | 698 +++ .../py2/qos-nokia-ixr7250e-36x400g.json | 698 +++ .../py3/buffer-arista7800r3-48cq2-lc.json | 2 +- .../py3/buffer-arista7800r3-48cqm2-lc.json | 1517 +++++ .../buffer-arista7800r3a-36dm2-c36-lc.json | 1299 ++++ .../buffer-arista7800r3a-36dm2-d36-lc.json | 1299 ++++ .../py3/buffer-nokia-ixr7250e-36x100g.json | 1083 ++++ .../py3/buffer-nokia-ixr7250e-36x400g.json | 759 +++ .../py3/qos-arista7800r3-48cqm2-lc.json | 1535 +++++ .../py3/qos-arista7800r3a-36dm2-c36-lc.json | 698 +++ .../py3/qos-arista7800r3a-36dm2-d36-lc.json | 698 +++ .../py3/qos-nokia-ixr7250e-36x100g.json | 698 +++ .../py3/qos-nokia-ixr7250e-36x400g.json | 698 +++ src/sonic-config-engine/tests/test_j2files.py | 62 +- 41 files changed, 43037 insertions(+), 29 deletions(-) create mode 100644 src/sonic-config-engine/tests/sample-arista-7800r3-48cqm2-lc-t2-minigraph.xml create mode 100644 src/sonic-config-engine/tests/sample-arista-7800r3a-36dm2-c36-lc-t2-minigraph.xml create mode 100644 src/sonic-config-engine/tests/sample-arista-7800r3a-36dm2-d36-lc-t2-minigraph.xml create mode 100644 src/sonic-config-engine/tests/sample-nokia-ixr7250e-36x100g-t2-minigraph.xml create mode 100644 src/sonic-config-engine/tests/sample-nokia-ixr7250e-36x400g-t2-minigraph.xml create mode 100644 src/sonic-config-engine/tests/sample_output/py2/buffer-arista7800r3-48cqm2-lc.json create mode 100644 src/sonic-config-engine/tests/sample_output/py2/buffer-arista7800r3a-36dm2-c36-lc.json create mode 100644 src/sonic-config-engine/tests/sample_output/py2/buffer-arista7800r3a-36dm2-d36-lc.json create mode 100644 src/sonic-config-engine/tests/sample_output/py2/buffer-nokia-ixr7250e-36x100g.json create mode 100644 src/sonic-config-engine/tests/sample_output/py2/buffer-nokia-ixr7250e-36x400g.json create mode 100644 src/sonic-config-engine/tests/sample_output/py2/qos-arista7800r3-48cqm2-lc.json create mode 100644 src/sonic-config-engine/tests/sample_output/py2/qos-arista7800r3a-36dm2-c36-lc.json create mode 100644 src/sonic-config-engine/tests/sample_output/py2/qos-arista7800r3a-36dm2-d36-lc.json create mode 100644 src/sonic-config-engine/tests/sample_output/py2/qos-nokia-ixr7250e-36x100g.json create mode 100644 src/sonic-config-engine/tests/sample_output/py2/qos-nokia-ixr7250e-36x400g.json create mode 100644 src/sonic-config-engine/tests/sample_output/py3/buffer-arista7800r3-48cqm2-lc.json create mode 100644 src/sonic-config-engine/tests/sample_output/py3/buffer-arista7800r3a-36dm2-c36-lc.json create mode 100644 src/sonic-config-engine/tests/sample_output/py3/buffer-arista7800r3a-36dm2-d36-lc.json create mode 100644 src/sonic-config-engine/tests/sample_output/py3/buffer-nokia-ixr7250e-36x100g.json create mode 100644 src/sonic-config-engine/tests/sample_output/py3/buffer-nokia-ixr7250e-36x400g.json create mode 100644 src/sonic-config-engine/tests/sample_output/py3/qos-arista7800r3-48cqm2-lc.json create mode 100644 src/sonic-config-engine/tests/sample_output/py3/qos-arista7800r3a-36dm2-c36-lc.json create mode 100644 src/sonic-config-engine/tests/sample_output/py3/qos-arista7800r3a-36dm2-d36-lc.json create mode 100644 src/sonic-config-engine/tests/sample_output/py3/qos-nokia-ixr7250e-36x100g.json create mode 100644 src/sonic-config-engine/tests/sample_output/py3/qos-nokia-ixr7250e-36x400g.json diff --git a/device/arista/x86_64-arista_7800r3_48cq2_lc/Arista-7800R3-48CQ2-C48/buffers_defaults_t2.j2 b/device/arista/x86_64-arista_7800r3_48cq2_lc/Arista-7800R3-48CQ2-C48/buffers_defaults_t2.j2 index 278315fb3ee7..6ff77dc43e7f 100644 --- a/device/arista/x86_64-arista_7800r3_48cq2_lc/Arista-7800R3-48CQ2-C48/buffers_defaults_t2.j2 +++ b/device/arista/x86_64-arista_7800r3_48cq2_lc/Arista-7800R3-48CQ2-C48/buffers_defaults_t2.j2 @@ -1,5 +1,14 @@ {%- set default_cable = '300m' %} +{%- set ports2cable = { + 'torrouter_server' : '300m', + 'leafrouter_torrouter' : '300m', + 'spinerouter_leafrouter' : '2000m', + 'regionalhub_spinerouter': '120000m', + 'aznghub_spinerouter' : '120000m' + } +-%} + {%- macro generate_port_lists(PORT_ALL) %} {# Generate list of ports #} {%- for port_idx in range(0,192,4) %} @@ -13,7 +22,7 @@ "size": "6441610000", "type": "both", "mode": "dynamic", - "xoff": "11678515" + "xoff": "20761804" } }, "BUFFER_PROFILE": { diff --git a/device/arista/x86_64-arista_7800r3_48cqm2_lc/Arista-7800R3-48CQM2-C48/buffers_defaults_t2.j2 b/device/arista/x86_64-arista_7800r3_48cqm2_lc/Arista-7800R3-48CQM2-C48/buffers_defaults_t2.j2 index 278315fb3ee7..068cb8a6352c 100644 --- a/device/arista/x86_64-arista_7800r3_48cqm2_lc/Arista-7800R3-48CQM2-C48/buffers_defaults_t2.j2 +++ b/device/arista/x86_64-arista_7800r3_48cqm2_lc/Arista-7800R3-48CQM2-C48/buffers_defaults_t2.j2 @@ -1,5 +1,14 @@ {%- set default_cable = '300m' %} +{%- set ports2cable = { + 'torrouter_server' : '300m', + 'leafrouter_torrouter' : '300m', + 'spinerouter_leafrouter' : '2000m', + 'regionalhub_spinerouter': '120000m', + 'aznghub_spinerouter' : '120000m' + } +-%} + {%- macro generate_port_lists(PORT_ALL) %} {# Generate list of ports #} {%- for port_idx in range(0,192,4) %} @@ -13,7 +22,7 @@ "size": "6441610000", "type": "both", "mode": "dynamic", - "xoff": "11678515" + "xoff": "1056256819" } }, "BUFFER_PROFILE": { diff --git a/device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-C36/0/buffers_defaults_t2.j2 b/device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-C36/0/buffers_defaults_t2.j2 index e7af0aff4934..d6e3466898df 100644 --- a/device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-C36/0/buffers_defaults_t2.j2 +++ b/device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-C36/0/buffers_defaults_t2.j2 @@ -1,5 +1,14 @@ {%- set default_cable = '300m' %} +{%- set ports2cable = { + 'torrouter_server' : '300m', + 'leafrouter_torrouter' : '300m', + 'spinerouter_leafrouter' : '2000m', + 'regionalhub_spinerouter': '120000m', + 'aznghub_spinerouter' : '120000m' + } +-%} + {%- macro generate_port_lists(PORT_ALL) %} {# Generate list of ports #} {%- for port_idx in range(0,144,8) %} @@ -13,7 +22,7 @@ "size": "6441610000", "type": "both", "mode": "dynamic", - "xoff": "11354112" + "xoff": "396096307" } }, "BUFFER_PROFILE": { diff --git a/device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-C36/1/buffers_defaults_t2.j2 b/device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-C36/1/buffers_defaults_t2.j2 index 3555175244d4..341fa591d6f5 100644 --- a/device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-C36/1/buffers_defaults_t2.j2 +++ b/device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-C36/1/buffers_defaults_t2.j2 @@ -1,5 +1,14 @@ {%- set default_cable = '300m' %} +{%- set ports2cable = { + 'torrouter_server' : '300m', + 'leafrouter_torrouter' : '300m', + 'spinerouter_leafrouter' : '2000m', + 'regionalhub_spinerouter': '120000m', + 'aznghub_spinerouter' : '120000m' + } +-%} + {%- macro generate_port_lists(PORT_ALL) %} {# Generate list of ports #} {%- for port_idx in range(144,288,8) %} @@ -13,7 +22,7 @@ "size": "6441610000", "type": "both", "mode": "dynamic", - "xoff": "11354112" + "xoff": "396096307" } }, "BUFFER_PROFILE": { diff --git a/device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-C72/0/buffers_defaults_t2.j2 b/device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-C72/0/buffers_defaults_t2.j2 index b64d225389d0..012a369b542a 100644 --- a/device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-C72/0/buffers_defaults_t2.j2 +++ b/device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-C72/0/buffers_defaults_t2.j2 @@ -1,5 +1,14 @@ {%- set default_cable = '300m' %} +{%- set ports2cable = { + 'torrouter_server' : '300m', + 'leafrouter_torrouter' : '300m', + 'spinerouter_leafrouter' : '2000m', + 'regionalhub_spinerouter': '120000m', + 'aznghub_spinerouter' : '120000m' + } +-%} + {%- macro generate_port_lists(PORT_ALL) %} {# Generate list of ports #} {%- for port_idx in range(0,144,4) %} @@ -13,7 +22,7 @@ "size": "6441610000", "type": "both", "mode": "dynamic", - "xoff": "11354112" + "xoff": "396096307" } }, "BUFFER_PROFILE": { diff --git a/device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-C72/1/buffers_defaults_t2.j2 b/device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-C72/1/buffers_defaults_t2.j2 index b64d225389d0..012a369b542a 100644 --- a/device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-C72/1/buffers_defaults_t2.j2 +++ b/device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-C72/1/buffers_defaults_t2.j2 @@ -1,5 +1,14 @@ {%- set default_cable = '300m' %} +{%- set ports2cable = { + 'torrouter_server' : '300m', + 'leafrouter_torrouter' : '300m', + 'spinerouter_leafrouter' : '2000m', + 'regionalhub_spinerouter': '120000m', + 'aznghub_spinerouter' : '120000m' + } +-%} + {%- macro generate_port_lists(PORT_ALL) %} {# Generate list of ports #} {%- for port_idx in range(0,144,4) %} @@ -13,7 +22,7 @@ "size": "6441610000", "type": "both", "mode": "dynamic", - "xoff": "11354112" + "xoff": "396096307" } }, "BUFFER_PROFILE": { diff --git a/device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-D36/0/buffers_defaults_t2.j2 b/device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-D36/0/buffers_defaults_t2.j2 index e7af0aff4934..a7ba10216954 100644 --- a/device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-D36/0/buffers_defaults_t2.j2 +++ b/device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-D36/0/buffers_defaults_t2.j2 @@ -1,5 +1,14 @@ {%- set default_cable = '300m' %} +{%- set ports2cable = { + 'torrouter_server' : '300m', + 'leafrouter_torrouter' : '300m', + 'spinerouter_leafrouter' : '2000m', + 'regionalhub_spinerouter': '120000m', + 'aznghub_spinerouter' : '120000m' + } +-%} + {%- macro generate_port_lists(PORT_ALL) %} {# Generate list of ports #} {%- for port_idx in range(0,144,8) %} @@ -13,7 +22,7 @@ "size": "6441610000", "type": "both", "mode": "dynamic", - "xoff": "11354112" + "xoff": "1582033305" } }, "BUFFER_PROFILE": { diff --git a/device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-D36/1/buffers_defaults_t2.j2 b/device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-D36/1/buffers_defaults_t2.j2 index 3555175244d4..e61ada6f0891 100644 --- a/device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-D36/1/buffers_defaults_t2.j2 +++ b/device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-D36/1/buffers_defaults_t2.j2 @@ -1,5 +1,14 @@ {%- set default_cable = '300m' %} +{%- set ports2cable = { + 'torrouter_server' : '300m', + 'leafrouter_torrouter' : '300m', + 'spinerouter_leafrouter' : '2000m', + 'regionalhub_spinerouter': '120000m', + 'aznghub_spinerouter' : '120000m' + } +-%} + {%- macro generate_port_lists(PORT_ALL) %} {# Generate list of ports #} {%- for port_idx in range(144,288,8) %} @@ -13,7 +22,7 @@ "size": "6441610000", "type": "both", "mode": "dynamic", - "xoff": "11354112" + "xoff": "1582033305" } }, "BUFFER_PROFILE": { diff --git a/device/nokia/x86_64-nokia_ixr7250e_36x400g-r0/Nokia-IXR7250E-36x100G/0/buffers_defaults_t2.j2 b/device/nokia/x86_64-nokia_ixr7250e_36x400g-r0/Nokia-IXR7250E-36x100G/0/buffers_defaults_t2.j2 index 9aa3e46bcae6..4f5700e4de71 100644 --- a/device/nokia/x86_64-nokia_ixr7250e_36x400g-r0/Nokia-IXR7250E-36x100G/0/buffers_defaults_t2.j2 +++ b/device/nokia/x86_64-nokia_ixr7250e_36x400g-r0/Nokia-IXR7250E-36x100G/0/buffers_defaults_t2.j2 @@ -1,5 +1,14 @@ {%- set default_cable = '300m' %} +{%- set ports2cable = { + 'torrouter_server' : '300m', + 'leafrouter_torrouter' : '300m', + 'spinerouter_leafrouter' : '2000m', + 'regionalhub_spinerouter': '120000m', + 'aznghub_spinerouter' : '120000m' + } +-%} + {%- macro generate_port_lists(PORT_ALL) %} {# Generate list of ports #} {%- for port_idx in range(0,36) %} @@ -13,7 +22,7 @@ "size": "6441610000", "type": "both", "mode": "dynamic", - "xoff": "24979046" + "xoff": "7785676" } }, "BUFFER_PROFILE": { diff --git a/device/nokia/x86_64-nokia_ixr7250e_36x400g-r0/Nokia-IXR7250E-36x100G/1/buffers_defaults_t2.j2 b/device/nokia/x86_64-nokia_ixr7250e_36x400g-r0/Nokia-IXR7250E-36x100G/1/buffers_defaults_t2.j2 index 9aa3e46bcae6..4f5700e4de71 100644 --- a/device/nokia/x86_64-nokia_ixr7250e_36x400g-r0/Nokia-IXR7250E-36x100G/1/buffers_defaults_t2.j2 +++ b/device/nokia/x86_64-nokia_ixr7250e_36x400g-r0/Nokia-IXR7250E-36x100G/1/buffers_defaults_t2.j2 @@ -1,5 +1,14 @@ {%- set default_cable = '300m' %} +{%- set ports2cable = { + 'torrouter_server' : '300m', + 'leafrouter_torrouter' : '300m', + 'spinerouter_leafrouter' : '2000m', + 'regionalhub_spinerouter': '120000m', + 'aznghub_spinerouter' : '120000m' + } +-%} + {%- macro generate_port_lists(PORT_ALL) %} {# Generate list of ports #} {%- for port_idx in range(0,36) %} @@ -13,7 +22,7 @@ "size": "6441610000", "type": "both", "mode": "dynamic", - "xoff": "24979046" + "xoff": "7785676" } }, "BUFFER_PROFILE": { diff --git a/device/nokia/x86_64-nokia_ixr7250e_36x400g-r0/Nokia-IXR7250E-36x400G/0/buffers_defaults_t2.j2 b/device/nokia/x86_64-nokia_ixr7250e_36x400g-r0/Nokia-IXR7250E-36x400G/0/buffers_defaults_t2.j2 index 7eb92f11ca7f..f6ceecc55411 100644 --- a/device/nokia/x86_64-nokia_ixr7250e_36x400g-r0/Nokia-IXR7250E-36x400G/0/buffers_defaults_t2.j2 +++ b/device/nokia/x86_64-nokia_ixr7250e_36x400g-r0/Nokia-IXR7250E-36x400G/0/buffers_defaults_t2.j2 @@ -1,5 +1,14 @@ {%- set default_cable = '300m' %} +{%- set ports2cable = { + 'torrouter_server' : '300m', + 'leafrouter_torrouter' : '300m', + 'spinerouter_leafrouter' : '2000m', + 'regionalhub_spinerouter': '120000m', + 'aznghub_spinerouter' : '120000m' + } +-%} + {%- macro generate_port_lists(PORT_ALL) %} {# Generate list of ports #} {%- for port_idx in range(0,36) %} @@ -13,7 +22,7 @@ "size": "6441610000", "type": "both", "mode": "dynamic", - "xoff": "11354112" + "xoff": "1582033305" } }, "BUFFER_PROFILE": { diff --git a/device/nokia/x86_64-nokia_ixr7250e_36x400g-r0/Nokia-IXR7250E-36x400G/1/buffers_defaults_t2.j2 b/device/nokia/x86_64-nokia_ixr7250e_36x400g-r0/Nokia-IXR7250E-36x400G/1/buffers_defaults_t2.j2 index 7eb92f11ca7f..f6ceecc55411 100644 --- a/device/nokia/x86_64-nokia_ixr7250e_36x400g-r0/Nokia-IXR7250E-36x400G/1/buffers_defaults_t2.j2 +++ b/device/nokia/x86_64-nokia_ixr7250e_36x400g-r0/Nokia-IXR7250E-36x400G/1/buffers_defaults_t2.j2 @@ -1,5 +1,14 @@ {%- set default_cable = '300m' %} +{%- set ports2cable = { + 'torrouter_server' : '300m', + 'leafrouter_torrouter' : '300m', + 'spinerouter_leafrouter' : '2000m', + 'regionalhub_spinerouter': '120000m', + 'aznghub_spinerouter' : '120000m' + } +-%} + {%- macro generate_port_lists(PORT_ALL) %} {# Generate list of ports #} {%- for port_idx in range(0,36) %} @@ -13,7 +22,7 @@ "size": "6441610000", "type": "both", "mode": "dynamic", - "xoff": "11354112" + "xoff": "1582033305" } }, "BUFFER_PROFILE": { diff --git a/files/build_templates/buffers_config.j2 b/files/build_templates/buffers_config.j2 index 2ba9d009062f..d6063312e0e8 100644 --- a/files/build_templates/buffers_config.j2 +++ b/files/build_templates/buffers_config.j2 @@ -41,7 +41,9 @@ def 'internal' : '5m', 'torrouter_server' : '5m', 'leafrouter_torrouter' : '40m', - 'spinerouter_leafrouter' : '300m' + 'spinerouter_leafrouter' : '300m', + 'regionalhub_spinerouter': '80000m', + 'aznghub_spinerouter' : '80000m' } -%} {%- endif %} diff --git a/src/sonic-config-engine/tests/sample-arista-7800r3-48cqm2-lc-t2-minigraph.xml b/src/sonic-config-engine/tests/sample-arista-7800r3-48cqm2-lc-t2-minigraph.xml new file mode 100644 index 000000000000..f2332c5cacd5 --- /dev/null +++ b/src/sonic-config-engine/tests/sample-arista-7800r3-48cqm2-lc-t2-minigraph.xml @@ -0,0 +1,2786 @@ + + + + + + dut-lc4 + 1.1.1.3 + dut-lc3 + 1.1.1.1 + true + + + dut-lc5 + 1.1.1.5 + dut-lc3 + 1.1.1.1 + true + + + + + 65001 + dut-lc4 + + + + + + 65001 + dut-lc5 + + + + + + 65001 + dut-lc3 + + +
1.1.1.1
+ + + + +
1.1.1.1
+ + + + + + + + + + + + + + HostIP + Loopback0 + + 10.1.0.1/32 + + 10.1.0.1/32 + + + HostIP + Loopback0 + + FC00:10::1/128 + + FC00:10::1/128 + + + + + ManagementIP1 + eth0 + 10.240.76.57/25 + + + ManagementIP2 + eth0 + fdfd:5c41:712d:e049::af0:4c39/64 + + + + + Ethernet-IB0 + port + 1.1.1.1/32 + + + Ethernet-IB0 + port + fc00:3000::1/128 + + + + + + dut-lc3 + + + + + + + IPInterface + + Ethernet1/1 + 10.0.0.2/31 + + + IPInterface + + Ethernet10/1 + 10.0.0.4/31 + + + IPInterface + + Ethernet11/1 + 10.0.0.6/31 + + + IPInterface + + Ethernet12/1 + 10.0.0.8/31 + + + IPInterface + + Ethernet13/1 + 10.0.0.10/31 + + + IPInterface + + Ethernet14/1 + 10.0.0.12/31 + + + IPInterface + + Ethernet15/1 + 10.0.0.14/31 + + + IPInterface + + Ethernet16/1 + 10.0.0.16/31 + + + IPInterface + + Ethernet17/1 + 10.0.0.18/31 + + + IPInterface + + Ethernet18/1 + 10.0.0.20/31 + + + IPInterface + + Ethernet19/1 + 10.0.0.22/31 + + + IPInterface + + Ethernet2/1 + 10.0.0.24/31 + + + IPInterface + + Ethernet20/1 + 10.0.0.26/31 + + + IPInterface + + Ethernet21/1 + 10.0.0.28/31 + + + IPInterface + + Ethernet22/1 + 10.0.0.30/31 + + + IPInterface + + Ethernet23/1 + 10.0.0.32/31 + + + IPInterface + + Ethernet24/1 + 10.0.0.34/31 + + + IPInterface + + Ethernet25/1 + 10.0.0.36/31 + + + IPInterface + + Ethernet26/1 + 10.0.0.38/31 + + + IPInterface + + Ethernet27/1 + 10.0.0.40/31 + + + IPInterface + + Ethernet28/1 + 10.0.0.42/31 + + + IPInterface + + Ethernet29/1 + 10.0.0.44/31 + + + IPInterface + + Ethernet3/1 + 10.0.0.46/31 + + + IPInterface + + Ethernet30/1 + 10.0.0.48/31 + + + IPInterface + + Ethernet31/1 + 10.0.0.50/31 + + + IPInterface + + Ethernet32/1 + 10.0.0.52/31 + + + IPInterface + + Ethernet33/1 + 10.0.0.54/31 + + + IPInterface + + Ethernet34/1 + 10.0.0.56/31 + + + IPInterface + + Ethernet35/1 + 10.0.0.58/31 + + + IPInterface + + Ethernet36/1 + 10.0.0.60/31 + + + IPInterface + + Ethernet37/1 + 10.0.0.62/31 + + + IPInterface + + Ethernet38/1 + 10.0.0.64/31 + + + IPInterface + + Ethernet39/1 + 10.0.0.66/31 + + + IPInterface + + Ethernet4/1 + 10.0.0.68/31 + + + IPInterface + + Ethernet40/1 + 10.0.0.70/31 + + + IPInterface + + Ethernet42/1 + 10.0.0.72/31 + + + IPInterface + + Ethernet45/1 + 10.0.0.74/31 + + + IPInterface + + Ethernet46/1 + 10.0.0.76/31 + + + IPInterface + + Ethernet47/1 + 10.0.0.78/31 + + + IPInterface + + Ethernet48/1 + 10.0.0.80/31 + + + IPInterface + + Ethernet5/1 + 10.0.0.82/31 + + + IPInterface + + Ethernet6/1 + 10.0.0.84/31 + + + IPInterface + + Ethernet7/1 + 10.0.0.86/31 + + + IPInterface + + Ethernet8/1 + 10.0.0.88/31 + + + IPInterface + + Ethernet9/1 + 10.0.0.90/31 + + + IPInterface + + Ethernet-Rec0 + 10.0.0.92/31 + + + IPInterface + + Ethernet-IB0 + 1.1.1.1/32 + + + + + + + + + + + + DeviceInterfaceLink + 100000 + nvm473 + Ethernet180 + dut-lc3 + Ethernet0 + + + DeviceInterfaceLink + 100000 + nv338 + Ethernet20 + dut-lc3 + Ethernet36 + + + DeviceInterfaceLink + 100000 + nv338 + Ethernet24 + dut-lc3 + Ethernet40 + + + DeviceInterfaceLink + 100000 + nv338 + Ethernet28 + dut-lc3 + Ethernet44 + + + DeviceInterfaceLink + 100000 + nv338 + Ethernet32 + dut-lc3 + Ethernet48 + + + DeviceInterfaceLink + 100000 + nv338 + Ethernet40 + dut-lc3 + Ethernet52 + + + DeviceInterfaceLink + 100000 + nv338 + Ethernet36 + dut-lc3 + Ethernet56 + + + DeviceInterfaceLink + 100000 + nv338 + Ethernet44 + dut-lc3 + Ethernet60 + + + DeviceInterfaceLink + 100000 + nv338 + Ethernet132 + dut-lc3 + Ethernet64 + + + DeviceInterfaceLink + 100000 + nv338 + Ethernet128 + dut-lc3 + Ethernet68 + + + DeviceInterfaceLink + 100000 + nv338 + Ethernet136 + dut-lc3 + Ethernet72 + + + DeviceInterfaceLink + 100000 + nvm473 + Ethernet176 + dut-lc3 + Ethernet4 + + + DeviceInterfaceLink + 100000 + nv338 + Ethernet140 + dut-lc3 + Ethernet76 + + + DeviceInterfaceLink + 100000 + nv338 + Ethernet144 + dut-lc3 + Ethernet80 + + + DeviceInterfaceLink + 100000 + nv338 + Ethernet148 + dut-lc3 + Ethernet84 + + + DeviceInterfaceLink + 100000 + nv338 + Ethernet152 + dut-lc3 + Ethernet88 + + + DeviceInterfaceLink + 100000 + nv338 + Ethernet156 + dut-lc3 + Ethernet92 + + + DeviceInterfaceLink + 100000 + nv338 + Ethernet64 + dut-lc3 + Ethernet96 + + + DeviceInterfaceLink + 100000 + nv338 + Ethernet68 + dut-lc3 + Ethernet100 + + + DeviceInterfaceLink + 100000 + nv338 + Ethernet72 + dut-lc3 + Ethernet104 + + + DeviceInterfaceLink + 100000 + nv338 + Ethernet76 + dut-lc3 + Ethernet108 + + + DeviceInterfaceLink + 100000 + nv338 + Ethernet80 + dut-lc3 + Ethernet112 + + + DeviceInterfaceLink + 100000 + nvm473 + Ethernet188 + dut-lc3 + Ethernet8 + + + DeviceInterfaceLink + 100000 + nv338 + Ethernet84 + dut-lc3 + Ethernet116 + + + DeviceInterfaceLink + 100000 + nv338 + Ethernet88 + dut-lc3 + Ethernet120 + + + DeviceInterfaceLink + 100000 + nv338 + Ethernet92 + dut-lc3 + Ethernet124 + + + DeviceInterfaceLink + 100000 + nv338 + Ethernet96 + dut-lc3 + Ethernet128 + + + DeviceInterfaceLink + 100000 + nv338 + Ethernet100 + dut-lc3 + Ethernet132 + + + DeviceInterfaceLink + 100000 + nv338 + Ethernet104 + dut-lc3 + Ethernet136 + + + DeviceInterfaceLink + 100000 + nv338 + Ethernet108 + dut-lc3 + Ethernet140 + + + DeviceInterfaceLink + 100000 + nv338 + Ethernet240 + dut-lc3 + Ethernet144 + + + DeviceInterfaceLink + 100000 + nv338 + Ethernet244 + dut-lc3 + Ethernet148 + + + DeviceInterfaceLink + 100000 + nv338 + Ethernet248 + dut-lc3 + Ethernet152 + + + DeviceInterfaceLink + 100000 + nvm473 + Ethernet184 + dut-lc3 + Ethernet12 + + + DeviceInterfaceLink + 100000 + nv338 + Ethernet252 + dut-lc3 + Ethernet156 + + + DeviceInterfaceLink + 100000 + nvm473 + Ethernet192 + dut-lc3 + Ethernet164 + + + DeviceInterfaceLink + 100000 + nv338 + Ethernet112 + dut-lc3 + Ethernet176 + + + DeviceInterfaceLink + 100000 + nv338 + Ethernet116 + dut-lc3 + Ethernet180 + + + DeviceInterfaceLink + 100000 + nv338 + Ethernet120 + dut-lc3 + Ethernet184 + + + DeviceInterfaceLink + 100000 + nv338 + Ethernet124 + dut-lc3 + Ethernet188 + + + DeviceInterfaceLink + 100000 + nv338 + Ethernet0 + dut-lc3 + Ethernet16 + + + DeviceInterfaceLink + 100000 + nv338 + Ethernet4 + dut-lc3 + Ethernet20 + + + DeviceInterfaceLink + 100000 + nv338 + Ethernet8 + dut-lc3 + Ethernet24 + + + DeviceInterfaceLink + 100000 + nv338 + Ethernet12 + dut-lc3 + Ethernet28 + + + DeviceInterfaceLink + 100000 + nv338 + Ethernet16 + dut-lc3 + Ethernet32 + + + + + dut-lc3 + Arista-7800R3-48CQ2-C48 + + + + + + + dut-lc3 + + + ForcedMgmtRoutes + + 172.16.0.0/12;10.80.0.0/12;10.64.0.0/14;10.240.0.0/13 + + ForcedMgmtRoutes + + FD7A:629F:52A4::/48;FDFD:5C41:712D::/48 + + + SwitchId + + 0 + + + NtpResources + time.aristanetworks.com + + + SwitchType + + voq + + + MaxCores + + 16 + + + SubRole + + + + + + + + + + + Arista-7800R3-48CQ2-C48 + + + Ethernet1/1 + eth1/1-connected-to-nvm473@eth46/1 + 100000 + rs + + + Ethernet10/1 + eth10/1-connected-to-nv338@eth6/1 + 100000 + rs + + + Ethernet11/1 + eth11/1-connected-to-nv338@eth7/1 + 100000 + rs + + + Ethernet12/1 + eth12/1-connected-to-nv338@eth8/1 + 100000 + rs + + + Ethernet13/1 + eth13/1-connected-to-nv338@eth9/1 + 100000 + rs + + + Ethernet14/1 + eth14/1-connected-to-nv338@eth11/1 + 100000 + rs + + + Ethernet15/1 + eth15/1-connected-to-nv338@eth10/1 + 100000 + rs + + + Ethernet16/1 + eth16/1-connected-to-nv338@eth12/1 + 100000 + rs + + + Ethernet17/1 + eth17/1-connected-to-nv338@eth34/1 + 100000 + rs + + + Ethernet18/1 + eth18/1-connected-to-nv338@eth33/1 + 100000 + rs + + + Ethernet19/1 + eth19/1-connected-to-nv338@eth35/1 + 100000 + rs + + + Ethernet2/1 + eth2/1-connected-to-nvm473@eth45/1 + 100000 + rs + + + Ethernet20/1 + eth20/1-connected-to-nv338@eth36/1 + 100000 + rs + + + Ethernet21/1 + eth21/1-connected-to-nv338@eth37/1 + 100000 + rs + + + Ethernet22/1 + eth22/1-connected-to-nv338@eth38/1 + 100000 + none + + + Ethernet23/1 + eth23/1-connected-to-nv338@eth39/1 + 100000 + none + + + Ethernet24/1 + eth24/1-connected-to-nv338@eth40/1 + 100000 + none + + + Ethernet25/1 + eth25/1-connected-to-nv338@eth17/1 + 100000 + none + + + Ethernet26/1 + eth26/1-connected-to-nv338@eth18/1 + 100000 + none + + + Ethernet27/1 + eth27/1-connected-to-nv338@eth19/1 + 100000 + none + + + Ethernet28/1 + eth28/1-connected-to-nv338@eth20/1 + 100000 + rs + + + Ethernet29/1 + eth29/1-connected-to-nv338@eth21/1 + 100000 + rs + + + Ethernet3/1 + eth3/1-connected-to-nvm473@eth48/1 + 100000 + rs + + + Ethernet30/1 + eth30/1-connected-to-nv338@eth22/1 + 100000 + rs + + + Ethernet31/1 + eth31/1-connected-to-nv338@eth23/1 + 100000 + rs + + + Ethernet32/1 + eth32/1-connected-to-nv338@eth24/1 + 100000 + rs + + + Ethernet33/1 + eth33/1-connected-to-nv338@eth25/1 + 100000 + rs + + + Ethernet34/1 + eth34/1-connected-to-nv338@eth26/1 + 100000 + rs + + + Ethernet35/1 + eth35/1-connected-to-nv338@eth27/1 + 100000 + rs + + + Ethernet36/1 + eth36/1-connected-to-nv338@eth28/1 + 100000 + rs + + + Ethernet37/1 + eth37/1-connected-to-nv338@eth61/1 + 100000 + rs + + + Ethernet38/1 + eth38/1-connected-to-nv338@eth62/1 + 100000 + rs + + + Ethernet39/1 + eth39/1-connected-to-nv338@eth63/1 + 100000 + rs + + + Ethernet4/1 + eth4/1-connected-to-nvm473@eth47/1 + 100000 + rs + + + Ethernet40/1 + eth40/1-connected-to-nv338@eth64/1 + 100000 + rs + + + Ethernet42/1 + eth42/1-connected-to-nvm473@eth49/1 + 100000 + rs + + + Ethernet45/1 + eth45/1-connected-to-nv338@eth29/1 + 100000 + rs + + + Ethernet46/1 + eth46/1-connected-to-nv338@eth30/1 + 100000 + rs + + + Ethernet47/1 + eth47/1-connected-to-nv338@eth31/1 + 100000 + rs + + + Ethernet48/1 + eth48/1-connected-to-nv338@eth32/1 + 100000 + rs + + + Ethernet5/1 + eth5/1-connected-to-nv338@eth1/1 + 100000 + rs + + + Ethernet6/1 + eth6/1-connected-to-nv338@eth2/1 + 100000 + rs + + + Ethernet7/1 + eth7/1-connected-to-nv338@eth3/1 + 100000 + rs + + + Ethernet8/1 + eth8/1-connected-to-nv338@eth4/1 + 100000 + rs + + + Ethernet9/1 + eth9/1-connected-to-nv338@eth5/1 + 100000 + rs + + + + + eth0 + eth0 + 1000 + + + eth0 + eth0 + 1000 + + + + + Cpu0 + dut-lc3 + Asic0 + 10000 + 1 + 0 + 0 + 0 + 8 + + + Ethernet0 + dut-lc3 + Asic0 + 100000 + 2 + 0 + 0 + 1 + 8 + + + Ethernet4 + dut-lc3 + Asic0 + 100000 + 3 + 0 + 0 + 2 + 8 + + + Ethernet8 + dut-lc3 + Asic0 + 100000 + 4 + 0 + 0 + 3 + 8 + + + Ethernet12 + dut-lc3 + Asic0 + 100000 + 5 + 0 + 0 + 4 + 8 + + + Ethernet16 + dut-lc3 + Asic0 + 100000 + 6 + 0 + 0 + 5 + 8 + + + Ethernet20 + dut-lc3 + Asic0 + 100000 + 7 + 0 + 0 + 6 + 8 + + + Ethernet24 + dut-lc3 + Asic0 + 100000 + 8 + 0 + 0 + 7 + 8 + + + Ethernet28 + dut-lc3 + Asic0 + 100000 + 9 + 0 + 0 + 8 + 8 + + + Ethernet32 + dut-lc3 + Asic0 + 100000 + 10 + 0 + 0 + 9 + 8 + + + Ethernet36 + dut-lc3 + Asic0 + 100000 + 11 + 0 + 0 + 10 + 8 + + + Ethernet40 + dut-lc3 + Asic0 + 100000 + 12 + 0 + 0 + 11 + 8 + + + Ethernet44 + dut-lc3 + Asic0 + 100000 + 13 + 0 + 0 + 12 + 8 + + + Ethernet48 + dut-lc3 + Asic0 + 100000 + 14 + 0 + 0 + 13 + 8 + + + Ethernet52 + dut-lc3 + Asic0 + 100000 + 15 + 0 + 0 + 14 + 8 + + + Ethernet56 + dut-lc3 + Asic0 + 100000 + 16 + 0 + 0 + 15 + 8 + + + Ethernet60 + dut-lc3 + Asic0 + 100000 + 17 + 0 + 0 + 16 + 8 + + + Ethernet64 + dut-lc3 + Asic0 + 100000 + 18 + 0 + 0 + 17 + 8 + + + Ethernet68 + dut-lc3 + Asic0 + 100000 + 19 + 0 + 0 + 18 + 8 + + + Ethernet72 + dut-lc3 + Asic0 + 100000 + 20 + 0 + 0 + 19 + 8 + + + Ethernet76 + dut-lc3 + Asic0 + 100000 + 21 + 0 + 0 + 20 + 8 + + + Ethernet80 + dut-lc3 + Asic0 + 100000 + 22 + 0 + 0 + 21 + 8 + + + Ethernet84 + dut-lc3 + Asic0 + 100000 + 23 + 0 + 0 + 22 + 8 + + + Ethernet88 + dut-lc3 + Asic0 + 100000 + 24 + 0 + 0 + 23 + 8 + + + Ethernet92 + dut-lc3 + Asic0 + 100000 + 25 + 0 + 0 + 24 + 8 + + + Ethernet96 + dut-lc3 + Asic0 + 100000 + 26 + 0 + 1 + 25 + 8 + + + Ethernet100 + dut-lc3 + Asic0 + 100000 + 27 + 0 + 1 + 26 + 8 + + + Ethernet104 + dut-lc3 + Asic0 + 100000 + 28 + 0 + 1 + 27 + 8 + + + Ethernet108 + dut-lc3 + Asic0 + 100000 + 29 + 0 + 1 + 28 + 8 + + + Ethernet112 + dut-lc3 + Asic0 + 100000 + 30 + 0 + 1 + 29 + 8 + + + Ethernet116 + dut-lc3 + Asic0 + 100000 + 31 + 0 + 1 + 30 + 8 + + + Ethernet120 + dut-lc3 + Asic0 + 100000 + 32 + 0 + 1 + 31 + 8 + + + Ethernet124 + dut-lc3 + Asic0 + 100000 + 33 + 0 + 1 + 32 + 8 + + + Ethernet128 + dut-lc3 + Asic0 + 100000 + 34 + 0 + 1 + 33 + 8 + + + Ethernet132 + dut-lc3 + Asic0 + 100000 + 35 + 0 + 1 + 34 + 8 + + + Ethernet136 + dut-lc3 + Asic0 + 100000 + 36 + 0 + 1 + 35 + 8 + + + Ethernet140 + dut-lc3 + Asic0 + 100000 + 37 + 0 + 1 + 36 + 8 + + + Ethernet144 + dut-lc3 + Asic0 + 100000 + 38 + 0 + 1 + 37 + 8 + + + Ethernet148 + dut-lc3 + Asic0 + 100000 + 39 + 0 + 1 + 38 + 8 + + + Ethernet152 + dut-lc3 + Asic0 + 100000 + 40 + 0 + 1 + 39 + 8 + + + Ethernet156 + dut-lc3 + Asic0 + 100000 + 41 + 0 + 1 + 40 + 8 + + + Ethernet160 + dut-lc3 + Asic0 + 100000 + 42 + 0 + 1 + 41 + 8 + + + Ethernet164 + dut-lc3 + Asic0 + 100000 + 43 + 0 + 1 + 42 + 8 + + + Ethernet168 + dut-lc3 + Asic0 + 100000 + 44 + 0 + 1 + 43 + 8 + + + Ethernet172 + dut-lc3 + Asic0 + 100000 + 45 + 0 + 1 + 44 + 8 + + + Ethernet176 + dut-lc3 + Asic0 + 100000 + 46 + 0 + 1 + 45 + 8 + + + Ethernet180 + dut-lc3 + Asic0 + 100000 + 47 + 0 + 1 + 46 + 8 + + + Ethernet184 + dut-lc3 + Asic0 + 100000 + 48 + 0 + 1 + 47 + 8 + + + Ethernet188 + dut-lc3 + Asic0 + 100000 + 49 + 0 + 1 + 48 + 8 + + + Ethernet-Rec0 + dut-lc3 + Asic0 + 400000 + 50 + 0 + 0 + 221 + 8 + + + Ethernet-IB0 + dut-lc3 + Asic0 + 400000 + 51 + 0 + 1 + 222 + 8 + + + Cpu0 + dut-lc4 + Asic0 + 10000 + 52 + 2 + 0 + 0 + 8 + + + Ethernet0 + dut-lc4 + Asic0 + 100000 + 53 + 2 + 0 + 1 + 8 + + + Ethernet4 + dut-lc4 + Asic0 + 100000 + 54 + 2 + 0 + 2 + 8 + + + Ethernet8 + dut-lc4 + Asic0 + 100000 + 55 + 2 + 0 + 3 + 8 + + + Ethernet12 + dut-lc4 + Asic0 + 100000 + 56 + 2 + 0 + 4 + 8 + + + Ethernet16 + dut-lc4 + Asic0 + 100000 + 57 + 2 + 0 + 5 + 8 + + + Ethernet20 + dut-lc4 + Asic0 + 100000 + 58 + 2 + 0 + 6 + 8 + + + Ethernet24 + dut-lc4 + Asic0 + 100000 + 59 + 2 + 0 + 7 + 8 + + + Ethernet28 + dut-lc4 + Asic0 + 100000 + 60 + 2 + 0 + 8 + 8 + + + Ethernet32 + dut-lc4 + Asic0 + 100000 + 61 + 2 + 0 + 9 + 8 + + + Ethernet36 + dut-lc4 + Asic0 + 100000 + 62 + 2 + 0 + 10 + 8 + + + Ethernet40 + dut-lc4 + Asic0 + 100000 + 63 + 2 + 0 + 11 + 8 + + + Ethernet44 + dut-lc4 + Asic0 + 100000 + 64 + 2 + 0 + 12 + 8 + + + Ethernet48 + dut-lc4 + Asic0 + 100000 + 65 + 2 + 0 + 13 + 8 + + + Ethernet52 + dut-lc4 + Asic0 + 100000 + 66 + 2 + 0 + 14 + 8 + + + Ethernet56 + dut-lc4 + Asic0 + 100000 + 67 + 2 + 0 + 15 + 8 + + + Ethernet60 + dut-lc4 + Asic0 + 100000 + 68 + 2 + 0 + 16 + 8 + + + Ethernet64 + dut-lc4 + Asic0 + 100000 + 69 + 2 + 0 + 17 + 8 + + + Ethernet68 + dut-lc4 + Asic0 + 100000 + 70 + 2 + 0 + 18 + 8 + + + Ethernet72 + dut-lc4 + Asic0 + 100000 + 71 + 2 + 0 + 19 + 8 + + + Ethernet76 + dut-lc4 + Asic0 + 100000 + 72 + 2 + 0 + 20 + 8 + + + Ethernet80 + dut-lc4 + Asic0 + 100000 + 73 + 2 + 0 + 21 + 8 + + + Ethernet84 + dut-lc4 + Asic0 + 100000 + 74 + 2 + 0 + 22 + 8 + + + Ethernet88 + dut-lc4 + Asic0 + 100000 + 75 + 2 + 0 + 23 + 8 + + + Ethernet92 + dut-lc4 + Asic0 + 100000 + 76 + 2 + 0 + 24 + 8 + + + Ethernet96 + dut-lc4 + Asic0 + 100000 + 77 + 2 + 1 + 25 + 8 + + + Ethernet100 + dut-lc4 + Asic0 + 100000 + 78 + 2 + 1 + 26 + 8 + + + Ethernet104 + dut-lc4 + Asic0 + 100000 + 79 + 2 + 1 + 27 + 8 + + + Ethernet108 + dut-lc4 + Asic0 + 100000 + 80 + 2 + 1 + 28 + 8 + + + Ethernet112 + dut-lc4 + Asic0 + 100000 + 81 + 2 + 1 + 29 + 8 + + + Ethernet116 + dut-lc4 + Asic0 + 100000 + 82 + 2 + 1 + 30 + 8 + + + Ethernet120 + dut-lc4 + Asic0 + 100000 + 83 + 2 + 1 + 31 + 8 + + + Ethernet124 + dut-lc4 + Asic0 + 100000 + 84 + 2 + 1 + 32 + 8 + + + Ethernet128 + dut-lc4 + Asic0 + 100000 + 85 + 2 + 1 + 33 + 8 + + + Ethernet132 + dut-lc4 + Asic0 + 100000 + 86 + 2 + 1 + 34 + 8 + + + Ethernet136 + dut-lc4 + Asic0 + 100000 + 87 + 2 + 1 + 35 + 8 + + + Ethernet140 + dut-lc4 + Asic0 + 100000 + 88 + 2 + 1 + 36 + 8 + + + Ethernet144 + dut-lc4 + Asic0 + 100000 + 89 + 2 + 1 + 37 + 8 + + + Ethernet148 + dut-lc4 + Asic0 + 100000 + 90 + 2 + 1 + 38 + 8 + + + Ethernet152 + dut-lc4 + Asic0 + 100000 + 91 + 2 + 1 + 39 + 8 + + + Ethernet156 + dut-lc4 + Asic0 + 100000 + 92 + 2 + 1 + 40 + 8 + + + Ethernet160 + dut-lc4 + Asic0 + 100000 + 93 + 2 + 1 + 41 + 8 + + + Ethernet164 + dut-lc4 + Asic0 + 100000 + 94 + 2 + 1 + 42 + 8 + + + Ethernet168 + dut-lc4 + Asic0 + 100000 + 95 + 2 + 1 + 43 + 8 + + + Ethernet172 + dut-lc4 + Asic0 + 100000 + 96 + 2 + 1 + 44 + 8 + + + Ethernet176 + dut-lc4 + Asic0 + 100000 + 97 + 2 + 1 + 45 + 8 + + + Ethernet180 + dut-lc4 + Asic0 + 100000 + 98 + 2 + 1 + 46 + 8 + + + Ethernet184 + dut-lc4 + Asic0 + 100000 + 99 + 2 + 1 + 47 + 8 + + + Ethernet188 + dut-lc4 + Asic0 + 100000 + 100 + 2 + 1 + 48 + 8 + + + Ethernet-Rec0 + dut-lc4 + Asic0 + 400000 + 101 + 2 + 0 + 221 + 8 + + + Ethernet-IB0 + dut-lc4 + Asic0 + 400000 + 102 + 2 + 1 + 222 + 8 + + + Cpu0 + dut-lc5 + Asic0 + 10000 + 103 + 4 + 0 + 0 + 8 + + + Ethernet0 + dut-lc5 + Asic0 + 100000 + 104 + 4 + 0 + 1 + 8 + + + Ethernet4 + dut-lc5 + Asic0 + 100000 + 105 + 4 + 0 + 2 + 8 + + + Ethernet8 + dut-lc5 + Asic0 + 100000 + 106 + 4 + 0 + 3 + 8 + + + Ethernet12 + dut-lc5 + Asic0 + 100000 + 107 + 4 + 0 + 4 + 8 + + + Ethernet16 + dut-lc5 + Asic0 + 100000 + 108 + 4 + 0 + 5 + 8 + + + Ethernet20 + dut-lc5 + Asic0 + 100000 + 109 + 4 + 0 + 6 + 8 + + + Ethernet24 + dut-lc5 + Asic0 + 100000 + 110 + 4 + 0 + 7 + 8 + + + Ethernet28 + dut-lc5 + Asic0 + 100000 + 111 + 4 + 0 + 8 + 8 + + + Ethernet32 + dut-lc5 + Asic0 + 100000 + 112 + 4 + 0 + 9 + 8 + + + Ethernet36 + dut-lc5 + Asic0 + 100000 + 113 + 4 + 0 + 10 + 8 + + + Ethernet40 + dut-lc5 + Asic0 + 100000 + 114 + 4 + 0 + 11 + 8 + + + Ethernet44 + dut-lc5 + Asic0 + 100000 + 115 + 4 + 0 + 12 + 8 + + + Ethernet48 + dut-lc5 + Asic0 + 100000 + 116 + 4 + 0 + 13 + 8 + + + Ethernet52 + dut-lc5 + Asic0 + 100000 + 117 + 4 + 0 + 14 + 8 + + + Ethernet56 + dut-lc5 + Asic0 + 100000 + 118 + 4 + 0 + 15 + 8 + + + Ethernet60 + dut-lc5 + Asic0 + 100000 + 119 + 4 + 0 + 16 + 8 + + + Ethernet64 + dut-lc5 + Asic0 + 100000 + 120 + 4 + 0 + 17 + 8 + + + Ethernet68 + dut-lc5 + Asic0 + 100000 + 121 + 4 + 0 + 18 + 8 + + + Ethernet72 + dut-lc5 + Asic0 + 100000 + 122 + 4 + 0 + 19 + 8 + + + Ethernet76 + dut-lc5 + Asic0 + 100000 + 123 + 4 + 0 + 20 + 8 + + + Ethernet80 + dut-lc5 + Asic0 + 100000 + 124 + 4 + 0 + 21 + 8 + + + Ethernet84 + dut-lc5 + Asic0 + 100000 + 125 + 4 + 0 + 22 + 8 + + + Ethernet88 + dut-lc5 + Asic0 + 100000 + 126 + 4 + 0 + 23 + 8 + + + Ethernet92 + dut-lc5 + Asic0 + 100000 + 127 + 4 + 0 + 24 + 8 + + + Ethernet96 + dut-lc5 + Asic0 + 100000 + 128 + 4 + 1 + 25 + 8 + + + Ethernet100 + dut-lc5 + Asic0 + 100000 + 129 + 4 + 1 + 26 + 8 + + + Ethernet104 + dut-lc5 + Asic0 + 100000 + 130 + 4 + 1 + 27 + 8 + + + Ethernet108 + dut-lc5 + Asic0 + 100000 + 131 + 4 + 1 + 28 + 8 + + + Ethernet112 + dut-lc5 + Asic0 + 100000 + 132 + 4 + 1 + 29 + 8 + + + Ethernet116 + dut-lc5 + Asic0 + 100000 + 133 + 4 + 1 + 30 + 8 + + + Ethernet120 + dut-lc5 + Asic0 + 100000 + 134 + 4 + 1 + 31 + 8 + + + Ethernet124 + dut-lc5 + Asic0 + 100000 + 135 + 4 + 1 + 32 + 8 + + + Ethernet128 + dut-lc5 + Asic0 + 100000 + 136 + 4 + 1 + 33 + 8 + + + Ethernet132 + dut-lc5 + Asic0 + 100000 + 137 + 4 + 1 + 34 + 8 + + + Ethernet136 + dut-lc5 + Asic0 + 100000 + 138 + 4 + 1 + 35 + 8 + + + Ethernet140 + dut-lc5 + Asic0 + 100000 + 139 + 4 + 1 + 36 + 8 + + + Ethernet144 + dut-lc5 + Asic0 + 100000 + 140 + 4 + 1 + 37 + 8 + + + Ethernet148 + dut-lc5 + Asic0 + 100000 + 141 + 4 + 1 + 38 + 8 + + + Ethernet152 + dut-lc5 + Asic0 + 100000 + 142 + 4 + 1 + 39 + 8 + + + Ethernet156 + dut-lc5 + Asic0 + 100000 + 143 + 4 + 1 + 40 + 8 + + + Ethernet160 + dut-lc5 + Asic0 + 100000 + 144 + 4 + 1 + 41 + 8 + + + Ethernet164 + dut-lc5 + Asic0 + 100000 + 145 + 4 + 1 + 42 + 8 + + + Ethernet168 + dut-lc5 + Asic0 + 100000 + 146 + 4 + 1 + 43 + 8 + + + Ethernet172 + dut-lc5 + Asic0 + 100000 + 147 + 4 + 1 + 44 + 8 + + + Ethernet176 + dut-lc5 + Asic0 + 100000 + 148 + 4 + 1 + 45 + 8 + + + Ethernet180 + dut-lc5 + Asic0 + 100000 + 149 + 4 + 1 + 46 + 8 + + + Ethernet184 + dut-lc5 + Asic0 + 100000 + 150 + 4 + 1 + 47 + 8 + + + Ethernet188 + dut-lc5 + Asic0 + 100000 + 151 + 4 + 1 + 48 + 8 + + + Ethernet-Rec0 + dut-lc5 + Asic0 + 400000 + 152 + 4 + 0 + 221 + 8 + + + Ethernet-IB0 + dut-lc5 + Asic0 + 400000 + 153 + 4 + 1 + 222 + 8 + + + + + dut-lc3 + Arista-7800R3-48CQ2-C48 + diff --git a/src/sonic-config-engine/tests/sample-arista-7800r3a-36dm2-c36-lc-t2-minigraph.xml b/src/sonic-config-engine/tests/sample-arista-7800r3a-36dm2-c36-lc-t2-minigraph.xml new file mode 100644 index 000000000000..8afcaf9d8dd1 --- /dev/null +++ b/src/sonic-config-engine/tests/sample-arista-7800r3a-36dm2-c36-lc-t2-minigraph.xml @@ -0,0 +1,5541 @@ + + + + + + false + str2-7804-lc5-1 + 10.0.0.0 + ARISTA01T3 + 10.0.0.1 + 1 + 10 + 3 + + + false + ASIC0 + 10.0.0.0 + ARISTA01T3 + 10.0.0.1 + 1 + 10 + 3 + + + str2-7804-lc5-1 + FC00::1 + ARISTA01T3 + FC00::2 + 1 + 10 + 3 + + + ASIC0 + FC00::1 + ARISTA01T3 + FC00::2 + 1 + 10 + 3 + + + false + str2-7804-lc5-1 + 10.0.0.4 + ARISTA03T3 + 10.0.0.5 + 1 + 10 + 3 + + + false + ASIC0 + 10.0.0.4 + ARISTA03T3 + 10.0.0.5 + 1 + 10 + 3 + + + str2-7804-lc5-1 + FC00::9 + ARISTA03T3 + FC00::A + 1 + 10 + 3 + + + ASIC0 + FC00::9 + ARISTA03T3 + FC00::A + 1 + 10 + 3 + + + false + str2-7804-lc5-1 + 10.0.0.8 + ARISTA05T3 + 10.0.0.9 + 1 + 10 + 3 + + + false + ASIC0 + 10.0.0.8 + ARISTA05T3 + 10.0.0.9 + 1 + 10 + 3 + + + str2-7804-lc5-1 + FC00::11 + ARISTA05T3 + FC00::12 + 1 + 10 + 3 + + + ASIC0 + FC00::11 + ARISTA05T3 + FC00::12 + 1 + 10 + 3 + + + false + str2-7804-lc5-1 + 10.0.0.12 + ARISTA07T3 + 10.0.0.13 + 1 + 10 + 3 + + + false + ASIC0 + 10.0.0.12 + ARISTA07T3 + 10.0.0.13 + 1 + 10 + 3 + + + str2-7804-lc5-1 + FC00::19 + ARISTA07T3 + FC00::1A + 1 + 10 + 3 + + + ASIC0 + FC00::19 + ARISTA07T3 + FC00::1A + 1 + 10 + 3 + + + false + str2-7804-lc5-1 + 10.0.0.16 + ARISTA09T3 + 10.0.0.17 + 1 + 10 + 3 + + + false + ASIC0 + 10.0.0.16 + ARISTA09T3 + 10.0.0.17 + 1 + 10 + 3 + + + str2-7804-lc5-1 + FC00::21 + ARISTA09T3 + FC00::22 + 1 + 10 + 3 + + + ASIC0 + FC00::21 + ARISTA09T3 + FC00::22 + 1 + 10 + 3 + + + false + str2-7804-lc5-1 + 10.0.0.20 + ARISTA11T3 + 10.0.0.21 + 1 + 10 + 3 + + + false + ASIC0 + 10.0.0.20 + ARISTA11T3 + 10.0.0.21 + 1 + 10 + 3 + + + str2-7804-lc5-1 + FC00::29 + ARISTA11T3 + FC00::2A + 1 + 10 + 3 + + + ASIC0 + FC00::29 + ARISTA11T3 + FC00::2A + 1 + 10 + 3 + + + false + str2-7804-lc5-1 + 10.0.0.32 + ARISTA13T3 + 10.0.0.33 + 1 + 10 + 3 + + + false + ASIC0 + 10.0.0.32 + ARISTA13T3 + 10.0.0.33 + 1 + 10 + 3 + + + str2-7804-lc5-1 + FC00::41 + ARISTA13T3 + FC00::42 + 1 + 10 + 3 + + + ASIC0 + FC00::41 + ARISTA13T3 + FC00::42 + 1 + 10 + 3 + + + false + str2-7804-lc5-1 + 10.0.0.28 + ARISTA15T3 + 10.0.0.29 + 1 + 10 + 3 + + + false + ASIC0 + 10.0.0.28 + ARISTA15T3 + 10.0.0.29 + 1 + 10 + 3 + + + str2-7804-lc5-1 + FC00::39 + ARISTA15T3 + FC00::3A + 1 + 10 + 3 + + + ASIC0 + FC00::39 + ARISTA15T3 + FC00::3A + 1 + 10 + 3 + + + false + str2-7804-lc5-1 + 10.0.0.34 + ARISTA17T3 + 10.0.0.35 + 1 + 10 + 3 + + + false + ASIC0 + 10.0.0.34 + ARISTA17T3 + 10.0.0.35 + 1 + 10 + 3 + + + str2-7804-lc5-1 + FC00::45 + ARISTA17T3 + FC00::46 + 1 + 10 + 3 + + + ASIC0 + FC00::45 + ARISTA17T3 + FC00::46 + 1 + 10 + 3 + + + false + str2-7804-lc5-1 + 10.0.0.24 + ARISTA18T3 + 10.0.0.25 + 1 + 10 + 3 + + + false + ASIC0 + 10.0.0.24 + ARISTA18T3 + 10.0.0.25 + 1 + 10 + 3 + + + str2-7804-lc5-1 + FC00::31 + ARISTA18T3 + FC00::32 + 1 + 10 + 3 + + + ASIC0 + FC00::31 + ARISTA18T3 + FC00::32 + 1 + 10 + 3 + + + false + str2-7804-lc5-1 + 10.0.0.36 + ARISTA19T3 + 10.0.0.37 + 1 + 10 + 3 + + + false + ASIC1 + 10.0.0.36 + ARISTA19T3 + 10.0.0.37 + 1 + 10 + 3 + + + str2-7804-lc5-1 + FC00::49 + ARISTA19T3 + FC00::4A + 1 + 10 + 3 + + + ASIC1 + FC00::49 + ARISTA19T3 + FC00::4A + 1 + 10 + 3 + + + false + str2-7804-lc5-1 + 10.0.0.38 + ARISTA20T3 + 10.0.0.39 + 1 + 10 + 3 + + + false + ASIC1 + 10.0.0.38 + ARISTA20T3 + 10.0.0.39 + 1 + 10 + 3 + + + str2-7804-lc5-1 + FC00::4D + ARISTA20T3 + FC00::4E + 1 + 10 + 3 + + + ASIC1 + FC00::4D + ARISTA20T3 + FC00::4E + 1 + 10 + 3 + + + false + str2-7804-lc5-1 + 10.0.0.40 + ARISTA21T3 + 10.0.0.41 + 1 + 10 + 3 + + + false + ASIC1 + 10.0.0.40 + ARISTA21T3 + 10.0.0.41 + 1 + 10 + 3 + + + str2-7804-lc5-1 + FC00::51 + ARISTA21T3 + FC00::52 + 1 + 10 + 3 + + + ASIC1 + FC00::51 + ARISTA21T3 + FC00::52 + 1 + 10 + 3 + + + false + str2-7804-lc5-1 + 10.0.0.42 + ARISTA22T3 + 10.0.0.43 + 1 + 10 + 3 + + + false + ASIC1 + 10.0.0.42 + ARISTA22T3 + 10.0.0.43 + 1 + 10 + 3 + + + str2-7804-lc5-1 + FC00::55 + ARISTA22T3 + FC00::56 + 1 + 10 + 3 + + + ASIC1 + FC00::55 + ARISTA22T3 + FC00::56 + 1 + 10 + 3 + + + false + str2-7804-lc5-1 + 10.0.0.44 + ARISTA23T3 + 10.0.0.45 + 1 + 10 + 3 + + + false + ASIC1 + 10.0.0.44 + ARISTA23T3 + 10.0.0.45 + 1 + 10 + 3 + + + str2-7804-lc5-1 + FC00::59 + ARISTA23T3 + FC00::5A + 1 + 10 + 3 + + + ASIC1 + FC00::59 + ARISTA23T3 + FC00::5A + 1 + 10 + 3 + + + false + str2-7804-lc5-1 + 10.0.0.46 + ARISTA24T3 + 10.0.0.47 + 1 + 10 + 3 + + + false + ASIC1 + 10.0.0.46 + ARISTA24T3 + 10.0.0.47 + 1 + 10 + 3 + + + str2-7804-lc5-1 + FC00::5D + ARISTA24T3 + FC00::5E + 1 + 10 + 3 + + + ASIC1 + FC00::5D + ARISTA24T3 + FC00::5E + 1 + 10 + 3 + + + false + str2-7804-lc5-1 + 10.0.0.48 + ARISTA25T3 + 10.0.0.49 + 1 + 10 + 3 + + + false + ASIC1 + 10.0.0.48 + ARISTA25T3 + 10.0.0.49 + 1 + 10 + 3 + + + str2-7804-lc5-1 + FC00::61 + ARISTA25T3 + FC00::62 + 1 + 10 + 3 + + + ASIC1 + FC00::61 + ARISTA25T3 + FC00::62 + 1 + 10 + 3 + + + false + str2-7804-lc5-1 + 10.0.0.50 + ARISTA26T3 + 10.0.0.51 + 1 + 10 + 3 + + + false + ASIC1 + 10.0.0.50 + ARISTA26T3 + 10.0.0.51 + 1 + 10 + 3 + + + str2-7804-lc5-1 + FC00::65 + ARISTA26T3 + FC00::66 + 1 + 10 + 3 + + + ASIC1 + FC00::65 + ARISTA26T3 + FC00::66 + 1 + 10 + 3 + + + false + str2-7804-lc5-1 + 10.0.0.52 + ARISTA27T3 + 10.0.0.53 + 1 + 10 + 3 + + + false + ASIC1 + 10.0.0.52 + ARISTA27T3 + 10.0.0.53 + 1 + 10 + 3 + + + str2-7804-lc5-1 + FC00::69 + ARISTA27T3 + FC00::6A + 1 + 10 + 3 + + + ASIC1 + FC00::69 + ARISTA27T3 + FC00::6A + 1 + 10 + 3 + + + false + str2-7804-lc5-1 + 10.0.0.54 + ARISTA28T3 + 10.0.0.55 + 1 + 10 + 3 + + + false + ASIC1 + 10.0.0.54 + ARISTA28T3 + 10.0.0.55 + 1 + 10 + 3 + + + str2-7804-lc5-1 + FC00::6D + ARISTA28T3 + FC00::6E + 1 + 10 + 3 + + + ASIC1 + FC00::6D + ARISTA28T3 + FC00::6E + 1 + 10 + 3 + + + false + str2-7804-lc5-1 + 10.0.0.56 + ARISTA29T3 + 10.0.0.57 + 1 + 10 + 3 + + + false + ASIC1 + 10.0.0.56 + ARISTA29T3 + 10.0.0.57 + 1 + 10 + 3 + + + str2-7804-lc5-1 + FC00::71 + ARISTA29T3 + FC00::72 + 1 + 10 + 3 + + + ASIC1 + FC00::71 + ARISTA29T3 + FC00::72 + 1 + 10 + 3 + + + false + str2-7804-lc5-1 + 10.0.0.58 + ARISTA30T3 + 10.0.0.59 + 1 + 10 + 3 + + + false + ASIC1 + 10.0.0.58 + ARISTA30T3 + 10.0.0.59 + 1 + 10 + 3 + + + str2-7804-lc5-1 + FC00::75 + ARISTA30T3 + FC00::76 + 1 + 10 + 3 + + + ASIC1 + FC00::75 + ARISTA30T3 + FC00::76 + 1 + 10 + 3 + + + false + str2-7804-lc5-1 + 10.0.0.60 + ARISTA31T3 + 10.0.0.61 + 1 + 10 + 3 + + + false + ASIC1 + 10.0.0.60 + ARISTA31T3 + 10.0.0.61 + 1 + 10 + 3 + + + str2-7804-lc5-1 + FC00::79 + ARISTA31T3 + FC00::7A + 1 + 10 + 3 + + + ASIC1 + FC00::79 + ARISTA31T3 + FC00::7A + 1 + 10 + 3 + + + false + str2-7804-lc5-1 + 10.0.0.62 + ARISTA32T3 + 10.0.0.63 + 1 + 10 + 3 + + + false + ASIC1 + 10.0.0.62 + ARISTA32T3 + 10.0.0.63 + 1 + 10 + 3 + + + str2-7804-lc5-1 + FC00::7D + ARISTA32T3 + FC00::7E + 1 + 10 + 3 + + + ASIC1 + FC00::7D + ARISTA32T3 + FC00::7E + 1 + 10 + 3 + + + + + ASIC0 + ASIC1 + 3.3.3.2 + 3.3.3.3 + 1 + 0 + 0 + voq + + + ASIC0 + ASIC1 + 3333::3:2 + 3333::3:3 + 1 + 0 + 0 + voq + + + ASIC0 + str2-7804-lc3-1 + 3.3.3.2 + 3.3.3.1 + 1 + 0 + 0 + voq + + + ASIC0 + str2-7804-lc3-1 + 3333::3:2 + 3333::3:1 + 1 + 0 + 0 + voq + + + ASIC0 + str2-7804-lc7-1 + 3.3.3.2 + 3.3.3.5 + 1 + 0 + 0 + voq + + + ASIC0 + str2-7804-lc7-1 + 3333::3:2 + 3333::3:5 + 1 + 0 + 0 + voq + + + ASIC1 + ASIC0 + 3.3.3.3 + 3.3.3.2 + 1 + 0 + 0 + voq + + + ASIC1 + ASIC0 + 3333::3:3 + 3333::3:2 + 1 + 0 + 0 + voq + + + ASIC1 + str2-7804-lc3-1 + 3.3.3.3 + 3.3.3.1 + 1 + 0 + 0 + voq + + + ASIC1 + str2-7804-lc3-1 + 3333::3:3 + 3333::3:1 + 1 + 0 + 0 + voq + + + ASIC1 + str2-7804-lc7-1 + 3.3.3.3 + 3.3.3.5 + 1 + 0 + 0 + voq + + + ASIC1 + str2-7804-lc7-1 + 3333::3:3 + 3333::3:5 + 1 + 0 + 0 + voq + + + + + 65100 + str2-7804-lc5-1 + + +
10.0.0.1
+ + + + + +
10.0.0.5
+ + + + + +
10.0.0.9
+ + + + + +
10.0.0.13
+ + + + + +
10.0.0.17
+ + + + + +
10.0.0.21
+ + + + + +
10.0.0.33
+ + + + + +
10.0.0.29
+ + + + + +
10.0.0.35
+ + + + + +
10.0.0.25
+ + + + + +
10.0.0.37
+ + + + + +
10.0.0.39
+ + + + + +
10.0.0.41
+ + + + + +
10.0.0.43
+ + + + + +
10.0.0.45
+ + + + + +
10.0.0.47
+ + + + + +
10.0.0.49
+ + + + + +
10.0.0.51
+ + + + + +
10.0.0.53
+ + + + + +
10.0.0.55
+ + + + + +
10.0.0.57
+ + + + + +
10.0.0.59
+ + + + + +
10.0.0.61
+ + + + + +
10.0.0.63
+ + + + + + + + + 65200 + ARISTA01T3 + + + + 65200 + ARISTA03T3 + + + + 65200 + ARISTA05T3 + + + + 65200 + ARISTA07T3 + + + + 65200 + ARISTA09T3 + + + + 65200 + ARISTA11T3 + + + + 65200 + ARISTA13T3 + + + + 65200 + ARISTA15T3 + + + + 65200 + ARISTA17T3 + + + + 65200 + ARISTA18T3 + + + + 65200 + ARISTA19T3 + + + + 65200 + ARISTA20T3 + + + + 65200 + ARISTA21T3 + + + + 65200 + ARISTA22T3 + + + + 65200 + ARISTA23T3 + + + + 65200 + ARISTA24T3 + + + + 65200 + ARISTA25T3 + + + + 65200 + ARISTA26T3 + + + + 65200 + ARISTA27T3 + + + + 65200 + ARISTA28T3 + + + + 65200 + ARISTA29T3 + + + + 65200 + ARISTA30T3 + + + + 65200 + ARISTA31T3 + + + + 65200 + ARISTA32T3 + + + + 65100 + ASIC1 + + +
10.0.0.37
+ + + + + +
10.0.0.39
+ + + + + +
10.0.0.41
+ + + + + +
10.0.0.43
+ + + + + +
10.0.0.45
+ + + + + +
10.0.0.47
+ + + + + +
10.0.0.49
+ + + + + +
10.0.0.51
+ + + + + +
10.0.0.53
+ + + + + +
10.0.0.55
+ + + + + +
10.0.0.57
+ + + + + +
10.0.0.59
+ + + + + +
10.0.0.61
+ + + + + +
10.0.0.63
+ + + + + +
3.3.3.2/32
+ + + + + +
3.3.3.1/32
+ + + + + +
3.3.3.5/32
+ + + + + + + + + 65100 + ASIC0 + + +
10.0.0.1
+ + + + + +
10.0.0.5
+ + + + + +
10.0.0.9
+ + + + + +
10.0.0.13
+ + + + + +
10.0.0.17
+ + + + + +
10.0.0.21
+ + + + + +
10.0.0.33
+ + + + + +
10.0.0.29
+ + + + + +
10.0.0.35
+ + + + + +
10.0.0.25
+ + + + + +
3.3.3.3/32
+ + + + + +
3.3.3.1/32
+ + + + + +
3.3.3.5/32
+ + + + + + + + + 65100 + str2-7804-lc3-1 + + + + 65100 + str2-7804-lc7-1 + + + + + + + + + + HostIP + Loopback0 + + 10.1.0.1/32 + + 10.1.0.1/32 + + + HostIP1 + Loopback0 + + FC00:10::1/128 + + FC00:10::1/128 + + + + + HostIP + eth0 + + 10.3.147.27/23 + + 10.3.147.27/23 + + + V6HostIP + eth0 + + FC00:2::32/64 + + FC00:2::32/64 + + + + + + + str2-7804-lc5-1 + + + PortChannel102 + Ethernet1/1;Ethernet2/1 + + + + PortChannel104 + Ethernet3/1;Ethernet4/1 + + + + PortChannel106 + Ethernet5/1;Ethernet6/1 + + + + PortChannel108 + Ethernet7/1;Ethernet8/1 + + + + PortChannel1010 + Ethernet9/1;Ethernet10/1 + + + + PortChannel1012 + Ethernet11/1;Ethernet12/1 + + + + PortChannel1016 + Ethernet14/1;Ethernet15/1 + + + + PortChannel1020 + Ethernet17/1;Ethernet18/1 + + + + + + + + + PortChannel102 + 10.0.0.0/31 + + + + PortChannel102 + FC00::1/126 + + + + PortChannel104 + 10.0.0.4/31 + + + + PortChannel104 + FC00::9/126 + + + + PortChannel106 + 10.0.0.8/31 + + + + PortChannel106 + FC00::11/126 + + + + PortChannel108 + 10.0.0.12/31 + + + + PortChannel108 + FC00::19/126 + + + + PortChannel1010 + 10.0.0.16/31 + + + + PortChannel1010 + FC00::21/126 + + + + PortChannel1012 + 10.0.0.20/31 + + + + PortChannel1012 + FC00::29/126 + + + + Ethernet13/1 + 10.0.0.32/31 + + + + Ethernet13/1 + FC00::41/126 + + + + PortChannel1016 + 10.0.0.28/31 + + + + PortChannel1016 + FC00::39/126 + + + + Ethernet16/1 + 10.0.0.34/31 + + + + Ethernet16/1 + FC00::45/126 + + + + PortChannel1020 + 10.0.0.24/31 + + + + PortChannel1020 + FC00::31/126 + + + + Ethernet19/1 + 10.0.0.36/31 + + + + Ethernet19/1 + FC00::49/126 + + + + Ethernet20/1 + 10.0.0.38/31 + + + + Ethernet20/1 + FC00::4D/126 + + + + Ethernet21/1 + 10.0.0.40/31 + + + + Ethernet21/1 + FC00::51/126 + + + + Ethernet22/1 + 10.0.0.42/31 + + + + Ethernet22/1 + FC00::55/126 + + + + Ethernet23/1 + 10.0.0.44/31 + + + + Ethernet23/1 + FC00::59/126 + + + + Ethernet24/1 + 10.0.0.46/31 + + + + Ethernet24/1 + FC00::5D/126 + + + + Ethernet25/1 + 10.0.0.48/31 + + + + Ethernet25/1 + FC00::61/126 + + + + Ethernet26/1 + 10.0.0.50/31 + + + + Ethernet26/1 + FC00::65/126 + + + + Ethernet27/1 + 10.0.0.52/31 + + + + Ethernet27/1 + FC00::69/126 + + + + Ethernet28/1 + 10.0.0.54/31 + + + + Ethernet28/1 + FC00::6D/126 + + + + Ethernet29/1 + 10.0.0.56/31 + + + + Ethernet29/1 + FC00::71/126 + + + + Ethernet30/1 + 10.0.0.58/31 + + + + Ethernet30/1 + FC00::75/126 + + + + Ethernet31/1 + 10.0.0.60/31 + + + + Ethernet31/1 + FC00::79/126 + + + + Ethernet32/1 + 10.0.0.62/31 + + + + Ethernet32/1 + FC00::7D/126 + + + + + + NTP_ACL + NTP + NTP + + + SNMP_ACL + SNMP + SNMP + + + VTY_LINE + ssh-only + SSH + + + ERSPAN + Everflow + Everflow + + + ERSPANV6 + EverflowV6 + EverflowV6 + + + PortChannel102;PortChannel104;PortChannel106;PortChannel108;PortChannel1010;PortChannel1012;PortChannel1016;PortChannel1020;Ethernet13/1;Ethernet16/1;Ethernet19/1;Ethernet20/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 + DataAcl + DataPlane + + + + + + + + + + HostIP + Loopback0 + + 10.1.0.1/32 + + 10.1.0.1/32 + + + HostIP1 + Loopback0 + + FC00:10::1/128 + + FC00:10::1/128 + + + HostIP1 + Loopback4096 + + 192.0.0.3/32 + + 192.0.0.3/32 + + + HostIP1 + Loopback4096 + + 2603:10e2:400::3/128 + + 2603:10e2:400::3/128 + + + + + HostIP + eth0 + + 10.3.147.27/23 + + 10.3.147.27/23 + + + V6HostIP + eth0 + + FC00:2::32/64 + + FC00:2::32/64 + + + + + + Ethernet-IB1 + port + 3.3.3.3/32 + + + Ethernet-IB1 + port + 3333::3:3/128 + + + + + + ASIC1 + + + + + + + Eth0-ASIC1 + 10.0.0.36/31 + + + + Eth0-ASIC1 + FC00::49/126 + + + + Eth8-ASIC1 + 10.0.0.38/31 + + + + Eth8-ASIC1 + FC00::4D/126 + + + + Eth16-ASIC1 + 10.0.0.40/31 + + + + Eth16-ASIC1 + FC00::51/126 + + + + Eth24-ASIC1 + 10.0.0.42/31 + + + + Eth24-ASIC1 + FC00::55/126 + + + + Eth32-ASIC1 + 10.0.0.44/31 + + + + Eth32-ASIC1 + FC00::59/126 + + + + Eth40-ASIC1 + 10.0.0.46/31 + + + + Eth40-ASIC1 + FC00::5D/126 + + + + Eth48-ASIC1 + 10.0.0.48/31 + + + + Eth48-ASIC1 + FC00::61/126 + + + + Eth56-ASIC1 + 10.0.0.50/31 + + + + Eth56-ASIC1 + FC00::65/126 + + + + Eth64-ASIC1 + 10.0.0.52/31 + + + + Eth64-ASIC1 + FC00::69/126 + + + + Eth72-ASIC1 + 10.0.0.54/31 + + + + Eth72-ASIC1 + FC00::6D/126 + + + + Eth80-ASIC1 + 10.0.0.56/31 + + + + Eth80-ASIC1 + FC00::71/126 + + + + Eth88-ASIC1 + 10.0.0.58/31 + + + + Eth88-ASIC1 + FC00::75/126 + + + + Eth96-ASIC1 + 10.0.0.60/31 + + + + Eth96-ASIC1 + FC00::79/126 + + + + Eth104-ASIC1 + 10.0.0.62/31 + + + + Eth104-ASIC1 + FC00::7D/126 + + + + + + SNMP_ACL + SNMP + SNMP + + + ERSPAN + Everflow + Everflow + + + ERSPANV6 + EverflowV6 + EverflowV6 + + + VTY_LINE + ssh-only + SSH + + + Eth0-ASIC1;Eth8-ASIC1;Eth16-ASIC1;Eth24-ASIC1;Eth32-ASIC1;Eth40-ASIC1;Eth48-ASIC1;Eth56-ASIC1;Eth64-ASIC1;Eth72-ASIC1;Eth80-ASIC1;Eth88-ASIC1;Eth96-ASIC1;Eth104-ASIC1 + DataAcl + DataPlane + + + + + + + + + + HostIP + Loopback0 + + 10.1.0.1/32 + + 10.1.0.1/32 + + + HostIP1 + Loopback0 + + FC00:10::1/128 + + FC00:10::1/128 + + + HostIP1 + Loopback4096 + + 192.0.0.2/32 + + 192.0.0.2/32 + + + HostIP1 + Loopback4096 + + 2603:10e2:400::2/128 + + 2603:10e2:400::2/128 + + + + + HostIP + eth0 + + 10.3.147.27/23 + + 10.3.147.27/23 + + + V6HostIP + eth0 + + FC00:2::32/64 + + FC00:2::32/64 + + + + + + Ethernet-IB0 + port + 3.3.3.2/32 + + + Ethernet-IB0 + port + 3333::3:2/128 + + + + + + ASIC0 + + + PortChannel102 + Eth0-ASIC0;Eth8-ASIC0 + + + + PortChannel104 + Eth16-ASIC0;Eth24-ASIC0 + + + + PortChannel106 + Eth32-ASIC0;Eth40-ASIC0 + + + + PortChannel108 + Eth48-ASIC0;Eth56-ASIC0 + + + + PortChannel1010 + Eth64-ASIC0;Eth72-ASIC0 + + + + PortChannel1012 + Eth80-ASIC0;Eth88-ASIC0 + + + + PortChannel1016 + Eth104-ASIC0;Eth112-ASIC0 + + + + PortChannel1020 + Eth128-ASIC0;Eth136-ASIC0 + + + + + + + + PortChannel102 + 10.0.0.0/31 + + + + PortChannel102 + FC00::1/126 + + + + PortChannel104 + 10.0.0.4/31 + + + + PortChannel104 + FC00::9/126 + + + + PortChannel106 + 10.0.0.8/31 + + + + PortChannel106 + FC00::11/126 + + + + PortChannel108 + 10.0.0.12/31 + + + + PortChannel108 + FC00::19/126 + + + + PortChannel1010 + 10.0.0.16/31 + + + + PortChannel1010 + FC00::21/126 + + + + PortChannel1012 + 10.0.0.20/31 + + + + PortChannel1012 + FC00::29/126 + + + + Eth96-ASIC0 + 10.0.0.32/31 + + + + Eth96-ASIC0 + FC00::41/126 + + + + PortChannel1016 + 10.0.0.28/31 + + + + PortChannel1016 + FC00::39/126 + + + + Eth120-ASIC0 + 10.0.0.34/31 + + + + Eth120-ASIC0 + FC00::45/126 + + + + PortChannel1020 + 10.0.0.24/31 + + + + PortChannel1020 + FC00::31/126 + + + + + + SNMP_ACL + SNMP + SNMP + + + ERSPAN + Everflow + Everflow + + + ERSPANV6 + EverflowV6 + EverflowV6 + + + VTY_LINE + ssh-only + SSH + + + PortChannel102;PortChannel104;PortChannel106;PortChannel108;PortChannel1010;PortChannel1012;PortChannel1016;PortChannel1020;Eth0-ASIC0;Eth16-ASIC0;Eth32-ASIC0;Eth48-ASIC0;Eth64-ASIC0;Eth80-ASIC0;Eth96-ASIC0;Eth104-ASIC0;Eth120-ASIC0;Eth128-ASIC0 + DataAcl + DataPlane + + + + + + + + + + DeviceInterfaceLink + ARISTA01T3 + Ethernet1 + str2-7804-lc5-1 + Ethernet1/1 + 100000 + + + DeviceInterfaceLink + ARISTA01T3 + Ethernet2 + str2-7804-lc5-1 + Ethernet2/1 + 100000 + + + DeviceInterfaceLink + ARISTA03T3 + Ethernet1 + str2-7804-lc5-1 + Ethernet3/1 + 100000 + + + DeviceInterfaceLink + ARISTA03T3 + Ethernet2 + str2-7804-lc5-1 + Ethernet4/1 + 100000 + + + DeviceInterfaceLink + ARISTA05T3 + Ethernet1 + str2-7804-lc5-1 + Ethernet5/1 + 100000 + + + DeviceInterfaceLink + ARISTA05T3 + Ethernet2 + str2-7804-lc5-1 + Ethernet6/1 + 100000 + + + DeviceInterfaceLink + ARISTA07T3 + Ethernet1 + str2-7804-lc5-1 + Ethernet7/1 + 100000 + + + DeviceInterfaceLink + ARISTA07T3 + Ethernet2 + str2-7804-lc5-1 + Ethernet8/1 + 100000 + + + DeviceInterfaceLink + ARISTA09T3 + Ethernet1 + str2-7804-lc5-1 + Ethernet9/1 + 100000 + + + DeviceInterfaceLink + ARISTA09T3 + Ethernet2 + str2-7804-lc5-1 + Ethernet10/1 + 100000 + + + DeviceInterfaceLink + ARISTA11T3 + Ethernet1 + str2-7804-lc5-1 + Ethernet11/1 + 100000 + + + DeviceInterfaceLink + ARISTA11T3 + Ethernet2 + str2-7804-lc5-1 + Ethernet12/1 + 100000 + + + DeviceInterfaceLink + ARISTA13T3 + Ethernet1 + str2-7804-lc5-1 + Ethernet13/1 + 100000 + + + DeviceInterfaceLink + ARISTA15T3 + Ethernet1 + str2-7804-lc5-1 + Ethernet14/1 + 100000 + + + DeviceInterfaceLink + ARISTA15T3 + Ethernet2 + str2-7804-lc5-1 + Ethernet15/1 + 100000 + + + DeviceInterfaceLink + ARISTA17T3 + Ethernet1 + str2-7804-lc5-1 + Ethernet16/1 + 100000 + + + DeviceInterfaceLink + ARISTA18T3 + Ethernet1 + str2-7804-lc5-1 + Ethernet17/1 + 100000 + + + DeviceInterfaceLink + ARISTA18T3 + Ethernet2 + str2-7804-lc5-1 + Ethernet18/1 + 100000 + + + DeviceInterfaceLink + ARISTA19T3 + Ethernet1 + str2-7804-lc5-1 + Ethernet19/1 + 100000 + + + DeviceInterfaceLink + ARISTA20T3 + Ethernet1 + str2-7804-lc5-1 + Ethernet20/1 + 100000 + + + DeviceInterfaceLink + ARISTA21T3 + Ethernet1 + str2-7804-lc5-1 + Ethernet21/1 + 100000 + + + DeviceInterfaceLink + ARISTA22T3 + Ethernet1 + str2-7804-lc5-1 + Ethernet22/1 + 100000 + + + DeviceInterfaceLink + ARISTA23T3 + Ethernet1 + str2-7804-lc5-1 + Ethernet23/1 + 100000 + + + DeviceInterfaceLink + ARISTA24T3 + Ethernet1 + str2-7804-lc5-1 + Ethernet24/1 + 100000 + + + DeviceInterfaceLink + ARISTA25T3 + Ethernet1 + str2-7804-lc5-1 + Ethernet25/1 + 100000 + + + DeviceInterfaceLink + ARISTA26T3 + Ethernet1 + str2-7804-lc5-1 + Ethernet26/1 + 100000 + + + DeviceInterfaceLink + ARISTA27T3 + Ethernet1 + str2-7804-lc5-1 + Ethernet27/1 + 100000 + + + DeviceInterfaceLink + ARISTA28T3 + Ethernet1 + str2-7804-lc5-1 + Ethernet28/1 + 100000 + + + DeviceInterfaceLink + ARISTA29T3 + Ethernet1 + str2-7804-lc5-1 + Ethernet29/1 + 100000 + + + DeviceInterfaceLink + ARISTA30T3 + Ethernet1 + str2-7804-lc5-1 + Ethernet30/1 + 100000 + + + DeviceInterfaceLink + ARISTA31T3 + Ethernet1 + str2-7804-lc5-1 + Ethernet31/1 + 100000 + + + DeviceInterfaceLink + ARISTA32T3 + Ethernet1 + str2-7804-lc5-1 + Ethernet32/1 + 100000 + + + DeviceInterfaceLink + 100000 + true + ASIC0 + Eth0-ASIC0 + true + str2-7804-lc5-1 + Ethernet1/1 + true + + + DeviceInterfaceLink + 100000 + true + ASIC0 + Eth8-ASIC0 + true + str2-7804-lc5-1 + Ethernet2/1 + true + + + DeviceInterfaceLink + 100000 + true + ASIC0 + Eth16-ASIC0 + true + str2-7804-lc5-1 + Ethernet3/1 + true + + + DeviceInterfaceLink + 100000 + true + ASIC0 + Eth24-ASIC0 + true + str2-7804-lc5-1 + Ethernet4/1 + true + + + DeviceInterfaceLink + 100000 + true + ASIC0 + Eth32-ASIC0 + true + str2-7804-lc5-1 + Ethernet5/1 + true + + + DeviceInterfaceLink + 100000 + true + ASIC0 + Eth40-ASIC0 + true + str2-7804-lc5-1 + Ethernet6/1 + true + + + DeviceInterfaceLink + 100000 + true + ASIC0 + Eth48-ASIC0 + true + str2-7804-lc5-1 + Ethernet7/1 + true + + + DeviceInterfaceLink + 100000 + true + ASIC0 + Eth56-ASIC0 + true + str2-7804-lc5-1 + Ethernet8/1 + true + + + DeviceInterfaceLink + 100000 + true + ASIC0 + Eth64-ASIC0 + true + str2-7804-lc5-1 + Ethernet9/1 + true + + + DeviceInterfaceLink + 100000 + true + ASIC0 + Eth72-ASIC0 + true + str2-7804-lc5-1 + Ethernet10/1 + true + + + DeviceInterfaceLink + 100000 + true + ASIC0 + Eth80-ASIC0 + true + str2-7804-lc5-1 + Ethernet11/1 + true + + + DeviceInterfaceLink + 100000 + true + ASIC0 + Eth88-ASIC0 + true + str2-7804-lc5-1 + Ethernet12/1 + true + + + DeviceInterfaceLink + 100000 + true + ASIC0 + Eth96-ASIC0 + true + str2-7804-lc5-1 + Ethernet13/1 + true + + + DeviceInterfaceLink + 100000 + true + ASIC0 + Eth104-ASIC0 + true + str2-7804-lc5-1 + Ethernet14/1 + true + + + DeviceInterfaceLink + 100000 + true + ASIC0 + Eth112-ASIC0 + true + str2-7804-lc5-1 + Ethernet15/1 + true + + + DeviceInterfaceLink + 100000 + true + ASIC0 + Eth120-ASIC0 + true + str2-7804-lc5-1 + Ethernet16/1 + true + + + DeviceInterfaceLink + 100000 + true + ASIC0 + Eth128-ASIC0 + true + str2-7804-lc5-1 + Ethernet17/1 + true + + + DeviceInterfaceLink + 100000 + true + ASIC0 + Eth136-ASIC0 + true + str2-7804-lc5-1 + Ethernet18/1 + true + + + DeviceInterfaceLink + 100000 + true + ASIC1 + Eth0-ASIC1 + true + str2-7804-lc5-1 + Ethernet19/1 + true + + + DeviceInterfaceLink + 100000 + true + ASIC1 + Eth8-ASIC1 + true + str2-7804-lc5-1 + Ethernet20/1 + true + + + DeviceInterfaceLink + 100000 + true + ASIC1 + Eth16-ASIC1 + true + str2-7804-lc5-1 + Ethernet21/1 + true + + + DeviceInterfaceLink + 100000 + true + ASIC1 + Eth24-ASIC1 + true + str2-7804-lc5-1 + Ethernet22/1 + true + + + DeviceInterfaceLink + 100000 + true + ASIC1 + Eth32-ASIC1 + true + str2-7804-lc5-1 + Ethernet23/1 + true + + + DeviceInterfaceLink + 100000 + true + ASIC1 + Eth40-ASIC1 + true + str2-7804-lc5-1 + Ethernet24/1 + true + + + DeviceInterfaceLink + 100000 + true + ASIC1 + Eth48-ASIC1 + true + str2-7804-lc5-1 + Ethernet25/1 + true + + + DeviceInterfaceLink + 100000 + true + ASIC1 + Eth56-ASIC1 + true + str2-7804-lc5-1 + Ethernet26/1 + true + + + DeviceInterfaceLink + 100000 + true + ASIC1 + Eth64-ASIC1 + true + str2-7804-lc5-1 + Ethernet27/1 + true + + + DeviceInterfaceLink + 100000 + true + ASIC1 + Eth72-ASIC1 + true + str2-7804-lc5-1 + Ethernet28/1 + true + + + DeviceInterfaceLink + 100000 + true + ASIC1 + Eth80-ASIC1 + true + str2-7804-lc5-1 + Ethernet29/1 + true + + + DeviceInterfaceLink + 100000 + true + ASIC1 + Eth88-ASIC1 + true + str2-7804-lc5-1 + Ethernet30/1 + true + + + DeviceInterfaceLink + 100000 + true + ASIC1 + Eth96-ASIC1 + true + str2-7804-lc5-1 + Ethernet31/1 + true + + + DeviceInterfaceLink + 100000 + true + ASIC1 + Eth104-ASIC1 + true + str2-7804-lc5-1 + Ethernet32/1 + true + + + DeviceInterfaceLink + 100000 + true + ASIC1 + Eth112-ASIC1 + true + str2-7804-lc5-1 + Ethernet33/1 + true + + + DeviceInterfaceLink + 100000 + true + ASIC1 + Eth120-ASIC1 + true + str2-7804-lc5-1 + Ethernet34/1 + true + + + DeviceInterfaceLink + 100000 + true + ASIC1 + Eth128-ASIC1 + true + str2-7804-lc5-1 + Ethernet35/1 + true + + + DeviceInterfaceLink + 100000 + true + ASIC1 + Eth136-ASIC1 + true + str2-7804-lc5-1 + Ethernet36/1 + true + + + + + str2-7804-lc5-1 + Arista-7800R3A-36DM2-C36 + + 10.3.147.27 + + + + ARISTA05T3 + + 172.16.145.34 + + Arista-VM + + + ARISTA11T3 + + 172.16.145.37 + + Arista-VM + + + ARISTA17T3 + + 172.16.145.40 + + Arista-VM + + + ARISTA21T3 + + 172.16.145.44 + + Arista-VM + + + ARISTA19T3 + + 172.16.145.42 + + Arista-VM + + + ARISTA09T3 + + 172.16.145.36 + + Arista-VM + + + ARISTA20T3 + + 172.16.145.43 + + Arista-VM + + + ARISTA03T3 + + 172.16.145.33 + + Arista-VM + + + ARISTA07T3 + + 172.16.145.35 + + Arista-VM + + + ARISTA01T3 + + 172.16.145.32 + + Arista-VM + + + ARISTA27T3 + + 172.16.145.50 + + Arista-VM + + + ARISTA26T3 + + 172.16.145.49 + + Arista-VM + + + ARISTA32T3 + + 172.16.145.55 + + Arista-VM + + + ARISTA23T3 + + 172.16.145.46 + + Arista-VM + + + ARISTA25T3 + + 172.16.145.48 + + Arista-VM + + + ARISTA24T3 + + 172.16.145.47 + + Arista-VM + + + ARISTA22T3 + + 172.16.145.45 + + Arista-VM + + + ARISTA28T3 + + 172.16.145.51 + + Arista-VM + + + ARISTA30T3 + + 172.16.145.53 + + Arista-VM + + + ARISTA18T3 + + 172.16.145.41 + + Arista-VM + + + ARISTA29T3 + + 172.16.145.52 + + Arista-VM + + + ARISTA15T3 + + 172.16.145.39 + + Arista-VM + + + ARISTA13T3 + + 172.16.145.38 + + Arista-VM + + + ARISTA31T3 + + 172.16.145.54 + + Arista-VM + + + Asic +
+ 0.0.0.0/0 +
+ + ::/0 + + + + + + + + + + 0.0.0.0/0 + + + ::/0 + + + ASIC0 + Broadcom-Trident2 + + + Asic +
+ 0.0.0.0/0 +
+ + ::/0 + + + + + + + + + + 0.0.0.0/0 + + + ::/0 + + + ASIC1 + Broadcom-Trident2 + + + + + + true + + + DeviceInterface + + true + true + 1 + Ethernet1/1 + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + true + 1 + Ethernet2/1 + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + true + 1 + Ethernet3/1 + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + true + 1 + Ethernet4/1 + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + true + 1 + Ethernet5/1 + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + true + 1 + Ethernet6/1 + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + true + 1 + Ethernet7/1 + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + true + 1 + Ethernet8/1 + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + true + 1 + Ethernet9/1 + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + true + 1 + Ethernet10/1 + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + true + 1 + Ethernet11/1 + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + true + 1 + Ethernet12/1 + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + true + 1 + Ethernet13/1 + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + true + 1 + Ethernet14/1 + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + true + 1 + Ethernet15/1 + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + true + 1 + Ethernet16/1 + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + true + 1 + Ethernet17/1 + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + true + 1 + Ethernet18/1 + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + true + 1 + Ethernet19/1 + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + true + 1 + Ethernet20/1 + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + true + 1 + Ethernet21/1 + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + true + 1 + Ethernet22/1 + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + true + 1 + Ethernet23/1 + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + true + 1 + Ethernet24/1 + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + true + 1 + Ethernet25/1 + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + true + 1 + Ethernet26/1 + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + true + 1 + Ethernet27/1 + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + true + 1 + Ethernet28/1 + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + true + 1 + Ethernet29/1 + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + true + 1 + Ethernet30/1 + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + true + 1 + Ethernet31/1 + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + true + 1 + Ethernet32/1 + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + true + 1 + Ethernet33/1 + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + true + 1 + Ethernet34/1 + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + true + 1 + Ethernet35/1 + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + true + 1 + Ethernet36/1 + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + true + 1 + Recirc0/0 + + false + 0 + 0 + 400000 + + + DeviceInterface + + true + true + 1 + Recirc0/1 + + false + 0 + 0 + 400000 + + + DeviceInterface + + true + true + 1 + Recirc0/0 + + false + 0 + 0 + 400000 + + + DeviceInterface + + true + true + 1 + Recirc0/1 + + false + 0 + 0 + 400000 + + + + + Cpu0 + str2-7804-lc3-1 + Asic0 + 10000 + 0 + 0 + 0 + 0 + 8 + + + Ethernet0 + str2-7804-lc3-1 + Asic0 + 100000 + 1 + 0 + 0 + 1 + 8 + + + Ethernet4 + str2-7804-lc3-1 + Asic0 + 100000 + 2 + 0 + 0 + 2 + 8 + + + Ethernet8 + str2-7804-lc3-1 + Asic0 + 100000 + 3 + 0 + 0 + 3 + 8 + + + Ethernet12 + str2-7804-lc3-1 + Asic0 + 100000 + 4 + 0 + 0 + 4 + 8 + + + Ethernet16 + str2-7804-lc3-1 + Asic0 + 100000 + 5 + 0 + 0 + 5 + 8 + + + Ethernet20 + str2-7804-lc3-1 + Asic0 + 100000 + 6 + 0 + 0 + 6 + 8 + + + Ethernet24 + str2-7804-lc3-1 + Asic0 + 100000 + 7 + 0 + 0 + 7 + 8 + + + Ethernet28 + str2-7804-lc3-1 + Asic0 + 100000 + 8 + 0 + 0 + 8 + 8 + + + Ethernet32 + str2-7804-lc3-1 + Asic0 + 100000 + 9 + 0 + 0 + 9 + 8 + + + Ethernet36 + str2-7804-lc3-1 + Asic0 + 100000 + 10 + 0 + 0 + 10 + 8 + + + Ethernet40 + str2-7804-lc3-1 + Asic0 + 100000 + 11 + 0 + 0 + 11 + 8 + + + Ethernet44 + str2-7804-lc3-1 + Asic0 + 100000 + 12 + 0 + 0 + 12 + 8 + + + Ethernet48 + str2-7804-lc3-1 + Asic0 + 100000 + 13 + 0 + 0 + 13 + 8 + + + Ethernet52 + str2-7804-lc3-1 + Asic0 + 100000 + 14 + 0 + 0 + 14 + 8 + + + Ethernet56 + str2-7804-lc3-1 + Asic0 + 100000 + 15 + 0 + 0 + 15 + 8 + + + Ethernet60 + str2-7804-lc3-1 + Asic0 + 100000 + 16 + 0 + 0 + 16 + 8 + + + Ethernet64 + str2-7804-lc3-1 + Asic0 + 100000 + 17 + 0 + 0 + 17 + 8 + + + Ethernet68 + str2-7804-lc3-1 + Asic0 + 100000 + 18 + 0 + 0 + 18 + 8 + + + Ethernet72 + str2-7804-lc3-1 + Asic0 + 100000 + 19 + 0 + 0 + 19 + 8 + + + Ethernet76 + str2-7804-lc3-1 + Asic0 + 100000 + 20 + 0 + 0 + 20 + 8 + + + Ethernet80 + str2-7804-lc3-1 + Asic0 + 100000 + 21 + 0 + 0 + 21 + 8 + + + Ethernet84 + str2-7804-lc3-1 + Asic0 + 100000 + 22 + 0 + 0 + 22 + 8 + + + Ethernet88 + str2-7804-lc3-1 + Asic0 + 100000 + 23 + 0 + 0 + 23 + 8 + + + Ethernet92 + str2-7804-lc3-1 + Asic0 + 100000 + 24 + 0 + 0 + 24 + 8 + + + Ethernet96 + str2-7804-lc3-1 + Asic0 + 100000 + 25 + 0 + 1 + 25 + 8 + + + Ethernet100 + str2-7804-lc3-1 + Asic0 + 100000 + 26 + 0 + 1 + 26 + 8 + + + Ethernet104 + str2-7804-lc3-1 + Asic0 + 100000 + 27 + 0 + 1 + 27 + 8 + + + Ethernet108 + str2-7804-lc3-1 + Asic0 + 100000 + 28 + 0 + 1 + 28 + 8 + + + Ethernet112 + str2-7804-lc3-1 + Asic0 + 100000 + 29 + 0 + 1 + 29 + 8 + + + Ethernet116 + str2-7804-lc3-1 + Asic0 + 100000 + 30 + 0 + 1 + 30 + 8 + + + Ethernet120 + str2-7804-lc3-1 + Asic0 + 100000 + 31 + 0 + 1 + 31 + 8 + + + Ethernet124 + str2-7804-lc3-1 + Asic0 + 100000 + 32 + 0 + 1 + 32 + 8 + + + Ethernet128 + str2-7804-lc3-1 + Asic0 + 100000 + 33 + 0 + 1 + 33 + 8 + + + Ethernet132 + str2-7804-lc3-1 + Asic0 + 100000 + 34 + 0 + 1 + 34 + 8 + + + Ethernet136 + str2-7804-lc3-1 + Asic0 + 100000 + 35 + 0 + 1 + 35 + 8 + + + Ethernet140 + str2-7804-lc3-1 + Asic0 + 100000 + 36 + 0 + 1 + 36 + 8 + + + Ethernet144 + str2-7804-lc3-1 + Asic0 + 100000 + 37 + 0 + 1 + 37 + 8 + + + Ethernet148 + str2-7804-lc3-1 + Asic0 + 100000 + 38 + 0 + 1 + 38 + 8 + + + Ethernet152 + str2-7804-lc3-1 + Asic0 + 100000 + 39 + 0 + 1 + 39 + 8 + + + Ethernet156 + str2-7804-lc3-1 + Asic0 + 100000 + 40 + 0 + 1 + 40 + 8 + + + Ethernet160 + str2-7804-lc3-1 + Asic0 + 100000 + 41 + 0 + 1 + 41 + 8 + + + Ethernet164 + str2-7804-lc3-1 + Asic0 + 100000 + 42 + 0 + 1 + 42 + 8 + + + Ethernet168 + str2-7804-lc3-1 + Asic0 + 100000 + 43 + 0 + 1 + 43 + 8 + + + Ethernet172 + str2-7804-lc3-1 + Asic0 + 100000 + 44 + 0 + 1 + 44 + 8 + + + Ethernet176 + str2-7804-lc3-1 + Asic0 + 100000 + 45 + 0 + 1 + 45 + 8 + + + Ethernet180 + str2-7804-lc3-1 + Asic0 + 100000 + 46 + 0 + 1 + 46 + 8 + + + Ethernet184 + str2-7804-lc3-1 + Asic0 + 100000 + 47 + 0 + 1 + 47 + 8 + + + Ethernet188 + str2-7804-lc3-1 + Asic0 + 100000 + 48 + 0 + 1 + 48 + 8 + + + Ethernet-Rec0 + str2-7804-lc3-1 + Asic0 + 400000 + 49 + 0 + 0 + 49 + 8 + + + Ethernet-IB0 + str2-7804-lc3-1 + Asic0 + 400000 + 50 + 0 + 1 + 50 + 8 + + + Cpu0 + str2-7804-lc7-1 + Asic0 + 10000 + 51 + 8 + 0 + 0 + 8 + + + Ethernet0 + str2-7804-lc7-1 + Asic0 + 100000 + 52 + 8 + 0 + 1 + 8 + + + Ethernet4 + str2-7804-lc7-1 + Asic0 + 100000 + 53 + 8 + 0 + 2 + 8 + + + Ethernet8 + str2-7804-lc7-1 + Asic0 + 100000 + 54 + 8 + 0 + 3 + 8 + + + Ethernet12 + str2-7804-lc7-1 + Asic0 + 100000 + 55 + 8 + 0 + 4 + 8 + + + Ethernet16 + str2-7804-lc7-1 + Asic0 + 100000 + 56 + 8 + 0 + 5 + 8 + + + Ethernet20 + str2-7804-lc7-1 + Asic0 + 100000 + 57 + 8 + 0 + 6 + 8 + + + Ethernet24 + str2-7804-lc7-1 + Asic0 + 100000 + 58 + 8 + 0 + 7 + 8 + + + Ethernet28 + str2-7804-lc7-1 + Asic0 + 100000 + 59 + 8 + 0 + 8 + 8 + + + Ethernet32 + str2-7804-lc7-1 + Asic0 + 100000 + 60 + 8 + 0 + 9 + 8 + + + Ethernet36 + str2-7804-lc7-1 + Asic0 + 100000 + 61 + 8 + 0 + 10 + 8 + + + Ethernet40 + str2-7804-lc7-1 + Asic0 + 100000 + 62 + 8 + 0 + 11 + 8 + + + Ethernet44 + str2-7804-lc7-1 + Asic0 + 100000 + 63 + 8 + 0 + 12 + 8 + + + Ethernet48 + str2-7804-lc7-1 + Asic0 + 100000 + 64 + 8 + 0 + 13 + 8 + + + Ethernet52 + str2-7804-lc7-1 + Asic0 + 100000 + 65 + 8 + 0 + 14 + 8 + + + Ethernet56 + str2-7804-lc7-1 + Asic0 + 100000 + 66 + 8 + 0 + 15 + 8 + + + Ethernet60 + str2-7804-lc7-1 + Asic0 + 100000 + 67 + 8 + 0 + 16 + 8 + + + Ethernet64 + str2-7804-lc7-1 + Asic0 + 100000 + 68 + 8 + 0 + 17 + 8 + + + Ethernet68 + str2-7804-lc7-1 + Asic0 + 100000 + 69 + 8 + 0 + 18 + 8 + + + Ethernet72 + str2-7804-lc7-1 + Asic0 + 100000 + 70 + 8 + 0 + 19 + 8 + + + Ethernet76 + str2-7804-lc7-1 + Asic0 + 100000 + 71 + 8 + 0 + 20 + 8 + + + Ethernet80 + str2-7804-lc7-1 + Asic0 + 100000 + 72 + 8 + 0 + 21 + 8 + + + Ethernet84 + str2-7804-lc7-1 + Asic0 + 100000 + 73 + 8 + 0 + 22 + 8 + + + Ethernet88 + str2-7804-lc7-1 + Asic0 + 100000 + 74 + 8 + 0 + 23 + 8 + + + Ethernet92 + str2-7804-lc7-1 + Asic0 + 100000 + 75 + 8 + 0 + 24 + 8 + + + Ethernet96 + str2-7804-lc7-1 + Asic0 + 100000 + 76 + 8 + 1 + 25 + 8 + + + Ethernet100 + str2-7804-lc7-1 + Asic0 + 100000 + 77 + 8 + 1 + 26 + 8 + + + Ethernet104 + str2-7804-lc7-1 + Asic0 + 100000 + 78 + 8 + 1 + 27 + 8 + + + Ethernet108 + str2-7804-lc7-1 + Asic0 + 100000 + 79 + 8 + 1 + 28 + 8 + + + Ethernet112 + str2-7804-lc7-1 + Asic0 + 100000 + 80 + 8 + 1 + 29 + 8 + + + Ethernet116 + str2-7804-lc7-1 + Asic0 + 100000 + 81 + 8 + 1 + 30 + 8 + + + Ethernet120 + str2-7804-lc7-1 + Asic0 + 100000 + 82 + 8 + 1 + 31 + 8 + + + Ethernet124 + str2-7804-lc7-1 + Asic0 + 100000 + 83 + 8 + 1 + 32 + 8 + + + Ethernet128 + str2-7804-lc7-1 + Asic0 + 100000 + 84 + 8 + 1 + 33 + 8 + + + Ethernet132 + str2-7804-lc7-1 + Asic0 + 100000 + 85 + 8 + 1 + 34 + 8 + + + Ethernet136 + str2-7804-lc7-1 + Asic0 + 100000 + 86 + 8 + 1 + 35 + 8 + + + Ethernet140 + str2-7804-lc7-1 + Asic0 + 100000 + 87 + 8 + 1 + 36 + 8 + + + Ethernet144 + str2-7804-lc7-1 + Asic0 + 100000 + 88 + 8 + 1 + 37 + 8 + + + Ethernet148 + str2-7804-lc7-1 + Asic0 + 100000 + 89 + 8 + 1 + 38 + 8 + + + Ethernet152 + str2-7804-lc7-1 + Asic0 + 100000 + 90 + 8 + 1 + 39 + 8 + + + Ethernet156 + str2-7804-lc7-1 + Asic0 + 100000 + 91 + 8 + 1 + 40 + 8 + + + Ethernet160 + str2-7804-lc7-1 + Asic0 + 100000 + 92 + 8 + 1 + 41 + 8 + + + Ethernet164 + str2-7804-lc7-1 + Asic0 + 100000 + 93 + 8 + 1 + 42 + 8 + + + Ethernet168 + str2-7804-lc7-1 + Asic0 + 100000 + 94 + 8 + 1 + 43 + 8 + + + Ethernet172 + str2-7804-lc7-1 + Asic0 + 100000 + 95 + 8 + 1 + 44 + 8 + + + Ethernet176 + str2-7804-lc7-1 + Asic0 + 100000 + 96 + 8 + 1 + 45 + 8 + + + Ethernet180 + str2-7804-lc7-1 + Asic0 + 100000 + 97 + 8 + 1 + 46 + 8 + + + Ethernet184 + str2-7804-lc7-1 + Asic0 + 100000 + 98 + 8 + 1 + 47 + 8 + + + Ethernet188 + str2-7804-lc7-1 + Asic0 + 100000 + 99 + 8 + 1 + 48 + 8 + + + Ethernet-Rec0 + str2-7804-lc7-1 + Asic0 + 400000 + 100 + 8 + 0 + 49 + 8 + + + Ethernet-IB0 + str2-7804-lc7-1 + Asic0 + 400000 + 101 + 8 + 1 + 50 + 8 + + + Cpu0 + str2-7804-lc5-1 + asic0 + 10000 + 102 + 2 + 0 + 0 + 8 + + + Ethernet0 + str2-7804-lc5-1 + asic0 + 100000 + 103 + 2 + 1 + 1 + 8 + + + Ethernet8 + str2-7804-lc5-1 + asic0 + 100000 + 104 + 2 + 1 + 2 + 8 + + + Ethernet16 + str2-7804-lc5-1 + asic0 + 100000 + 105 + 2 + 1 + 3 + 8 + + + Ethernet24 + str2-7804-lc5-1 + asic0 + 100000 + 106 + 2 + 1 + 4 + 8 + + + Ethernet32 + str2-7804-lc5-1 + asic0 + 100000 + 107 + 2 + 1 + 5 + 8 + + + Ethernet40 + str2-7804-lc5-1 + asic0 + 100000 + 108 + 2 + 1 + 6 + 8 + + + Ethernet48 + str2-7804-lc5-1 + asic0 + 100000 + 109 + 2 + 1 + 7 + 8 + + + Ethernet56 + str2-7804-lc5-1 + asic0 + 100000 + 110 + 2 + 1 + 8 + 8 + + + Ethernet64 + str2-7804-lc5-1 + asic0 + 100000 + 111 + 2 + 1 + 9 + 8 + + + Ethernet72 + str2-7804-lc5-1 + asic0 + 100000 + 112 + 2 + 0 + 10 + 8 + + + Ethernet80 + str2-7804-lc5-1 + asic0 + 100000 + 113 + 2 + 0 + 11 + 8 + + + Ethernet88 + str2-7804-lc5-1 + asic0 + 100000 + 114 + 2 + 0 + 12 + 8 + + + Ethernet96 + str2-7804-lc5-1 + asic0 + 100000 + 115 + 2 + 0 + 13 + 8 + + + Ethernet104 + str2-7804-lc5-1 + asic0 + 100000 + 116 + 2 + 0 + 14 + 8 + + + Ethernet112 + str2-7804-lc5-1 + asic0 + 100000 + 117 + 2 + 0 + 15 + 8 + + + Ethernet120 + str2-7804-lc5-1 + asic0 + 100000 + 118 + 2 + 0 + 16 + 8 + + + Ethernet128 + str2-7804-lc5-1 + asic0 + 100000 + 119 + 2 + 0 + 17 + 8 + + + Ethernet136 + str2-7804-lc5-1 + asic0 + 100000 + 120 + 2 + 0 + 18 + 8 + + + Ethernet-Rec0 + str2-7804-lc5-1 + asic0 + 400000 + 121 + 2 + 0 + 49 + 8 + + + Ethernet-IB0 + str2-7804-lc5-1 + asic0 + 400000 + 122 + 2 + 1 + 50 + 8 + + + Cpu0 + str2-7804-lc5-1 + asic1 + 10000 + 123 + 4 + 0 + 0 + 8 + + + Ethernet144 + str2-7804-lc5-1 + asic1 + 100000 + 124 + 4 + 1 + 1 + 8 + + + Ethernet152 + str2-7804-lc5-1 + asic1 + 100000 + 125 + 4 + 1 + 2 + 8 + + + Ethernet160 + str2-7804-lc5-1 + asic1 + 100000 + 126 + 4 + 1 + 3 + 8 + + + Ethernet168 + str2-7804-lc5-1 + asic1 + 100000 + 127 + 4 + 1 + 4 + 8 + + + Ethernet176 + str2-7804-lc5-1 + asic1 + 100000 + 128 + 4 + 1 + 5 + 8 + + + Ethernet184 + str2-7804-lc5-1 + asic1 + 100000 + 129 + 4 + 1 + 6 + 8 + + + Ethernet192 + str2-7804-lc5-1 + asic1 + 100000 + 130 + 4 + 1 + 7 + 8 + + + Ethernet200 + str2-7804-lc5-1 + asic1 + 100000 + 131 + 4 + 1 + 8 + 8 + + + Ethernet208 + str2-7804-lc5-1 + asic1 + 100000 + 132 + 4 + 1 + 9 + 8 + + + Ethernet216 + str2-7804-lc5-1 + asic1 + 100000 + 133 + 4 + 0 + 10 + 8 + + + Ethernet224 + str2-7804-lc5-1 + asic1 + 100000 + 134 + 4 + 0 + 11 + 8 + + + Ethernet232 + str2-7804-lc5-1 + asic1 + 100000 + 135 + 4 + 0 + 12 + 8 + + + Ethernet240 + str2-7804-lc5-1 + asic1 + 100000 + 136 + 4 + 0 + 13 + 8 + + + Ethernet248 + str2-7804-lc5-1 + asic1 + 100000 + 137 + 4 + 0 + 14 + 8 + + + Ethernet256 + str2-7804-lc5-1 + asic1 + 100000 + 138 + 4 + 0 + 15 + 8 + + + Ethernet264 + str2-7804-lc5-1 + asic1 + 100000 + 139 + 4 + 0 + 16 + 8 + + + Ethernet272 + str2-7804-lc5-1 + asic1 + 100000 + 140 + 4 + 0 + 17 + 8 + + + Ethernet280 + str2-7804-lc5-1 + asic1 + 100000 + 141 + 4 + 0 + 18 + 8 + + + Ethernet-Rec1 + str2-7804-lc5-1 + asic1 + 400000 + 142 + 4 + 0 + 49 + 8 + + + Ethernet-IB1 + str2-7804-lc5-1 + asic1 + 400000 + 143 + 4 + 1 + 50 + 8 + + + true + 0 + Arista-7800R3A-36DM2-C36 + + + + + + + str2-7804-lc5-1 + + + DeploymentId + + 1 + + + QosProfile + + Profile0 + + + DhcpResources + + 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 + + + NtpResources + + 10.20.8.129;10.20.8.130 + + + SnmpResources + + 10.3.145.98 + + + SyslogResources + + 10.64.246.95 + + + TacacsGroup + + Starlab + + + TacacsServer + + 10.3.145.14;10.3.145.15 + + + ForcedMgmtRoutes + + 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.64.246.0/23;10.3.146.0/23;10.64.5.5;10.201.148.32/28 + + + ErspanDestinationIpv4 + + 10.20.6.16 + + + SwitchType + + voq + + + MaxCores + + 16 + + + + + ASIC0 + + + SubRole + + FrontEnd + + + SwitchType + + voq + + + SwitchId + + 2 + + + MaxCores + + 16 + + + + + ASIC1 + + + SubRole + + FrontEnd + + + SwitchType + + voq + + + SwitchId + + 4 + + + MaxCores + + 16 + + + + + ASIC1 + + + DeploymentId + + 1 + + + SubRole + + FrontEnd + + + SwitchType + + voq + + + + + ASIC0 + + + DeploymentId + + 1 + + + SubRole + + FrontEnd + + + SwitchType + + voq + + + + + + + str2-7804-lc5-1 + Arista-7800R3A-36DM2-C36 + diff --git a/src/sonic-config-engine/tests/sample-arista-7800r3a-36dm2-d36-lc-t2-minigraph.xml b/src/sonic-config-engine/tests/sample-arista-7800r3a-36dm2-d36-lc-t2-minigraph.xml new file mode 100644 index 000000000000..2ba497bb99a0 --- /dev/null +++ b/src/sonic-config-engine/tests/sample-arista-7800r3a-36dm2-d36-lc-t2-minigraph.xml @@ -0,0 +1,5539 @@ + + + + + + false + str3-7800-lc8-1 + 10.0.0.0 + ARISTA01T3 + 10.0.0.1 + 1 + 10 + 3 + + + false + ASIC0 + 10.0.0.0 + ARISTA01T3 + 10.0.0.1 + 1 + 10 + 3 + + + str3-7800-lc8-1 + FC00::1 + ARISTA01T3 + FC00::2 + 1 + 10 + 3 + + + ASIC0 + FC00::1 + ARISTA01T3 + FC00::2 + 1 + 10 + 3 + + + false + str3-7800-lc8-1 + 10.0.0.4 + ARISTA03T3 + 10.0.0.5 + 1 + 10 + 3 + + + false + ASIC0 + 10.0.0.4 + ARISTA03T3 + 10.0.0.5 + 1 + 10 + 3 + + + str3-7800-lc8-1 + FC00::9 + ARISTA03T3 + FC00::A + 1 + 10 + 3 + + + ASIC0 + FC00::9 + ARISTA03T3 + FC00::A + 1 + 10 + 3 + + + false + str3-7800-lc8-1 + 10.0.0.8 + ARISTA05T3 + 10.0.0.9 + 1 + 10 + 3 + + + false + ASIC0 + 10.0.0.8 + ARISTA05T3 + 10.0.0.9 + 1 + 10 + 3 + + + str3-7800-lc8-1 + FC00::11 + ARISTA05T3 + FC00::12 + 1 + 10 + 3 + + + ASIC0 + FC00::11 + ARISTA05T3 + FC00::12 + 1 + 10 + 3 + + + false + str3-7800-lc8-1 + 10.0.0.12 + ARISTA07T3 + 10.0.0.13 + 1 + 10 + 3 + + + false + ASIC0 + 10.0.0.12 + ARISTA07T3 + 10.0.0.13 + 1 + 10 + 3 + + + str3-7800-lc8-1 + FC00::19 + ARISTA07T3 + FC00::1A + 1 + 10 + 3 + + + ASIC0 + FC00::19 + ARISTA07T3 + FC00::1A + 1 + 10 + 3 + + + false + str3-7800-lc8-1 + 10.0.0.16 + ARISTA09T3 + 10.0.0.17 + 1 + 10 + 3 + + + false + ASIC0 + 10.0.0.16 + ARISTA09T3 + 10.0.0.17 + 1 + 10 + 3 + + + str3-7800-lc8-1 + FC00::21 + ARISTA09T3 + FC00::22 + 1 + 10 + 3 + + + ASIC0 + FC00::21 + ARISTA09T3 + FC00::22 + 1 + 10 + 3 + + + false + str3-7800-lc8-1 + 10.0.0.20 + ARISTA11T3 + 10.0.0.21 + 1 + 10 + 3 + + + false + ASIC0 + 10.0.0.20 + ARISTA11T3 + 10.0.0.21 + 1 + 10 + 3 + + + str3-7800-lc8-1 + FC00::29 + ARISTA11T3 + FC00::2A + 1 + 10 + 3 + + + ASIC0 + FC00::29 + ARISTA11T3 + FC00::2A + 1 + 10 + 3 + + + false + str3-7800-lc8-1 + 10.0.0.32 + ARISTA13T3 + 10.0.0.33 + 1 + 10 + 3 + + + false + ASIC0 + 10.0.0.32 + ARISTA13T3 + 10.0.0.33 + 1 + 10 + 3 + + + str3-7800-lc8-1 + FC00::41 + ARISTA13T3 + FC00::42 + 1 + 10 + 3 + + + ASIC0 + FC00::41 + ARISTA13T3 + FC00::42 + 1 + 10 + 3 + + + false + str3-7800-lc8-1 + 10.0.0.28 + ARISTA15T3 + 10.0.0.29 + 1 + 10 + 3 + + + false + ASIC0 + 10.0.0.28 + ARISTA15T3 + 10.0.0.29 + 1 + 10 + 3 + + + str3-7800-lc8-1 + FC00::39 + ARISTA15T3 + FC00::3A + 1 + 10 + 3 + + + ASIC0 + FC00::39 + ARISTA15T3 + FC00::3A + 1 + 10 + 3 + + + false + str3-7800-lc8-1 + 10.0.0.34 + ARISTA17T3 + 10.0.0.35 + 1 + 10 + 3 + + + false + ASIC0 + 10.0.0.34 + ARISTA17T3 + 10.0.0.35 + 1 + 10 + 3 + + + str3-7800-lc8-1 + FC00::45 + ARISTA17T3 + FC00::46 + 1 + 10 + 3 + + + ASIC0 + FC00::45 + ARISTA17T3 + FC00::46 + 1 + 10 + 3 + + + false + str3-7800-lc8-1 + 10.0.0.24 + ARISTA18T3 + 10.0.0.25 + 1 + 10 + 3 + + + false + ASIC0 + 10.0.0.24 + ARISTA18T3 + 10.0.0.25 + 1 + 10 + 3 + + + str3-7800-lc8-1 + FC00::31 + ARISTA18T3 + FC00::32 + 1 + 10 + 3 + + + ASIC0 + FC00::31 + ARISTA18T3 + FC00::32 + 1 + 10 + 3 + + + false + str3-7800-lc8-1 + 10.0.0.36 + ARISTA19T3 + 10.0.0.37 + 1 + 10 + 3 + + + false + ASIC1 + 10.0.0.36 + ARISTA19T3 + 10.0.0.37 + 1 + 10 + 3 + + + str3-7800-lc8-1 + FC00::49 + ARISTA19T3 + FC00::4A + 1 + 10 + 3 + + + ASIC1 + FC00::49 + ARISTA19T3 + FC00::4A + 1 + 10 + 3 + + + false + str3-7800-lc8-1 + 10.0.0.38 + ARISTA20T3 + 10.0.0.39 + 1 + 10 + 3 + + + false + ASIC1 + 10.0.0.38 + ARISTA20T3 + 10.0.0.39 + 1 + 10 + 3 + + + str3-7800-lc8-1 + FC00::4D + ARISTA20T3 + FC00::4E + 1 + 10 + 3 + + + ASIC1 + FC00::4D + ARISTA20T3 + FC00::4E + 1 + 10 + 3 + + + false + str3-7800-lc8-1 + 10.0.0.40 + ARISTA21T3 + 10.0.0.41 + 1 + 10 + 3 + + + false + ASIC1 + 10.0.0.40 + ARISTA21T3 + 10.0.0.41 + 1 + 10 + 3 + + + str3-7800-lc8-1 + FC00::51 + ARISTA21T3 + FC00::52 + 1 + 10 + 3 + + + ASIC1 + FC00::51 + ARISTA21T3 + FC00::52 + 1 + 10 + 3 + + + false + str3-7800-lc8-1 + 10.0.0.42 + ARISTA22T3 + 10.0.0.43 + 1 + 10 + 3 + + + false + ASIC1 + 10.0.0.42 + ARISTA22T3 + 10.0.0.43 + 1 + 10 + 3 + + + str3-7800-lc8-1 + FC00::55 + ARISTA22T3 + FC00::56 + 1 + 10 + 3 + + + ASIC1 + FC00::55 + ARISTA22T3 + FC00::56 + 1 + 10 + 3 + + + false + str3-7800-lc8-1 + 10.0.0.44 + ARISTA23T3 + 10.0.0.45 + 1 + 10 + 3 + + + false + ASIC1 + 10.0.0.44 + ARISTA23T3 + 10.0.0.45 + 1 + 10 + 3 + + + str3-7800-lc8-1 + FC00::59 + ARISTA23T3 + FC00::5A + 1 + 10 + 3 + + + ASIC1 + FC00::59 + ARISTA23T3 + FC00::5A + 1 + 10 + 3 + + + false + str3-7800-lc8-1 + 10.0.0.46 + ARISTA24T3 + 10.0.0.47 + 1 + 10 + 3 + + + false + ASIC1 + 10.0.0.46 + ARISTA24T3 + 10.0.0.47 + 1 + 10 + 3 + + + str3-7800-lc8-1 + FC00::5D + ARISTA24T3 + FC00::5E + 1 + 10 + 3 + + + ASIC1 + FC00::5D + ARISTA24T3 + FC00::5E + 1 + 10 + 3 + + + false + str3-7800-lc8-1 + 10.0.0.48 + ARISTA25T3 + 10.0.0.49 + 1 + 10 + 3 + + + false + ASIC1 + 10.0.0.48 + ARISTA25T3 + 10.0.0.49 + 1 + 10 + 3 + + + str3-7800-lc8-1 + FC00::61 + ARISTA25T3 + FC00::62 + 1 + 10 + 3 + + + ASIC1 + FC00::61 + ARISTA25T3 + FC00::62 + 1 + 10 + 3 + + + false + str3-7800-lc8-1 + 10.0.0.50 + ARISTA26T3 + 10.0.0.51 + 1 + 10 + 3 + + + false + ASIC1 + 10.0.0.50 + ARISTA26T3 + 10.0.0.51 + 1 + 10 + 3 + + + str3-7800-lc8-1 + FC00::65 + ARISTA26T3 + FC00::66 + 1 + 10 + 3 + + + ASIC1 + FC00::65 + ARISTA26T3 + FC00::66 + 1 + 10 + 3 + + + false + str3-7800-lc8-1 + 10.0.0.52 + ARISTA27T3 + 10.0.0.53 + 1 + 10 + 3 + + + false + ASIC1 + 10.0.0.52 + ARISTA27T3 + 10.0.0.53 + 1 + 10 + 3 + + + str3-7800-lc8-1 + FC00::69 + ARISTA27T3 + FC00::6A + 1 + 10 + 3 + + + ASIC1 + FC00::69 + ARISTA27T3 + FC00::6A + 1 + 10 + 3 + + + false + str3-7800-lc8-1 + 10.0.0.54 + ARISTA28T3 + 10.0.0.55 + 1 + 10 + 3 + + + false + ASIC1 + 10.0.0.54 + ARISTA28T3 + 10.0.0.55 + 1 + 10 + 3 + + + str3-7800-lc8-1 + FC00::6D + ARISTA28T3 + FC00::6E + 1 + 10 + 3 + + + ASIC1 + FC00::6D + ARISTA28T3 + FC00::6E + 1 + 10 + 3 + + + false + str3-7800-lc8-1 + 10.0.0.56 + ARISTA29T3 + 10.0.0.57 + 1 + 10 + 3 + + + false + ASIC1 + 10.0.0.56 + ARISTA29T3 + 10.0.0.57 + 1 + 10 + 3 + + + str3-7800-lc8-1 + FC00::71 + ARISTA29T3 + FC00::72 + 1 + 10 + 3 + + + ASIC1 + FC00::71 + ARISTA29T3 + FC00::72 + 1 + 10 + 3 + + + false + str3-7800-lc8-1 + 10.0.0.58 + ARISTA30T3 + 10.0.0.59 + 1 + 10 + 3 + + + false + ASIC1 + 10.0.0.58 + ARISTA30T3 + 10.0.0.59 + 1 + 10 + 3 + + + str3-7800-lc8-1 + FC00::75 + ARISTA30T3 + FC00::76 + 1 + 10 + 3 + + + ASIC1 + FC00::75 + ARISTA30T3 + FC00::76 + 1 + 10 + 3 + + + false + str3-7800-lc8-1 + 10.0.0.60 + ARISTA31T3 + 10.0.0.61 + 1 + 10 + 3 + + + false + ASIC1 + 10.0.0.60 + ARISTA31T3 + 10.0.0.61 + 1 + 10 + 3 + + + str3-7800-lc8-1 + FC00::79 + ARISTA31T3 + FC00::7A + 1 + 10 + 3 + + + ASIC1 + FC00::79 + ARISTA31T3 + FC00::7A + 1 + 10 + 3 + + + false + str3-7800-lc8-1 + 10.0.0.62 + ARISTA32T3 + 10.0.0.63 + 1 + 10 + 3 + + + false + ASIC1 + 10.0.0.62 + ARISTA32T3 + 10.0.0.63 + 1 + 10 + 3 + + + str3-7800-lc8-1 + FC00::7D + ARISTA32T3 + FC00::7E + 1 + 10 + 3 + + + ASIC1 + FC00::7D + ARISTA32T3 + FC00::7E + 1 + 10 + 3 + + + + + ASIC0 + str3-7800-lc2-1 + 3.3.3.8 + 3.3.3.2 + 1 + 0 + 0 + voq + + + ASIC0 + str3-7800-lc2-1 + 3333::3:8 + 3333::3:2 + 1 + 0 + 0 + voq + + + ASIC0 + str3-7800-lc1-1 + 3.3.3.8 + 3.3.3.1 + 1 + 0 + 0 + voq + + + ASIC0 + str3-7800-lc1-1 + 3333::3:8 + 3333::3:1 + 1 + 0 + 0 + voq + + + ASIC0 + ASIC1 + 3.3.3.8 + 3.3.3.9 + 1 + 0 + 0 + voq + + + ASIC0 + ASIC1 + 3333::3:8 + 3333::3:9 + 1 + 0 + 0 + voq + + + ASIC1 + str3-7800-lc2-1 + 3.3.3.9 + 3.3.3.2 + 1 + 0 + 0 + voq + + + ASIC1 + str3-7800-lc2-1 + 3333::3:9 + 3333::3:2 + 1 + 0 + 0 + voq + + + ASIC1 + str3-7800-lc1-1 + 3.3.3.9 + 3.3.3.1 + 1 + 0 + 0 + voq + + + ASIC1 + str3-7800-lc1-1 + 3333::3:9 + 3333::3:1 + 1 + 0 + 0 + voq + + + ASIC1 + ASIC0 + 3.3.3.9 + 3.3.3.8 + 1 + 0 + 0 + voq + + + ASIC1 + ASIC0 + 3333::3:9 + 3333::3:8 + 1 + 0 + 0 + voq + + + + + 65100 + str3-7800-lc8-1 + + +
10.0.0.1
+ + + + + +
10.0.0.5
+ + + + + +
10.0.0.9
+ + + + + +
10.0.0.13
+ + + + + +
10.0.0.17
+ + + + + +
10.0.0.21
+ + + + + +
10.0.0.33
+ + + + + +
10.0.0.29
+ + + + + +
10.0.0.35
+ + + + + +
10.0.0.25
+ + + + + +
10.0.0.37
+ + + + + +
10.0.0.39
+ + + + + +
10.0.0.41
+ + + + + +
10.0.0.43
+ + + + + +
10.0.0.45
+ + + + + +
10.0.0.47
+ + + + + +
10.0.0.49
+ + + + + +
10.0.0.51
+ + + + + +
10.0.0.53
+ + + + + +
10.0.0.55
+ + + + + +
10.0.0.57
+ + + + + +
10.0.0.59
+ + + + + +
10.0.0.61
+ + + + + +
10.0.0.63
+ + + + + + + + + 65200 + ARISTA01T3 + + + + 65200 + ARISTA03T3 + + + + 65200 + ARISTA05T3 + + + + 65200 + ARISTA07T3 + + + + 65200 + ARISTA09T3 + + + + 65200 + ARISTA11T3 + + + + 65200 + ARISTA13T3 + + + + 65200 + ARISTA15T3 + + + + 65200 + ARISTA17T3 + + + + 65200 + ARISTA18T3 + + + + 65200 + ARISTA19T3 + + + + 65200 + ARISTA20T3 + + + + 65200 + ARISTA21T3 + + + + 65200 + ARISTA22T3 + + + + 65200 + ARISTA23T3 + + + + 65200 + ARISTA24T3 + + + + 65200 + ARISTA25T3 + + + + 65200 + ARISTA26T3 + + + + 65200 + ARISTA27T3 + + + + 65200 + ARISTA28T3 + + + + 65200 + ARISTA29T3 + + + + 65200 + ARISTA30T3 + + + + 65200 + ARISTA31T3 + + + + 65200 + ARISTA32T3 + + + + 65100 + ASIC1 + + +
10.0.0.37
+ + + + + +
10.0.0.39
+ + + + + +
10.0.0.41
+ + + + + +
10.0.0.43
+ + + + + +
10.0.0.45
+ + + + + +
10.0.0.47
+ + + + + +
10.0.0.49
+ + + + + +
10.0.0.51
+ + + + + +
10.0.0.53
+ + + + + +
10.0.0.55
+ + + + + +
10.0.0.57
+ + + + + +
10.0.0.59
+ + + + + +
10.0.0.61
+ + + + + +
10.0.0.63
+ + + + + +
3.3.3.2/32
+ + + + + +
3.3.3.1/32
+ + + + + +
3.3.3.8/32
+ + + + + + + + + 65100 + ASIC0 + + +
10.0.0.1
+ + + + + +
10.0.0.5
+ + + + + +
10.0.0.9
+ + + + + +
10.0.0.13
+ + + + + +
10.0.0.17
+ + + + + +
10.0.0.21
+ + + + + +
10.0.0.33
+ + + + + +
10.0.0.29
+ + + + + +
10.0.0.35
+ + + + + +
10.0.0.25
+ + + + + +
3.3.3.2/32
+ + + + + +
3.3.3.1/32
+ + + + + +
3.3.3.9/32
+ + + + + + + + + 65100 + str3-7800-lc2-1 + + + + 65100 + str3-7800-lc1-1 + + + + + + + + + + HostIP + Loopback0 + + 10.1.0.1/32 + + 10.1.0.1/32 + + + HostIP1 + Loopback0 + + FC00:10::1/128 + + FC00:10::1/128 + + + + + HostIP + eth0 + + 10.3.146.83/23 + + 10.3.146.83/23 + + + V6HostIP + eth0 + + FC00:2::32/64 + + FC00:2::32/64 + + + + + + + str3-7800-lc8-1 + + + PortChannel102 + Ethernet1/1;Ethernet2/1 + + + + PortChannel104 + Ethernet3/1;Ethernet4/1 + + + + PortChannel106 + Ethernet5/1;Ethernet6/1 + + + + PortChannel108 + Ethernet7/1;Ethernet8/1 + + + + PortChannel1010 + Ethernet9/1;Ethernet10/1 + + + + PortChannel1012 + Ethernet11/1;Ethernet12/1 + + + + PortChannel1016 + Ethernet14/1;Ethernet15/1 + + + + PortChannel1020 + Ethernet17/1;Ethernet18/1 + + + + + + + + + PortChannel102 + 10.0.0.0/31 + + + + PortChannel102 + FC00::1/126 + + + + PortChannel104 + 10.0.0.4/31 + + + + PortChannel104 + FC00::9/126 + + + + PortChannel106 + 10.0.0.8/31 + + + + PortChannel106 + FC00::11/126 + + + + PortChannel108 + 10.0.0.12/31 + + + + PortChannel108 + FC00::19/126 + + + + PortChannel1010 + 10.0.0.16/31 + + + + PortChannel1010 + FC00::21/126 + + + + PortChannel1012 + 10.0.0.20/31 + + + + PortChannel1012 + FC00::29/126 + + + + Ethernet13/1 + 10.0.0.32/31 + + + + Ethernet13/1 + FC00::41/126 + + + + PortChannel1016 + 10.0.0.28/31 + + + + PortChannel1016 + FC00::39/126 + + + + Ethernet16/1 + 10.0.0.34/31 + + + + Ethernet16/1 + FC00::45/126 + + + + PortChannel1020 + 10.0.0.24/31 + + + + PortChannel1020 + FC00::31/126 + + + + Ethernet19/1 + 10.0.0.36/31 + + + + Ethernet19/1 + FC00::49/126 + + + + Ethernet20/1 + 10.0.0.38/31 + + + + Ethernet20/1 + FC00::4D/126 + + + + Ethernet21/1 + 10.0.0.40/31 + + + + Ethernet21/1 + FC00::51/126 + + + + Ethernet22/1 + 10.0.0.42/31 + + + + Ethernet22/1 + FC00::55/126 + + + + Ethernet23/1 + 10.0.0.44/31 + + + + Ethernet23/1 + FC00::59/126 + + + + Ethernet24/1 + 10.0.0.46/31 + + + + Ethernet24/1 + FC00::5D/126 + + + + Ethernet25/1 + 10.0.0.48/31 + + + + Ethernet25/1 + FC00::61/126 + + + + Ethernet26/1 + 10.0.0.50/31 + + + + Ethernet26/1 + FC00::65/126 + + + + Ethernet27/1 + 10.0.0.52/31 + + + + Ethernet27/1 + FC00::69/126 + + + + Ethernet28/1 + 10.0.0.54/31 + + + + Ethernet28/1 + FC00::6D/126 + + + + Ethernet29/1 + 10.0.0.56/31 + + + + Ethernet29/1 + FC00::71/126 + + + + Ethernet30/1 + 10.0.0.58/31 + + + + Ethernet30/1 + FC00::75/126 + + + + Ethernet31/1 + 10.0.0.60/31 + + + + Ethernet31/1 + FC00::79/126 + + + + Ethernet32/1 + 10.0.0.62/31 + + + + Ethernet32/1 + FC00::7D/126 + + + + + + NTP_ACL + NTP + NTP + + + SNMP_ACL + SNMP + SNMP + + + VTY_LINE + ssh-only + SSH + + + ERSPAN + Everflow + Everflow + + + ERSPANV6 + EverflowV6 + EverflowV6 + + + PortChannel102;PortChannel104;PortChannel106;PortChannel108;PortChannel1010;PortChannel1012;PortChannel1016;PortChannel1020;Ethernet13/1;Ethernet16/1;Ethernet19/1;Ethernet20/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 + DataAcl + DataPlane + + + + + + + + + + HostIP + Loopback0 + + 10.1.0.1/32 + + 10.1.0.1/32 + + + HostIP1 + Loopback0 + + FC00:10::1/128 + + FC00:10::1/128 + + + HostIP1 + Loopback4096 + + 192.0.0.9/32 + + 192.0.0.9/32 + + + HostIP1 + Loopback4096 + + 2603:10e2:400::9/128 + + 2603:10e2:400::9/128 + + + + + HostIP + eth0 + + 10.3.146.83/23 + + 10.3.146.83/23 + + + V6HostIP + eth0 + + FC00:2::32/64 + + FC00:2::32/64 + + + + + + Ethernet-IB1 + port + 3.3.3.9/32 + + + Ethernet-IB1 + port + 3333::3:9/128 + + + + + + ASIC1 + + + + + + + Eth0 + 10.0.0.36/31 + + + + Eth0 + FC00::49/126 + + + + Eth8 + 10.0.0.38/31 + + + + Eth8 + FC00::4D/126 + + + + Eth16 + 10.0.0.40/31 + + + + Eth16 + FC00::51/126 + + + + Eth24 + 10.0.0.42/31 + + + + Eth24 + FC00::55/126 + + + + Eth32 + 10.0.0.44/31 + + + + Eth32 + FC00::59/126 + + + + Eth40 + 10.0.0.46/31 + + + + Eth40 + FC00::5D/126 + + + + Eth48 + 10.0.0.48/31 + + + + Eth48 + FC00::61/126 + + + + Eth56 + 10.0.0.50/31 + + + + Eth56 + FC00::65/126 + + + + Eth64 + 10.0.0.52/31 + + + + Eth64 + FC00::69/126 + + + + Eth72 + 10.0.0.54/31 + + + + Eth72 + FC00::6D/126 + + + + Eth80 + 10.0.0.56/31 + + + + Eth80 + FC00::71/126 + + + + Eth88 + 10.0.0.58/31 + + + + Eth88 + FC00::75/126 + + + + Eth96 + 10.0.0.60/31 + + + + Eth96 + FC00::79/126 + + + + Eth104 + 10.0.0.62/31 + + + + Eth104 + FC00::7D/126 + + + + + + SNMP_ACL + SNMP + SNMP + + + ERSPAN + Everflow + Everflow + + + ERSPANV6 + EverflowV6 + EverflowV6 + + + VTY_LINE + ssh-only + SSH + + + Eth0;Eth8;Eth16;Eth24;Eth32;Eth40;Eth48;Eth56;Eth64;Eth72;Eth80;Eth88;Eth96;Eth104 + DataAcl + DataPlane + + + + + + + + + + HostIP + Loopback0 + + 10.1.0.1/32 + + 10.1.0.1/32 + + + HostIP1 + Loopback0 + + FC00:10::1/128 + + FC00:10::1/128 + + + HostIP1 + Loopback4096 + + 192.0.0.8/32 + + 192.0.0.8/32 + + + HostIP1 + Loopback4096 + + 2603:10e2:400::8/128 + + 2603:10e2:400::8/128 + + + + + HostIP + eth0 + + 10.3.146.83/23 + + 10.3.146.83/23 + + + V6HostIP + eth0 + + FC00:2::32/64 + + FC00:2::32/64 + + + + + + Ethernet-IB0 + port + 3.3.3.8/32 + + + Ethernet-IB0 + port + 3333::3:8/128 + + + + + + ASIC0 + + + PortChannel102 + Eth0;Eth8 + + + + PortChannel104 + Eth16;Eth24 + + + + PortChannel106 + Eth32;Eth40 + + + + PortChannel108 + Eth48;Eth56 + + + + PortChannel1010 + Eth64;Eth72 + + + + PortChannel1012 + Eth80;Eth88 + + + + PortChannel1016 + Eth104;Eth112 + + + + PortChannel1020 + Eth128;Eth136 + + + + + + + + PortChannel102 + 10.0.0.0/31 + + + + PortChannel102 + FC00::1/126 + + + + PortChannel104 + 10.0.0.4/31 + + + + PortChannel104 + FC00::9/126 + + + + PortChannel106 + 10.0.0.8/31 + + + + PortChannel106 + FC00::11/126 + + + + PortChannel108 + 10.0.0.12/31 + + + + PortChannel108 + FC00::19/126 + + + + PortChannel1010 + 10.0.0.16/31 + + + + PortChannel1010 + FC00::21/126 + + + + PortChannel1012 + 10.0.0.20/31 + + + + PortChannel1012 + FC00::29/126 + + + + Eth96 + 10.0.0.32/31 + + + + Eth96 + FC00::41/126 + + + + PortChannel1016 + 10.0.0.28/31 + + + + PortChannel1016 + FC00::39/126 + + + + Eth120 + 10.0.0.34/31 + + + + Eth120 + FC00::45/126 + + + + PortChannel1020 + 10.0.0.24/31 + + + + PortChannel1020 + FC00::31/126 + + + + + + SNMP_ACL + SNMP + SNMP + + + ERSPAN + Everflow + Everflow + + + ERSPANV6 + EverflowV6 + EverflowV6 + + + VTY_LINE + ssh-only + SSH + + + PortChannel102;PortChannel104;PortChannel106;PortChannel108;PortChannel1010;PortChannel1012;PortChannel1016;PortChannel1020;Eth0;Eth16;Eth32;Eth48;Eth64;Eth80;Eth96;Eth104;Eth120;Eth128 + DataAcl + DataPlane + + + + + + + + + + DeviceInterfaceLink + ARISTA01T3 + Ethernet1 + str3-7800-lc8-1 + Ethernet1/1 + 400000 + + + DeviceInterfaceLink + ARISTA01T3 + Ethernet2 + str3-7800-lc8-1 + Ethernet2/1 + 400000 + + + DeviceInterfaceLink + ARISTA03T3 + Ethernet1 + str3-7800-lc8-1 + Ethernet3/1 + 400000 + + + DeviceInterfaceLink + ARISTA03T3 + Ethernet2 + str3-7800-lc8-1 + Ethernet4/1 + 400000 + + + DeviceInterfaceLink + ARISTA05T3 + Ethernet1 + str3-7800-lc8-1 + Ethernet5/1 + 400000 + + + DeviceInterfaceLink + ARISTA05T3 + Ethernet2 + str3-7800-lc8-1 + Ethernet6/1 + 400000 + + + DeviceInterfaceLink + ARISTA07T3 + Ethernet1 + str3-7800-lc8-1 + Ethernet7/1 + 400000 + + + DeviceInterfaceLink + ARISTA07T3 + Ethernet2 + str3-7800-lc8-1 + Ethernet8/1 + 400000 + + + DeviceInterfaceLink + ARISTA09T3 + Ethernet1 + str3-7800-lc8-1 + Ethernet9/1 + 400000 + + + DeviceInterfaceLink + ARISTA09T3 + Ethernet2 + str3-7800-lc8-1 + Ethernet10/1 + 400000 + + + DeviceInterfaceLink + ARISTA11T3 + Ethernet1 + str3-7800-lc8-1 + Ethernet11/1 + 400000 + + + DeviceInterfaceLink + ARISTA11T3 + Ethernet2 + str3-7800-lc8-1 + Ethernet12/1 + 400000 + + + DeviceInterfaceLink + ARISTA13T3 + Ethernet1 + str3-7800-lc8-1 + Ethernet13/1 + 400000 + + + DeviceInterfaceLink + ARISTA15T3 + Ethernet1 + str3-7800-lc8-1 + Ethernet14/1 + 400000 + + + DeviceInterfaceLink + ARISTA15T3 + Ethernet2 + str3-7800-lc8-1 + Ethernet15/1 + 400000 + + + DeviceInterfaceLink + ARISTA17T3 + Ethernet1 + str3-7800-lc8-1 + Ethernet16/1 + 400000 + + + DeviceInterfaceLink + ARISTA18T3 + Ethernet1 + str3-7800-lc8-1 + Ethernet17/1 + + + DeviceInterfaceLink + ARISTA18T3 + Ethernet2 + str3-7800-lc8-1 + Ethernet18/1 + + + DeviceInterfaceLink + ARISTA19T3 + Ethernet1 + str3-7800-lc8-1 + Ethernet19/1 + 400000 + + + DeviceInterfaceLink + ARISTA20T3 + Ethernet1 + str3-7800-lc8-1 + Ethernet20/1 + 400000 + + + DeviceInterfaceLink + ARISTA21T3 + Ethernet1 + str3-7800-lc8-1 + Ethernet21/1 + 400000 + + + DeviceInterfaceLink + ARISTA22T3 + Ethernet1 + str3-7800-lc8-1 + Ethernet22/1 + 400000 + + + DeviceInterfaceLink + ARISTA23T3 + Ethernet1 + str3-7800-lc8-1 + Ethernet23/1 + 400000 + + + DeviceInterfaceLink + ARISTA24T3 + Ethernet1 + str3-7800-lc8-1 + Ethernet24/1 + 400000 + + + DeviceInterfaceLink + ARISTA25T3 + Ethernet1 + str3-7800-lc8-1 + Ethernet25/1 + 400000 + + + DeviceInterfaceLink + ARISTA26T3 + Ethernet1 + str3-7800-lc8-1 + Ethernet26/1 + 400000 + + + DeviceInterfaceLink + ARISTA27T3 + Ethernet1 + str3-7800-lc8-1 + Ethernet27/1 + 400000 + + + DeviceInterfaceLink + ARISTA28T3 + Ethernet1 + str3-7800-lc8-1 + Ethernet28/1 + 400000 + + + DeviceInterfaceLink + ARISTA29T3 + Ethernet1 + str3-7800-lc8-1 + Ethernet29/1 + 400000 + + + DeviceInterfaceLink + ARISTA30T3 + Ethernet1 + str3-7800-lc8-1 + Ethernet30/1 + 400000 + + + DeviceInterfaceLink + ARISTA31T3 + Ethernet1 + str3-7800-lc8-1 + Ethernet31/1 + 400000 + + + DeviceInterfaceLink + ARISTA32T3 + Ethernet1 + str3-7800-lc8-1 + Ethernet32/1 + 400000 + + + DeviceInterfaceLink + 400000 + true + ASIC0 + Eth0 + true + str3-7800-lc8-1 + Ethernet1/1 + true + + + DeviceInterfaceLink + 400000 + true + ASIC0 + Eth8 + true + str3-7800-lc8-1 + Ethernet2/1 + true + + + DeviceInterfaceLink + 400000 + true + ASIC0 + Eth16 + true + str3-7800-lc8-1 + Ethernet3/1 + true + + + DeviceInterfaceLink + 400000 + true + ASIC0 + Eth24 + true + str3-7800-lc8-1 + Ethernet4/1 + true + + + DeviceInterfaceLink + 400000 + true + ASIC0 + Eth32 + true + str3-7800-lc8-1 + Ethernet5/1 + true + + + DeviceInterfaceLink + 400000 + true + ASIC0 + Eth40 + true + str3-7800-lc8-1 + Ethernet6/1 + true + + + DeviceInterfaceLink + 400000 + true + ASIC0 + Eth48 + true + str3-7800-lc8-1 + Ethernet7/1 + true + + + DeviceInterfaceLink + 400000 + true + ASIC0 + Eth56 + true + str3-7800-lc8-1 + Ethernet8/1 + true + + + DeviceInterfaceLink + 400000 + true + ASIC0 + Eth64 + true + str3-7800-lc8-1 + Ethernet9/1 + true + + + DeviceInterfaceLink + 400000 + true + ASIC0 + Eth72 + true + str3-7800-lc8-1 + Ethernet10/1 + true + + + DeviceInterfaceLink + 400000 + true + ASIC0 + Eth80 + true + str3-7800-lc8-1 + Ethernet11/1 + true + + + DeviceInterfaceLink + 400000 + true + ASIC0 + Eth88 + true + str3-7800-lc8-1 + Ethernet12/1 + true + + + DeviceInterfaceLink + 400000 + true + ASIC0 + Eth96 + true + str3-7800-lc8-1 + Ethernet13/1 + true + + + DeviceInterfaceLink + 400000 + true + ASIC0 + Eth104 + true + str3-7800-lc8-1 + Ethernet14/1 + true + + + DeviceInterfaceLink + 400000 + true + ASIC0 + Eth112 + true + str3-7800-lc8-1 + Ethernet15/1 + true + + + DeviceInterfaceLink + 400000 + true + ASIC0 + Eth120 + true + str3-7800-lc8-1 + Ethernet16/1 + true + + + DeviceInterfaceLink + 400000 + true + ASIC0 + Eth128 + true + str3-7800-lc8-1 + Ethernet17/1 + true + + + DeviceInterfaceLink + 400000 + true + ASIC0 + Eth136 + true + str3-7800-lc8-1 + Ethernet18/1 + true + + + DeviceInterfaceLink + 400000 + true + ASIC1 + Eth0 + true + str3-7800-lc8-1 + Ethernet19/1 + true + + + DeviceInterfaceLink + 400000 + true + ASIC1 + Eth8 + true + str3-7800-lc8-1 + Ethernet20/1 + true + + + DeviceInterfaceLink + 400000 + true + ASIC1 + Eth16 + true + str3-7800-lc8-1 + Ethernet21/1 + true + + + DeviceInterfaceLink + 400000 + true + ASIC1 + Eth24 + true + str3-7800-lc8-1 + Ethernet22/1 + true + + + DeviceInterfaceLink + 400000 + true + ASIC1 + Eth32 + true + str3-7800-lc8-1 + Ethernet23/1 + true + + + DeviceInterfaceLink + 400000 + true + ASIC1 + Eth40 + true + str3-7800-lc8-1 + Ethernet24/1 + true + + + DeviceInterfaceLink + 400000 + true + ASIC1 + Eth48 + true + str3-7800-lc8-1 + Ethernet25/1 + true + + + DeviceInterfaceLink + 400000 + true + ASIC1 + Eth56 + true + str3-7800-lc8-1 + Ethernet26/1 + true + + + DeviceInterfaceLink + 400000 + true + ASIC1 + Eth64 + true + str3-7800-lc8-1 + Ethernet27/1 + true + + + DeviceInterfaceLink + 400000 + true + ASIC1 + Eth72 + true + str3-7800-lc8-1 + Ethernet28/1 + true + + + DeviceInterfaceLink + 400000 + true + ASIC1 + Eth80 + true + str3-7800-lc8-1 + Ethernet29/1 + true + + + DeviceInterfaceLink + 400000 + true + ASIC1 + Eth88 + true + str3-7800-lc8-1 + Ethernet30/1 + true + + + DeviceInterfaceLink + 400000 + true + ASIC1 + Eth96 + true + str3-7800-lc8-1 + Ethernet31/1 + true + + + DeviceInterfaceLink + 400000 + true + ASIC1 + Eth104 + true + str3-7800-lc8-1 + Ethernet32/1 + true + + + DeviceInterfaceLink + 400000 + true + ASIC1 + Eth112 + true + str3-7800-lc8-1 + Ethernet33/1 + true + + + DeviceInterfaceLink + 400000 + true + ASIC1 + Eth120 + true + str3-7800-lc8-1 + Ethernet34/1 + true + + + DeviceInterfaceLink + 400000 + true + ASIC1 + Eth128 + true + str3-7800-lc8-1 + Ethernet35/1 + true + + + DeviceInterfaceLink + 400000 + true + ASIC1 + Eth136 + true + str3-7800-lc8-1 + Ethernet36/1 + true + + + + + str3-7800-lc8-1 + Arista-7800R3A-36DM2-D36 + + 10.3.146.83 + + + + ARISTA05T3 + + 172.16.191.12 + + Arista-VM + + + ARISTA11T3 + + 172.16.191.15 + + Arista-VM + + + ARISTA17T3 + + 172.16.191.18 + + Arista-VM + + + ARISTA21T3 + + 172.16.191.22 + + Arista-VM + + + ARISTA19T3 + + 172.16.191.20 + + Arista-VM + + + ARISTA09T3 + + 172.16.191.14 + + Arista-VM + + + ARISTA20T3 + + 172.16.191.21 + + Arista-VM + + + ARISTA03T3 + + 172.16.191.11 + + Arista-VM + + + ARISTA07T3 + + 172.16.191.13 + + Arista-VM + + + ARISTA01T3 + + 172.16.191.10 + + Arista-VM + + + ARISTA27T3 + + 172.16.191.28 + + Arista-VM + + + ARISTA26T3 + + 172.16.191.27 + + Arista-VM + + + ARISTA32T3 + + 172.16.191.33 + + Arista-VM + + + ARISTA23T3 + + 172.16.191.24 + + Arista-VM + + + ARISTA25T3 + + 172.16.191.26 + + Arista-VM + + + ARISTA24T3 + + 172.16.191.25 + + Arista-VM + + + ARISTA22T3 + + 172.16.191.23 + + Arista-VM + + + ARISTA28T3 + + 172.16.191.29 + + Arista-VM + + + ARISTA30T3 + + 172.16.191.31 + + Arista-VM + + + ARISTA18T3 + + 172.16.191.19 + + Arista-VM + + + ARISTA29T3 + + 172.16.191.30 + + Arista-VM + + + ARISTA15T3 + + 172.16.191.17 + + Arista-VM + + + ARISTA13T3 + + 172.16.191.16 + + Arista-VM + + + ARISTA31T3 + + 172.16.191.32 + + Arista-VM + + + Asic +
+ 0.0.0.0/0 +
+ + ::/0 + + + + + + + + + + 0.0.0.0/0 + + + ::/0 + + + ASIC0 + Broadcom-Trident2 + + + Asic +
+ 0.0.0.0/0 +
+ + ::/0 + + + + + + + + + + 0.0.0.0/0 + + + ::/0 + + + ASIC1 + Broadcom-Trident2 + + + + + + true + + + DeviceInterface + + true + true + 1 + Ethernet1/1 + + false + 0 + 0 + 400000 + + + DeviceInterface + + true + true + 1 + Ethernet2/1 + + false + 0 + 0 + 400000 + + + DeviceInterface + + true + true + 1 + Ethernet3/1 + + false + 0 + 0 + 400000 + + + DeviceInterface + + true + true + 1 + Ethernet4/1 + + false + 0 + 0 + 400000 + + + DeviceInterface + + true + true + 1 + Ethernet5/1 + + false + 0 + 0 + 400000 + + + DeviceInterface + + true + true + 1 + Ethernet6/1 + + false + 0 + 0 + 400000 + + + DeviceInterface + + true + true + 1 + Ethernet7/1 + + false + 0 + 0 + 400000 + + + DeviceInterface + + true + true + 1 + Ethernet8/1 + + false + 0 + 0 + 400000 + + + DeviceInterface + + true + true + 1 + Ethernet9/1 + + false + 0 + 0 + 400000 + + + DeviceInterface + + true + true + 1 + Ethernet10/1 + + false + 0 + 0 + 400000 + + + DeviceInterface + + true + true + 1 + Ethernet11/1 + + false + 0 + 0 + 400000 + + + DeviceInterface + + true + true + 1 + Ethernet12/1 + + false + 0 + 0 + 400000 + + + DeviceInterface + + true + true + 1 + Ethernet13/1 + + false + 0 + 0 + 400000 + + + DeviceInterface + + true + true + 1 + Ethernet14/1 + + false + 0 + 0 + 400000 + + + DeviceInterface + + true + true + 1 + Ethernet15/1 + + false + 0 + 0 + 400000 + + + DeviceInterface + + true + true + 1 + Ethernet16/1 + + false + 0 + 0 + 400000 + + + DeviceInterface + + true + true + 1 + Ethernet17/1 + + false + 0 + 0 + 400000 + + + DeviceInterface + + true + true + 1 + Ethernet18/1 + + false + 0 + 0 + 400000 + + + DeviceInterface + + true + true + 1 + Ethernet19/1 + + false + 0 + 0 + 400000 + + + DeviceInterface + + true + true + 1 + Ethernet20/1 + + false + 0 + 0 + 400000 + + + DeviceInterface + + true + true + 1 + Ethernet21/1 + + false + 0 + 0 + 400000 + + + DeviceInterface + + true + true + 1 + Ethernet22/1 + + false + 0 + 0 + 400000 + + + DeviceInterface + + true + true + 1 + Ethernet23/1 + + false + 0 + 0 + 400000 + + + DeviceInterface + + true + true + 1 + Ethernet24/1 + + false + 0 + 0 + 400000 + + + DeviceInterface + + true + true + 1 + Ethernet25/1 + + false + 0 + 0 + 400000 + + + DeviceInterface + + true + true + 1 + Ethernet26/1 + + false + 0 + 0 + 400000 + + + DeviceInterface + + true + true + 1 + Ethernet27/1 + + false + 0 + 0 + 400000 + + + DeviceInterface + + true + true + 1 + Ethernet28/1 + + false + 0 + 0 + 400000 + + + DeviceInterface + + true + true + 1 + Ethernet29/1 + + false + 0 + 0 + 400000 + + + DeviceInterface + + true + true + 1 + Ethernet30/1 + + false + 0 + 0 + 400000 + + + DeviceInterface + + true + true + 1 + Ethernet31/1 + + false + 0 + 0 + 400000 + + + DeviceInterface + + true + true + 1 + Ethernet32/1 + + false + 0 + 0 + 400000 + + + DeviceInterface + + true + true + 1 + Ethernet33/1 + + false + 0 + 0 + 400000 + + + DeviceInterface + + true + true + 1 + Ethernet34/1 + + false + 0 + 0 + 400000 + + + DeviceInterface + + true + true + 1 + Ethernet35/1 + + false + 0 + 0 + 400000 + + + DeviceInterface + + true + true + 1 + Ethernet36/1 + + false + 0 + 0 + 400000 + + + DeviceInterface + + true + true + 1 + Recirc0/0 + + false + 0 + 0 + 400000 + + + DeviceInterface + + true + true + 1 + Recirc0/1 + + false + 0 + 0 + 400000 + + + DeviceInterface + + true + true + 1 + Recirc0/0 + + false + 0 + 0 + 400000 + + + DeviceInterface + + true + true + 1 + Recirc0/1 + + false + 0 + 0 + 400000 + + + + + Cpu0 + str3-7800-lc8-1 + asic0 + 10000 + 0 + 6 + 0 + 0 + 8 + + + Ethernet0 + str3-7800-lc8-1 + asic0 + 400000 + 1 + 6 + 1 + 1 + 8 + + + Ethernet8 + str3-7800-lc8-1 + asic0 + 400000 + 2 + 6 + 1 + 2 + 8 + + + Ethernet16 + str3-7800-lc8-1 + asic0 + 400000 + 3 + 6 + 1 + 3 + 8 + + + Ethernet24 + str3-7800-lc8-1 + asic0 + 400000 + 4 + 6 + 1 + 4 + 8 + + + Ethernet32 + str3-7800-lc8-1 + asic0 + 400000 + 5 + 6 + 1 + 5 + 8 + + + Ethernet40 + str3-7800-lc8-1 + asic0 + 400000 + 6 + 6 + 1 + 6 + 8 + + + Ethernet48 + str3-7800-lc8-1 + asic0 + 400000 + 7 + 6 + 1 + 7 + 8 + + + Ethernet56 + str3-7800-lc8-1 + asic0 + 400000 + 8 + 6 + 1 + 8 + 8 + + + Ethernet64 + str3-7800-lc8-1 + asic0 + 400000 + 9 + 6 + 1 + 9 + 8 + + + Ethernet72 + str3-7800-lc8-1 + asic0 + 400000 + 10 + 6 + 0 + 10 + 8 + + + Ethernet80 + str3-7800-lc8-1 + asic0 + 400000 + 11 + 6 + 0 + 11 + 8 + + + Ethernet88 + str3-7800-lc8-1 + asic0 + 400000 + 12 + 6 + 0 + 12 + 8 + + + Ethernet96 + str3-7800-lc8-1 + asic0 + 400000 + 13 + 6 + 0 + 13 + 8 + + + Ethernet104 + str3-7800-lc8-1 + asic0 + 400000 + 14 + 6 + 0 + 14 + 8 + + + Ethernet112 + str3-7800-lc8-1 + asic0 + 400000 + 15 + 6 + 0 + 15 + 8 + + + Ethernet120 + str3-7800-lc8-1 + asic0 + 400000 + 16 + 6 + 0 + 16 + 8 + + + Ethernet128 + str3-7800-lc8-1 + asic0 + 400000 + 17 + 6 + 0 + 17 + 8 + + + Ethernet136 + str3-7800-lc8-1 + asic0 + 400000 + 18 + 6 + 0 + 18 + 8 + + + Ethernet-Rec0 + str3-7800-lc8-1 + asic0 + 400000 + 19 + 6 + 0 + 49 + 8 + + + Ethernet-IB0 + str3-7800-lc8-1 + asic0 + 400000 + 20 + 6 + 1 + 50 + 8 + + + Cpu0 + str3-7800-lc8-1 + asic1 + 10000 + 21 + 8 + 0 + 0 + 8 + + + Ethernet144 + str3-7800-lc8-1 + asic1 + 400000 + 22 + 8 + 1 + 1 + 8 + + + Ethernet152 + str3-7800-lc8-1 + asic1 + 400000 + 23 + 8 + 1 + 2 + 8 + + + Ethernet160 + str3-7800-lc8-1 + asic1 + 400000 + 24 + 8 + 1 + 3 + 8 + + + Ethernet168 + str3-7800-lc8-1 + asic1 + 400000 + 25 + 8 + 1 + 4 + 8 + + + Ethernet176 + str3-7800-lc8-1 + asic1 + 400000 + 26 + 8 + 1 + 5 + 8 + + + Ethernet184 + str3-7800-lc8-1 + asic1 + 400000 + 27 + 8 + 1 + 6 + 8 + + + Ethernet192 + str3-7800-lc8-1 + asic1 + 400000 + 28 + 8 + 1 + 7 + 8 + + + Ethernet200 + str3-7800-lc8-1 + asic1 + 400000 + 29 + 8 + 1 + 8 + 8 + + + Ethernet208 + str3-7800-lc8-1 + asic1 + 400000 + 30 + 8 + 1 + 9 + 8 + + + Ethernet216 + str3-7800-lc8-1 + asic1 + 400000 + 31 + 8 + 0 + 10 + 8 + + + Ethernet224 + str3-7800-lc8-1 + asic1 + 400000 + 32 + 8 + 0 + 11 + 8 + + + Ethernet232 + str3-7800-lc8-1 + asic1 + 400000 + 33 + 8 + 0 + 12 + 8 + + + Ethernet240 + str3-7800-lc8-1 + asic1 + 400000 + 34 + 8 + 0 + 13 + 8 + + + Ethernet248 + str3-7800-lc8-1 + asic1 + 400000 + 35 + 8 + 0 + 14 + 8 + + + Ethernet256 + str3-7800-lc8-1 + asic1 + 400000 + 36 + 8 + 0 + 15 + 8 + + + Ethernet264 + str3-7800-lc8-1 + asic1 + 400000 + 37 + 8 + 0 + 16 + 8 + + + Ethernet272 + str3-7800-lc8-1 + asic1 + 400000 + 38 + 8 + 0 + 17 + 8 + + + Ethernet280 + str3-7800-lc8-1 + asic1 + 400000 + 39 + 8 + 0 + 18 + 8 + + + Ethernet-Rec1 + str3-7800-lc8-1 + asic1 + 400000 + 40 + 8 + 0 + 49 + 8 + + + Ethernet-IB1 + str3-7800-lc8-1 + asic1 + 400000 + 41 + 8 + 1 + 50 + 8 + + + Cpu0 + str3-7800-lc1-1 + Asic0 + 10000 + 42 + 0 + 0 + 0 + 8 + + + Ethernet0 + str3-7800-lc1-1 + Asic0 + 100000 + 43 + 0 + 0 + 1 + 8 + + + Ethernet4 + str3-7800-lc1-1 + Asic0 + 100000 + 44 + 0 + 0 + 2 + 8 + + + Ethernet8 + str3-7800-lc1-1 + Asic0 + 100000 + 45 + 0 + 0 + 3 + 8 + + + Ethernet12 + str3-7800-lc1-1 + Asic0 + 100000 + 46 + 0 + 0 + 4 + 8 + + + Ethernet16 + str3-7800-lc1-1 + Asic0 + 100000 + 47 + 0 + 0 + 5 + 8 + + + Ethernet20 + str3-7800-lc1-1 + Asic0 + 100000 + 48 + 0 + 0 + 6 + 8 + + + Ethernet24 + str3-7800-lc1-1 + Asic0 + 100000 + 49 + 0 + 0 + 7 + 8 + + + Ethernet28 + str3-7800-lc1-1 + Asic0 + 100000 + 50 + 0 + 0 + 8 + 8 + + + Ethernet32 + str3-7800-lc1-1 + Asic0 + 100000 + 51 + 0 + 0 + 9 + 8 + + + Ethernet36 + str3-7800-lc1-1 + Asic0 + 100000 + 52 + 0 + 0 + 10 + 8 + + + Ethernet40 + str3-7800-lc1-1 + Asic0 + 100000 + 53 + 0 + 0 + 11 + 8 + + + Ethernet44 + str3-7800-lc1-1 + Asic0 + 100000 + 54 + 0 + 0 + 12 + 8 + + + Ethernet48 + str3-7800-lc1-1 + Asic0 + 100000 + 55 + 0 + 0 + 13 + 8 + + + Ethernet52 + str3-7800-lc1-1 + Asic0 + 100000 + 56 + 0 + 0 + 14 + 8 + + + Ethernet56 + str3-7800-lc1-1 + Asic0 + 100000 + 57 + 0 + 0 + 15 + 8 + + + Ethernet60 + str3-7800-lc1-1 + Asic0 + 100000 + 58 + 0 + 0 + 16 + 8 + + + Ethernet64 + str3-7800-lc1-1 + Asic0 + 100000 + 59 + 0 + 0 + 17 + 8 + + + Ethernet68 + str3-7800-lc1-1 + Asic0 + 100000 + 60 + 0 + 0 + 18 + 8 + + + Ethernet72 + str3-7800-lc1-1 + Asic0 + 100000 + 61 + 0 + 0 + 19 + 8 + + + Ethernet76 + str3-7800-lc1-1 + Asic0 + 100000 + 62 + 0 + 0 + 20 + 8 + + + Ethernet80 + str3-7800-lc1-1 + Asic0 + 100000 + 63 + 0 + 0 + 21 + 8 + + + Ethernet84 + str3-7800-lc1-1 + Asic0 + 100000 + 64 + 0 + 0 + 22 + 8 + + + Ethernet88 + str3-7800-lc1-1 + Asic0 + 100000 + 65 + 0 + 0 + 23 + 8 + + + Ethernet92 + str3-7800-lc1-1 + Asic0 + 100000 + 66 + 0 + 0 + 24 + 8 + + + Ethernet96 + str3-7800-lc1-1 + Asic0 + 100000 + 67 + 0 + 1 + 25 + 8 + + + Ethernet100 + str3-7800-lc1-1 + Asic0 + 100000 + 68 + 0 + 1 + 26 + 8 + + + Ethernet104 + str3-7800-lc1-1 + Asic0 + 100000 + 69 + 0 + 1 + 27 + 8 + + + Ethernet108 + str3-7800-lc1-1 + Asic0 + 100000 + 70 + 0 + 1 + 28 + 8 + + + Ethernet112 + str3-7800-lc1-1 + Asic0 + 100000 + 71 + 0 + 1 + 29 + 8 + + + Ethernet116 + str3-7800-lc1-1 + Asic0 + 100000 + 72 + 0 + 1 + 30 + 8 + + + Ethernet120 + str3-7800-lc1-1 + Asic0 + 100000 + 73 + 0 + 1 + 31 + 8 + + + Ethernet124 + str3-7800-lc1-1 + Asic0 + 100000 + 74 + 0 + 1 + 32 + 8 + + + Ethernet128 + str3-7800-lc1-1 + Asic0 + 100000 + 75 + 0 + 1 + 33 + 8 + + + Ethernet132 + str3-7800-lc1-1 + Asic0 + 100000 + 76 + 0 + 1 + 34 + 8 + + + Ethernet136 + str3-7800-lc1-1 + Asic0 + 100000 + 77 + 0 + 1 + 35 + 8 + + + Ethernet140 + str3-7800-lc1-1 + Asic0 + 100000 + 78 + 0 + 1 + 36 + 8 + + + Ethernet144 + str3-7800-lc1-1 + Asic0 + 100000 + 79 + 0 + 1 + 37 + 8 + + + Ethernet148 + str3-7800-lc1-1 + Asic0 + 100000 + 80 + 0 + 1 + 38 + 8 + + + Ethernet152 + str3-7800-lc1-1 + Asic0 + 100000 + 81 + 0 + 1 + 39 + 8 + + + Ethernet156 + str3-7800-lc1-1 + Asic0 + 100000 + 82 + 0 + 1 + 40 + 8 + + + Ethernet160 + str3-7800-lc1-1 + Asic0 + 100000 + 83 + 0 + 1 + 41 + 8 + + + Ethernet164 + str3-7800-lc1-1 + Asic0 + 100000 + 84 + 0 + 1 + 42 + 8 + + + Ethernet168 + str3-7800-lc1-1 + Asic0 + 100000 + 85 + 0 + 1 + 43 + 8 + + + Ethernet172 + str3-7800-lc1-1 + Asic0 + 100000 + 86 + 0 + 1 + 44 + 8 + + + Ethernet176 + str3-7800-lc1-1 + Asic0 + 100000 + 87 + 0 + 1 + 45 + 8 + + + Ethernet180 + str3-7800-lc1-1 + Asic0 + 100000 + 88 + 0 + 1 + 46 + 8 + + + Ethernet184 + str3-7800-lc1-1 + Asic0 + 100000 + 89 + 0 + 1 + 47 + 8 + + + Ethernet188 + str3-7800-lc1-1 + Asic0 + 100000 + 90 + 0 + 1 + 48 + 8 + + + Ethernet-Rec0 + str3-7800-lc1-1 + Asic0 + 400000 + 91 + 0 + 0 + 49 + 8 + + + Ethernet-IB0 + str3-7800-lc1-1 + Asic0 + 400000 + 92 + 0 + 1 + 50 + 8 + + + Cpu0 + str3-7800-lc2-1 + Asic0 + 10000 + 93 + 2 + 0 + 0 + 8 + + + Ethernet0 + str3-7800-lc2-1 + Asic0 + 100000 + 94 + 2 + 0 + 1 + 8 + + + Ethernet4 + str3-7800-lc2-1 + Asic0 + 100000 + 95 + 2 + 0 + 2 + 8 + + + Ethernet8 + str3-7800-lc2-1 + Asic0 + 100000 + 96 + 2 + 0 + 3 + 8 + + + Ethernet12 + str3-7800-lc2-1 + Asic0 + 100000 + 97 + 2 + 0 + 4 + 8 + + + Ethernet16 + str3-7800-lc2-1 + Asic0 + 100000 + 98 + 2 + 0 + 5 + 8 + + + Ethernet20 + str3-7800-lc2-1 + Asic0 + 100000 + 99 + 2 + 0 + 6 + 8 + + + Ethernet24 + str3-7800-lc2-1 + Asic0 + 100000 + 100 + 2 + 0 + 7 + 8 + + + Ethernet28 + str3-7800-lc2-1 + Asic0 + 100000 + 101 + 2 + 0 + 8 + 8 + + + Ethernet32 + str3-7800-lc2-1 + Asic0 + 100000 + 102 + 2 + 0 + 9 + 8 + + + Ethernet36 + str3-7800-lc2-1 + Asic0 + 100000 + 103 + 2 + 0 + 10 + 8 + + + Ethernet40 + str3-7800-lc2-1 + Asic0 + 100000 + 104 + 2 + 0 + 11 + 8 + + + Ethernet44 + str3-7800-lc2-1 + Asic0 + 100000 + 105 + 2 + 0 + 12 + 8 + + + Ethernet48 + str3-7800-lc2-1 + Asic0 + 100000 + 106 + 2 + 0 + 13 + 8 + + + Ethernet52 + str3-7800-lc2-1 + Asic0 + 100000 + 107 + 2 + 0 + 14 + 8 + + + Ethernet56 + str3-7800-lc2-1 + Asic0 + 100000 + 108 + 2 + 0 + 15 + 8 + + + Ethernet60 + str3-7800-lc2-1 + Asic0 + 100000 + 109 + 2 + 0 + 16 + 8 + + + Ethernet64 + str3-7800-lc2-1 + Asic0 + 100000 + 110 + 2 + 0 + 17 + 8 + + + Ethernet68 + str3-7800-lc2-1 + Asic0 + 100000 + 111 + 2 + 0 + 18 + 8 + + + Ethernet72 + str3-7800-lc2-1 + Asic0 + 100000 + 112 + 2 + 0 + 19 + 8 + + + Ethernet76 + str3-7800-lc2-1 + Asic0 + 100000 + 113 + 2 + 0 + 20 + 8 + + + Ethernet80 + str3-7800-lc2-1 + Asic0 + 100000 + 114 + 2 + 0 + 21 + 8 + + + Ethernet84 + str3-7800-lc2-1 + Asic0 + 100000 + 115 + 2 + 0 + 22 + 8 + + + Ethernet88 + str3-7800-lc2-1 + Asic0 + 100000 + 116 + 2 + 0 + 23 + 8 + + + Ethernet92 + str3-7800-lc2-1 + Asic0 + 100000 + 117 + 2 + 0 + 24 + 8 + + + Ethernet96 + str3-7800-lc2-1 + Asic0 + 100000 + 118 + 2 + 1 + 25 + 8 + + + Ethernet100 + str3-7800-lc2-1 + Asic0 + 100000 + 119 + 2 + 1 + 26 + 8 + + + Ethernet104 + str3-7800-lc2-1 + Asic0 + 100000 + 120 + 2 + 1 + 27 + 8 + + + Ethernet108 + str3-7800-lc2-1 + Asic0 + 100000 + 121 + 2 + 1 + 28 + 8 + + + Ethernet112 + str3-7800-lc2-1 + Asic0 + 100000 + 122 + 2 + 1 + 29 + 8 + + + Ethernet116 + str3-7800-lc2-1 + Asic0 + 100000 + 123 + 2 + 1 + 30 + 8 + + + Ethernet120 + str3-7800-lc2-1 + Asic0 + 100000 + 124 + 2 + 1 + 31 + 8 + + + Ethernet124 + str3-7800-lc2-1 + Asic0 + 100000 + 125 + 2 + 1 + 32 + 8 + + + Ethernet128 + str3-7800-lc2-1 + Asic0 + 100000 + 126 + 2 + 1 + 33 + 8 + + + Ethernet132 + str3-7800-lc2-1 + Asic0 + 100000 + 127 + 2 + 1 + 34 + 8 + + + Ethernet136 + str3-7800-lc2-1 + Asic0 + 100000 + 128 + 2 + 1 + 35 + 8 + + + Ethernet140 + str3-7800-lc2-1 + Asic0 + 100000 + 129 + 2 + 1 + 36 + 8 + + + Ethernet144 + str3-7800-lc2-1 + Asic0 + 100000 + 130 + 2 + 1 + 37 + 8 + + + Ethernet148 + str3-7800-lc2-1 + Asic0 + 100000 + 131 + 2 + 1 + 38 + 8 + + + Ethernet152 + str3-7800-lc2-1 + Asic0 + 100000 + 132 + 2 + 1 + 39 + 8 + + + Ethernet156 + str3-7800-lc2-1 + Asic0 + 100000 + 133 + 2 + 1 + 40 + 8 + + + Ethernet160 + str3-7800-lc2-1 + Asic0 + 100000 + 134 + 2 + 1 + 41 + 8 + + + Ethernet164 + str3-7800-lc2-1 + Asic0 + 100000 + 135 + 2 + 1 + 42 + 8 + + + Ethernet168 + str3-7800-lc2-1 + Asic0 + 100000 + 136 + 2 + 1 + 43 + 8 + + + Ethernet172 + str3-7800-lc2-1 + Asic0 + 100000 + 137 + 2 + 1 + 44 + 8 + + + Ethernet176 + str3-7800-lc2-1 + Asic0 + 100000 + 138 + 2 + 1 + 45 + 8 + + + Ethernet180 + str3-7800-lc2-1 + Asic0 + 100000 + 139 + 2 + 1 + 46 + 8 + + + Ethernet184 + str3-7800-lc2-1 + Asic0 + 100000 + 140 + 2 + 1 + 47 + 8 + + + Ethernet188 + str3-7800-lc2-1 + Asic0 + 100000 + 141 + 2 + 1 + 48 + 8 + + + Ethernet-Rec0 + str3-7800-lc2-1 + Asic0 + 400000 + 142 + 2 + 0 + 49 + 8 + + + Ethernet-IB0 + str3-7800-lc2-1 + Asic0 + 400000 + 143 + 2 + 1 + 50 + 8 + + + true + 0 + Arista-7800R3A-36DM2-D36 + + + + + + + str3-7800-lc8-1 + + + DeploymentId + + 1 + + + QosProfile + + Profile0 + + + DhcpResources + + 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 + + + NtpResources + + 10.20.8.129;10.20.8.130 + + + SnmpResources + + 10.3.145.98 + + + SyslogResources + + 10.64.246.95 + + + TacacsGroup + + Starlab + + + TacacsServer + + 10.3.145.14;10.3.145.15 + + + ForcedMgmtRoutes + + 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.64.246.0/23;10.3.146.0/23;10.64.5.5;10.201.148.32/28 + + + ErspanDestinationIpv4 + + 10.20.6.16 + + + SwitchType + + voq + + + MaxCores + + 16 + + + + + ASIC0 + + + SubRole + + FrontEnd + + + SwitchType + + voq + + + SwitchId + + 6 + + + MaxCores + + 16 + + + + + ASIC1 + + + SubRole + + FrontEnd + + + SwitchType + + voq + + + SwitchId + + 8 + + + MaxCores + + 16 + + + + + ASIC1 + + + DeploymentId + + 1 + + + SubRole + + FrontEnd + + + SwitchType + + voq + + + + + ASIC0 + + + DeploymentId + + 1 + + + SubRole + + FrontEnd + + + SwitchType + + voq + + + + + + + str3-7800-lc8-1 + Arista-7800R3A-36DM2-D36 + diff --git a/src/sonic-config-engine/tests/sample-nokia-ixr7250e-36x100g-t2-minigraph.xml b/src/sonic-config-engine/tests/sample-nokia-ixr7250e-36x100g-t2-minigraph.xml new file mode 100644 index 000000000000..7bb8229839ba --- /dev/null +++ b/src/sonic-config-engine/tests/sample-nokia-ixr7250e-36x100g-t2-minigraph.xml @@ -0,0 +1,5457 @@ + + + + + + false + svcstr-7250-lc1-1 + 10.0.0.0 + ARISTA01T3 + 10.0.0.1 + 1 + 10 + 3 + + + false + ASIC0 + 10.0.0.0 + ARISTA01T3 + 10.0.0.1 + 1 + 10 + 3 + + + svcstr-7250-lc1-1 + FC00::1 + ARISTA01T3 + FC00::2 + 1 + 10 + 3 + + + ASIC0 + FC00::1 + ARISTA01T3 + FC00::2 + 1 + 10 + 3 + + + false + svcstr-7250-lc1-1 + 10.0.0.4 + ARISTA03T3 + 10.0.0.5 + 1 + 10 + 3 + + + false + ASIC0 + 10.0.0.4 + ARISTA03T3 + 10.0.0.5 + 1 + 10 + 3 + + + svcstr-7250-lc1-1 + FC00::9 + ARISTA03T3 + FC00::A + 1 + 10 + 3 + + + ASIC0 + FC00::9 + ARISTA03T3 + FC00::A + 1 + 10 + 3 + + + false + svcstr-7250-lc1-1 + 10.0.0.8 + ARISTA05T3 + 10.0.0.9 + 1 + 10 + 3 + + + false + ASIC0 + 10.0.0.8 + ARISTA05T3 + 10.0.0.9 + 1 + 10 + 3 + + + svcstr-7250-lc1-1 + FC00::11 + ARISTA05T3 + FC00::12 + 1 + 10 + 3 + + + ASIC0 + FC00::11 + ARISTA05T3 + FC00::12 + 1 + 10 + 3 + + + false + svcstr-7250-lc1-1 + 10.0.0.12 + ARISTA07T3 + 10.0.0.13 + 1 + 10 + 3 + + + false + ASIC0 + 10.0.0.12 + ARISTA07T3 + 10.0.0.13 + 1 + 10 + 3 + + + svcstr-7250-lc1-1 + FC00::19 + ARISTA07T3 + FC00::1A + 1 + 10 + 3 + + + ASIC0 + FC00::19 + ARISTA07T3 + FC00::1A + 1 + 10 + 3 + + + false + svcstr-7250-lc1-1 + 10.0.0.16 + ARISTA09T3 + 10.0.0.17 + 1 + 10 + 3 + + + false + ASIC0 + 10.0.0.16 + ARISTA09T3 + 10.0.0.17 + 1 + 10 + 3 + + + svcstr-7250-lc1-1 + FC00::21 + ARISTA09T3 + FC00::22 + 1 + 10 + 3 + + + ASIC0 + FC00::21 + ARISTA09T3 + FC00::22 + 1 + 10 + 3 + + + false + svcstr-7250-lc1-1 + 10.0.0.20 + ARISTA11T3 + 10.0.0.21 + 1 + 10 + 3 + + + false + ASIC0 + 10.0.0.20 + ARISTA11T3 + 10.0.0.21 + 1 + 10 + 3 + + + svcstr-7250-lc1-1 + FC00::29 + ARISTA11T3 + FC00::2A + 1 + 10 + 3 + + + ASIC0 + FC00::29 + ARISTA11T3 + FC00::2A + 1 + 10 + 3 + + + false + svcstr-7250-lc1-1 + 10.0.0.32 + ARISTA13T3 + 10.0.0.33 + 1 + 10 + 3 + + + false + ASIC0 + 10.0.0.32 + ARISTA13T3 + 10.0.0.33 + 1 + 10 + 3 + + + svcstr-7250-lc1-1 + FC00::41 + ARISTA13T3 + FC00::42 + 1 + 10 + 3 + + + ASIC0 + FC00::41 + ARISTA13T3 + FC00::42 + 1 + 10 + 3 + + + false + svcstr-7250-lc1-1 + 10.0.0.28 + ARISTA15T3 + 10.0.0.29 + 1 + 10 + 3 + + + false + ASIC0 + 10.0.0.28 + ARISTA15T3 + 10.0.0.29 + 1 + 10 + 3 + + + svcstr-7250-lc1-1 + FC00::39 + ARISTA15T3 + FC00::3A + 1 + 10 + 3 + + + ASIC0 + FC00::39 + ARISTA15T3 + FC00::3A + 1 + 10 + 3 + + + false + svcstr-7250-lc1-1 + 10.0.0.34 + ARISTA17T3 + 10.0.0.35 + 1 + 10 + 3 + + + false + ASIC0 + 10.0.0.34 + ARISTA17T3 + 10.0.0.35 + 1 + 10 + 3 + + + svcstr-7250-lc1-1 + FC00::45 + ARISTA17T3 + FC00::46 + 1 + 10 + 3 + + + ASIC0 + FC00::45 + ARISTA17T3 + FC00::46 + 1 + 10 + 3 + + + false + svcstr-7250-lc1-1 + 10.0.0.24 + ARISTA18T3 + 10.0.0.25 + 1 + 10 + 3 + + + false + ASIC0 + 10.0.0.24 + ARISTA18T3 + 10.0.0.25 + 1 + 10 + 3 + + + svcstr-7250-lc1-1 + FC00::31 + ARISTA18T3 + FC00::32 + 1 + 10 + 3 + + + ASIC0 + FC00::31 + ARISTA18T3 + FC00::32 + 1 + 10 + 3 + + + false + svcstr-7250-lc1-1 + 10.0.0.36 + ARISTA19T3 + 10.0.0.37 + 1 + 10 + 3 + + + false + ASIC1 + 10.0.0.36 + ARISTA19T3 + 10.0.0.37 + 1 + 10 + 3 + + + svcstr-7250-lc1-1 + FC00::49 + ARISTA19T3 + FC00::4A + 1 + 10 + 3 + + + ASIC1 + FC00::49 + ARISTA19T3 + FC00::4A + 1 + 10 + 3 + + + false + svcstr-7250-lc1-1 + 10.0.0.38 + ARISTA20T3 + 10.0.0.39 + 1 + 10 + 3 + + + false + ASIC1 + 10.0.0.38 + ARISTA20T3 + 10.0.0.39 + 1 + 10 + 3 + + + svcstr-7250-lc1-1 + FC00::4D + ARISTA20T3 + FC00::4E + 1 + 10 + 3 + + + ASIC1 + FC00::4D + ARISTA20T3 + FC00::4E + 1 + 10 + 3 + + + false + svcstr-7250-lc1-1 + 10.0.0.40 + ARISTA21T3 + 10.0.0.41 + 1 + 10 + 3 + + + false + ASIC1 + 10.0.0.40 + ARISTA21T3 + 10.0.0.41 + 1 + 10 + 3 + + + svcstr-7250-lc1-1 + FC00::51 + ARISTA21T3 + FC00::52 + 1 + 10 + 3 + + + ASIC1 + FC00::51 + ARISTA21T3 + FC00::52 + 1 + 10 + 3 + + + false + svcstr-7250-lc1-1 + 10.0.0.42 + ARISTA22T3 + 10.0.0.43 + 1 + 10 + 3 + + + false + ASIC1 + 10.0.0.42 + ARISTA22T3 + 10.0.0.43 + 1 + 10 + 3 + + + svcstr-7250-lc1-1 + FC00::55 + ARISTA22T3 + FC00::56 + 1 + 10 + 3 + + + ASIC1 + FC00::55 + ARISTA22T3 + FC00::56 + 1 + 10 + 3 + + + false + svcstr-7250-lc1-1 + 10.0.0.44 + ARISTA23T3 + 10.0.0.45 + 1 + 10 + 3 + + + false + ASIC1 + 10.0.0.44 + ARISTA23T3 + 10.0.0.45 + 1 + 10 + 3 + + + svcstr-7250-lc1-1 + FC00::59 + ARISTA23T3 + FC00::5A + 1 + 10 + 3 + + + ASIC1 + FC00::59 + ARISTA23T3 + FC00::5A + 1 + 10 + 3 + + + false + svcstr-7250-lc1-1 + 10.0.0.46 + ARISTA24T3 + 10.0.0.47 + 1 + 10 + 3 + + + false + ASIC1 + 10.0.0.46 + ARISTA24T3 + 10.0.0.47 + 1 + 10 + 3 + + + svcstr-7250-lc1-1 + FC00::5D + ARISTA24T3 + FC00::5E + 1 + 10 + 3 + + + ASIC1 + FC00::5D + ARISTA24T3 + FC00::5E + 1 + 10 + 3 + + + false + svcstr-7250-lc1-1 + 10.0.0.48 + ARISTA25T3 + 10.0.0.49 + 1 + 10 + 3 + + + false + ASIC1 + 10.0.0.48 + ARISTA25T3 + 10.0.0.49 + 1 + 10 + 3 + + + svcstr-7250-lc1-1 + FC00::61 + ARISTA25T3 + FC00::62 + 1 + 10 + 3 + + + ASIC1 + FC00::61 + ARISTA25T3 + FC00::62 + 1 + 10 + 3 + + + false + svcstr-7250-lc1-1 + 10.0.0.50 + ARISTA26T3 + 10.0.0.51 + 1 + 10 + 3 + + + false + ASIC1 + 10.0.0.50 + ARISTA26T3 + 10.0.0.51 + 1 + 10 + 3 + + + svcstr-7250-lc1-1 + FC00::65 + ARISTA26T3 + FC00::66 + 1 + 10 + 3 + + + ASIC1 + FC00::65 + ARISTA26T3 + FC00::66 + 1 + 10 + 3 + + + false + svcstr-7250-lc1-1 + 10.0.0.52 + ARISTA27T3 + 10.0.0.53 + 1 + 10 + 3 + + + false + ASIC1 + 10.0.0.52 + ARISTA27T3 + 10.0.0.53 + 1 + 10 + 3 + + + svcstr-7250-lc1-1 + FC00::69 + ARISTA27T3 + FC00::6A + 1 + 10 + 3 + + + ASIC1 + FC00::69 + ARISTA27T3 + FC00::6A + 1 + 10 + 3 + + + false + svcstr-7250-lc1-1 + 10.0.0.54 + ARISTA28T3 + 10.0.0.55 + 1 + 10 + 3 + + + false + ASIC1 + 10.0.0.54 + ARISTA28T3 + 10.0.0.55 + 1 + 10 + 3 + + + svcstr-7250-lc1-1 + FC00::6D + ARISTA28T3 + FC00::6E + 1 + 10 + 3 + + + ASIC1 + FC00::6D + ARISTA28T3 + FC00::6E + 1 + 10 + 3 + + + false + svcstr-7250-lc1-1 + 10.0.0.56 + ARISTA29T3 + 10.0.0.57 + 1 + 10 + 3 + + + false + ASIC1 + 10.0.0.56 + ARISTA29T3 + 10.0.0.57 + 1 + 10 + 3 + + + svcstr-7250-lc1-1 + FC00::71 + ARISTA29T3 + FC00::72 + 1 + 10 + 3 + + + ASIC1 + FC00::71 + ARISTA29T3 + FC00::72 + 1 + 10 + 3 + + + false + svcstr-7250-lc1-1 + 10.0.0.58 + ARISTA30T3 + 10.0.0.59 + 1 + 10 + 3 + + + false + ASIC1 + 10.0.0.58 + ARISTA30T3 + 10.0.0.59 + 1 + 10 + 3 + + + svcstr-7250-lc1-1 + FC00::75 + ARISTA30T3 + FC00::76 + 1 + 10 + 3 + + + ASIC1 + FC00::75 + ARISTA30T3 + FC00::76 + 1 + 10 + 3 + + + false + svcstr-7250-lc1-1 + 10.0.0.60 + ARISTA31T3 + 10.0.0.61 + 1 + 10 + 3 + + + false + ASIC1 + 10.0.0.60 + ARISTA31T3 + 10.0.0.61 + 1 + 10 + 3 + + + svcstr-7250-lc1-1 + FC00::79 + ARISTA31T3 + FC00::7A + 1 + 10 + 3 + + + ASIC1 + FC00::79 + ARISTA31T3 + FC00::7A + 1 + 10 + 3 + + + false + svcstr-7250-lc1-1 + 10.0.0.62 + ARISTA32T3 + 10.0.0.63 + 1 + 10 + 3 + + + false + ASIC1 + 10.0.0.62 + ARISTA32T3 + 10.0.0.63 + 1 + 10 + 3 + + + svcstr-7250-lc1-1 + FC00::7D + ARISTA32T3 + FC00::7E + 1 + 10 + 3 + + + ASIC1 + FC00::7D + ARISTA32T3 + FC00::7E + 1 + 10 + 3 + + + + + ASIC0 + ASIC1 + 3.3.3.1 + 3.3.3.2 + 1 + 0 + 0 + voq + + + ASIC0 + ASIC1 + 3333::3:1 + 3333::3:2 + 1 + 0 + 0 + voq + + + ASIC0 + svcstr-7250-lc2-1-ASIC0 + 3.3.3.1 + 3.3.3.6 + 1 + 0 + 0 + voq + + + ASIC0 + svcstr-7250-lc2-1-ASIC0 + 3333::3:1 + 3333::3:6 + 1 + 0 + 0 + voq + + + ASIC0 + svcstr-7250-lc2-1-ASIC1 + 3.3.3.1 + 3.3.3.8 + 1 + 0 + 0 + voq + + + ASIC0 + svcstr-7250-lc2-1-ASIC1 + 3333::3:1 + 3333::3:8 + 1 + 0 + 0 + voq + + + ASIC0 + svcstr-7250-lc3-1-ASIC0 + 3.3.3.1 + 3.3.3.10 + 1 + 0 + 0 + voq + + + ASIC0 + svcstr-7250-lc3-1-ASIC0 + 3333::3:1 + 3333::3:a + 1 + 0 + 0 + voq + + + ASIC0 + svcstr-7250-lc3-1-ASIC1 + 3.3.3.1 + 3.3.3.12 + 1 + 0 + 0 + voq + + + ASIC0 + svcstr-7250-lc3-1-ASIC1 + 3333::3:1 + 3333::3:c + 1 + 0 + 0 + voq + + + ASIC1 + ASIC0 + 3.3.3.2 + 3.3.3.1 + 1 + 0 + 0 + voq + + + ASIC1 + ASIC0 + 3333::3:2 + 3333::3:1 + 1 + 0 + 0 + voq + + + ASIC1 + svcstr-7250-lc2-1-ASIC0 + 3.3.3.2 + 3.3.3.6 + 1 + 0 + 0 + voq + + + ASIC1 + svcstr-7250-lc2-1-ASIC0 + 3333::3:2 + 3333::3:6 + 1 + 0 + 0 + voq + + + ASIC1 + svcstr-7250-lc2-1-ASIC1 + 3.3.3.2 + 3.3.3.8 + 1 + 0 + 0 + voq + + + ASIC1 + svcstr-7250-lc2-1-ASIC1 + 3333::3:2 + 3333::3:8 + 1 + 0 + 0 + voq + + + ASIC1 + svcstr-7250-lc3-1-ASIC0 + 3.3.3.2 + 3.3.3.10 + 1 + 0 + 0 + voq + + + ASIC1 + svcstr-7250-lc3-1-ASIC0 + 3333::3:2 + 3333::3:a + 1 + 0 + 0 + voq + + + ASIC1 + svcstr-7250-lc3-1-ASIC1 + 3.3.3.2 + 3.3.3.12 + 1 + 0 + 0 + voq + + + ASIC1 + svcstr-7250-lc3-1-ASIC1 + 3333::3:2 + 3333::3:c + 1 + 0 + 0 + voq + + + + + 65100 + svcstr-7250-lc1-1 + + +
10.0.0.1
+ + + + + +
10.0.0.5
+ + + + + +
10.0.0.9
+ + + + + +
10.0.0.13
+ + + + + +
10.0.0.17
+ + + + + +
10.0.0.21
+ + + + + +
10.0.0.33
+ + + + + +
10.0.0.29
+ + + + + +
10.0.0.35
+ + + + + +
10.0.0.25
+ + + + + +
10.0.0.37
+ + + + + +
10.0.0.39
+ + + + + +
10.0.0.41
+ + + + + +
10.0.0.43
+ + + + + +
10.0.0.45
+ + + + + +
10.0.0.47
+ + + + + +
10.0.0.49
+ + + + + +
10.0.0.51
+ + + + + +
10.0.0.53
+ + + + + +
10.0.0.55
+ + + + + +
10.0.0.57
+ + + + + +
10.0.0.59
+ + + + + +
10.0.0.61
+ + + + + +
10.0.0.63
+ + + + + + + + + 65200 + ARISTA01T3 + + + + 65200 + ARISTA03T3 + + + + 65200 + ARISTA05T3 + + + + 65200 + ARISTA07T3 + + + + 65200 + ARISTA09T3 + + + + 65200 + ARISTA11T3 + + + + 65200 + ARISTA13T3 + + + + 65200 + ARISTA15T3 + + + + 65200 + ARISTA17T3 + + + + 65200 + ARISTA18T3 + + + + 65200 + ARISTA19T3 + + + + 65200 + ARISTA20T3 + + + + 65200 + ARISTA21T3 + + + + 65200 + ARISTA22T3 + + + + 65200 + ARISTA23T3 + + + + 65200 + ARISTA24T3 + + + + 65200 + ARISTA25T3 + + + + 65200 + ARISTA26T3 + + + + 65200 + ARISTA27T3 + + + + 65200 + ARISTA28T3 + + + + 65200 + ARISTA29T3 + + + + 65200 + ARISTA30T3 + + + + 65200 + ARISTA31T3 + + + + 65200 + ARISTA32T3 + + + + 65100 + ASIC1 + + +
10.0.0.37
+ + + + + +
10.0.0.39
+ + + + + +
10.0.0.41
+ + + + + +
10.0.0.43
+ + + + + +
10.0.0.45
+ + + + + +
10.0.0.47
+ + + + + +
10.0.0.49
+ + + + + +
10.0.0.51
+ + + + + +
10.0.0.53
+ + + + + +
10.0.0.55
+ + + + + +
10.0.0.57
+ + + + + +
10.0.0.59
+ + + + + +
10.0.0.61
+ + + + + +
10.0.0.63
+ + + + + +
3.3.3.1/32
+ + + + + +
3.3.3.6/32
+ + + + + +
3.3.3.8/32
+ + + + + +
3.3.3.10/32
+ + + + + +
3.3.3.12/32
+ + + + + + + + + 65100 + ASIC0 + + +
10.0.0.1
+ + + + + +
10.0.0.5
+ + + + + +
10.0.0.9
+ + + + + +
10.0.0.13
+ + + + + +
10.0.0.17
+ + + + + +
10.0.0.21
+ + + + + +
10.0.0.33
+ + + + + +
10.0.0.29
+ + + + + +
10.0.0.35
+ + + + + +
10.0.0.25
+ + + + + +
3.3.3.2/32
+ + + + + +
3.3.3.6/32
+ + + + + +
3.3.3.8/32
+ + + + + +
3.3.3.10/32
+ + + + + +
3.3.3.12/32
+ + + + + + + + + 65100 + svcstr-7250-lc2-1-ASIC0 + + + + 65100 + svcstr-7250-lc2-1-ASIC1 + + + + 65100 + svcstr-7250-lc3-1-ASIC0 + + + + 65100 + svcstr-7250-lc3-1-ASIC1 + + + + + + + + + + HostIP + Loopback0 + + 10.1.0.1/32 + + 10.1.0.1/32 + + + HostIP1 + Loopback0 + + FC00:10::1/128 + + FC00:10::1/128 + + + + + HostIP + eth0 + + 10.206.144.145/24 + + 10.206.144.145/24 + + + V6HostIP + eth0 + + FC00:2::32/64 + + FC00:2::32/64 + + + + + + + svcstr-7250-lc1-1 + + + PortChannel102 + Ethernet1/1;Ethernet2/1 + + + + PortChannel104 + Ethernet3/1;Ethernet4/1 + + + + PortChannel106 + Ethernet5/1;Ethernet6/1 + + + + PortChannel108 + Ethernet7/1;Ethernet8/1 + + + + PortChannel1010 + Ethernet9/1;Ethernet10/1 + + + + PortChannel1012 + Ethernet11/1;Ethernet12/1 + + + + PortChannel1016 + Ethernet14/1;Ethernet15/1 + + + + PortChannel1020 + Ethernet17/1;Ethernet18/1 + + + + + + + + + PortChannel102 + 10.0.0.0/31 + + + + PortChannel102 + FC00::1/126 + + + + PortChannel104 + 10.0.0.4/31 + + + + PortChannel104 + FC00::9/126 + + + + PortChannel106 + 10.0.0.8/31 + + + + PortChannel106 + FC00::11/126 + + + + PortChannel108 + 10.0.0.12/31 + + + + PortChannel108 + FC00::19/126 + + + + PortChannel1010 + 10.0.0.16/31 + + + + PortChannel1010 + FC00::21/126 + + + + PortChannel1012 + 10.0.0.20/31 + + + + PortChannel1012 + FC00::29/126 + + + + Ethernet13/1 + 10.0.0.32/31 + + + + Ethernet13/1 + FC00::41/126 + + + + PortChannel1016 + 10.0.0.28/31 + + + + PortChannel1016 + FC00::39/126 + + + + Ethernet16/1 + 10.0.0.34/31 + + + + Ethernet16/1 + FC00::45/126 + + + + PortChannel1020 + 10.0.0.24/31 + + + + PortChannel1020 + FC00::31/126 + + + + Ethernet19/1 + 10.0.0.36/31 + + + + Ethernet19/1 + FC00::49/126 + + + + Ethernet20/1 + 10.0.0.38/31 + + + + Ethernet20/1 + FC00::4D/126 + + + + Ethernet21/1 + 10.0.0.40/31 + + + + Ethernet21/1 + FC00::51/126 + + + + Ethernet22/1 + 10.0.0.42/31 + + + + Ethernet22/1 + FC00::55/126 + + + + Ethernet23/1 + 10.0.0.44/31 + + + + Ethernet23/1 + FC00::59/126 + + + + Ethernet24/1 + 10.0.0.46/31 + + + + Ethernet24/1 + FC00::5D/126 + + + + Ethernet25/1 + 10.0.0.48/31 + + + + Ethernet25/1 + FC00::61/126 + + + + Ethernet26/1 + 10.0.0.50/31 + + + + Ethernet26/1 + FC00::65/126 + + + + Ethernet27/1 + 10.0.0.52/31 + + + + Ethernet27/1 + FC00::69/126 + + + + Ethernet28/1 + 10.0.0.54/31 + + + + Ethernet28/1 + FC00::6D/126 + + + + Ethernet29/1 + 10.0.0.56/31 + + + + Ethernet29/1 + FC00::71/126 + + + + Ethernet30/1 + 10.0.0.58/31 + + + + Ethernet30/1 + FC00::75/126 + + + + Ethernet31/1 + 10.0.0.60/31 + + + + Ethernet31/1 + FC00::79/126 + + + + Ethernet32/1 + 10.0.0.62/31 + + + + Ethernet32/1 + FC00::7D/126 + + + + + + NTP_ACL + NTP + NTP + + + SNMP_ACL + SNMP + SNMP + + + VTY_LINE + ssh-only + SSH + + + ERSPAN + Everflow + Everflow + + + ERSPANV6 + EverflowV6 + EverflowV6 + + + PortChannel102;PortChannel104;PortChannel106;PortChannel108;PortChannel1010;PortChannel1012;PortChannel1016;PortChannel1020;Ethernet13/1;Ethernet16/1;Ethernet19/1;Ethernet20/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 + DataAcl + DataPlane + + + + + + + + + + HostIP + Loopback0 + + 10.1.0.1/32 + + 10.1.0.1/32 + + + HostIP1 + Loopback0 + + FC00:10::1/128 + + FC00:10::1/128 + + + HostIP1 + Loopback4096 + + 192.0.0.2/32 + + 192.0.0.2/32 + + + HostIP1 + Loopback4096 + + 2603:10e2:400::2/128 + + 2603:10e2:400::2/128 + + + + + HostIP + eth0 + + 10.206.144.145/24 + + 10.206.144.145/24 + + + V6HostIP + eth0 + + FC00:2::32/64 + + FC00:2::32/64 + + + + + + Ethernet-IB1 + port + 3.3.3.2/32 + + + Ethernet-IB1 + port + 3333::3:2/128 + + + + + + ASIC1 + + + + + + + Eth0 + 10.0.0.36/31 + + + + Eth0 + FC00::49/126 + + + + Eth8 + 10.0.0.38/31 + + + + Eth8 + FC00::4D/126 + + + + Eth16 + 10.0.0.40/31 + + + + Eth16 + FC00::51/126 + + + + Eth24 + 10.0.0.42/31 + + + + Eth24 + FC00::55/126 + + + + Eth32 + 10.0.0.44/31 + + + + Eth32 + FC00::59/126 + + + + Eth40 + 10.0.0.46/31 + + + + Eth40 + FC00::5D/126 + + + + Eth48 + 10.0.0.48/31 + + + + Eth48 + FC00::61/126 + + + + Eth56 + 10.0.0.50/31 + + + + Eth56 + FC00::65/126 + + + + Eth64 + 10.0.0.52/31 + + + + Eth64 + FC00::69/126 + + + + Eth72 + 10.0.0.54/31 + + + + Eth72 + FC00::6D/126 + + + + Eth80 + 10.0.0.56/31 + + + + Eth80 + FC00::71/126 + + + + Eth88 + 10.0.0.58/31 + + + + Eth88 + FC00::75/126 + + + + Eth96 + 10.0.0.60/31 + + + + Eth96 + FC00::79/126 + + + + Eth104 + 10.0.0.62/31 + + + + Eth104 + FC00::7D/126 + + + + + + SNMP_ACL + SNMP + SNMP + + + ERSPAN + Everflow + Everflow + + + ERSPANV6 + EverflowV6 + EverflowV6 + + + VTY_LINE + ssh-only + SSH + + + Eth0;Eth8;Eth16;Eth24;Eth32;Eth40;Eth48;Eth56;Eth64;Eth72;Eth80;Eth88;Eth96;Eth104 + DataAcl + DataPlane + + + + + + + + + + HostIP + Loopback0 + + 10.1.0.1/32 + + 10.1.0.1/32 + + + HostIP1 + Loopback0 + + FC00:10::1/128 + + FC00:10::1/128 + + + HostIP1 + Loopback4096 + + 192.0.0.1/32 + + 192.0.0.1/32 + + + HostIP1 + Loopback4096 + + 2603:10e2:400::1/128 + + 2603:10e2:400::1/128 + + + + + HostIP + eth0 + + 10.206.144.145/24 + + 10.206.144.145/24 + + + V6HostIP + eth0 + + FC00:2::32/64 + + FC00:2::32/64 + + + + + + Ethernet-IB0 + port + 3.3.3.1/32 + + + Ethernet-IB0 + port + 3333::3:1/128 + + + + + + ASIC0 + + + PortChannel102 + Eth0;Eth8 + + + + PortChannel104 + Eth16;Eth24 + + + + PortChannel106 + Eth32;Eth40 + + + + PortChannel108 + Eth48;Eth56 + + + + PortChannel1010 + Eth64;Eth72 + + + + PortChannel1012 + Eth80;Eth88 + + + + PortChannel1016 + Eth104;Eth112 + + + + PortChannel1020 + Eth128;Eth136 + + + + + + + + PortChannel102 + 10.0.0.0/31 + + + + PortChannel102 + FC00::1/126 + + + + PortChannel104 + 10.0.0.4/31 + + + + PortChannel104 + FC00::9/126 + + + + PortChannel106 + 10.0.0.8/31 + + + + PortChannel106 + FC00::11/126 + + + + PortChannel108 + 10.0.0.12/31 + + + + PortChannel108 + FC00::19/126 + + + + PortChannel1010 + 10.0.0.16/31 + + + + PortChannel1010 + FC00::21/126 + + + + PortChannel1012 + 10.0.0.20/31 + + + + PortChannel1012 + FC00::29/126 + + + + Eth96 + 10.0.0.32/31 + + + + Eth96 + FC00::41/126 + + + + PortChannel1016 + 10.0.0.28/31 + + + + PortChannel1016 + FC00::39/126 + + + + Eth120 + 10.0.0.34/31 + + + + Eth120 + FC00::45/126 + + + + PortChannel1020 + 10.0.0.24/31 + + + + PortChannel1020 + FC00::31/126 + + + + + + SNMP_ACL + SNMP + SNMP + + + ERSPAN + Everflow + Everflow + + + ERSPANV6 + EverflowV6 + EverflowV6 + + + VTY_LINE + ssh-only + SSH + + + PortChannel102;PortChannel104;PortChannel106;PortChannel108;PortChannel1010;PortChannel1012;PortChannel1016;PortChannel1020;Eth0;Eth16;Eth32;Eth48;Eth64;Eth80;Eth96;Eth104;Eth120;Eth128 + DataAcl + DataPlane + + + + + + + + + + DeviceInterfaceLink + ARISTA01T3 + Ethernet1 + svcstr-7250-lc1-1 + Ethernet1/1 + 100000 + + + DeviceInterfaceLink + ARISTA01T3 + Ethernet2 + svcstr-7250-lc1-1 + Ethernet2/1 + 100000 + + + DeviceInterfaceLink + ARISTA03T3 + Ethernet1 + svcstr-7250-lc1-1 + Ethernet3/1 + 100000 + + + DeviceInterfaceLink + ARISTA03T3 + Ethernet2 + svcstr-7250-lc1-1 + Ethernet4/1 + 100000 + + + DeviceInterfaceLink + ARISTA05T3 + Ethernet1 + svcstr-7250-lc1-1 + Ethernet5/1 + 100000 + + + DeviceInterfaceLink + ARISTA05T3 + Ethernet2 + svcstr-7250-lc1-1 + Ethernet6/1 + 100000 + + + DeviceInterfaceLink + ARISTA07T3 + Ethernet1 + svcstr-7250-lc1-1 + Ethernet7/1 + 100000 + + + DeviceInterfaceLink + ARISTA07T3 + Ethernet2 + svcstr-7250-lc1-1 + Ethernet8/1 + 100000 + + + DeviceInterfaceLink + ARISTA09T3 + Ethernet1 + svcstr-7250-lc1-1 + Ethernet9/1 + 100000 + + + DeviceInterfaceLink + ARISTA09T3 + Ethernet2 + svcstr-7250-lc1-1 + Ethernet10/1 + 100000 + + + DeviceInterfaceLink + ARISTA11T3 + Ethernet1 + svcstr-7250-lc1-1 + Ethernet11/1 + 100000 + + + DeviceInterfaceLink + ARISTA11T3 + Ethernet2 + svcstr-7250-lc1-1 + Ethernet12/1 + 100000 + + + DeviceInterfaceLink + ARISTA13T3 + Ethernet1 + svcstr-7250-lc1-1 + Ethernet13/1 + 100000 + + + DeviceInterfaceLink + ARISTA15T3 + Ethernet1 + svcstr-7250-lc1-1 + Ethernet14/1 + 100000 + + + DeviceInterfaceLink + ARISTA15T3 + Ethernet2 + svcstr-7250-lc1-1 + Ethernet15/1 + 100000 + + + DeviceInterfaceLink + ARISTA17T3 + Ethernet1 + svcstr-7250-lc1-1 + Ethernet16/1 + 100000 + + + DeviceInterfaceLink + ARISTA18T3 + Ethernet1 + svcstr-7250-lc1-1 + Ethernet17/1 + 100000 + + + DeviceInterfaceLink + ARISTA18T3 + Ethernet2 + svcstr-7250-lc1-1 + Ethernet18/1 + 100000 + + + DeviceInterfaceLink + ARISTA19T3 + Ethernet1 + svcstr-7250-lc1-1 + Ethernet19/1 + 100000 + + + DeviceInterfaceLink + ARISTA20T3 + Ethernet1 + svcstr-7250-lc1-1 + Ethernet20/1 + 100000 + + + DeviceInterfaceLink + ARISTA21T3 + Ethernet1 + svcstr-7250-lc1-1 + Ethernet21/1 + 100000 + + + DeviceInterfaceLink + ARISTA22T3 + Ethernet1 + svcstr-7250-lc1-1 + Ethernet22/1 + 100000 + + + DeviceInterfaceLink + ARISTA23T3 + Ethernet1 + svcstr-7250-lc1-1 + Ethernet23/1 + 100000 + + + DeviceInterfaceLink + ARISTA24T3 + Ethernet1 + svcstr-7250-lc1-1 + Ethernet24/1 + 100000 + + + DeviceInterfaceLink + ARISTA25T3 + Ethernet1 + svcstr-7250-lc1-1 + Ethernet25/1 + 100000 + + + DeviceInterfaceLink + ARISTA26T3 + Ethernet1 + svcstr-7250-lc1-1 + Ethernet26/1 + 100000 + + + DeviceInterfaceLink + ARISTA27T3 + Ethernet1 + svcstr-7250-lc1-1 + Ethernet27/1 + 100000 + + + DeviceInterfaceLink + ARISTA28T3 + Ethernet1 + svcstr-7250-lc1-1 + Ethernet28/1 + 100000 + + + DeviceInterfaceLink + ARISTA29T3 + Ethernet1 + svcstr-7250-lc1-1 + Ethernet29/1 + 100000 + + + DeviceInterfaceLink + ARISTA30T3 + Ethernet1 + svcstr-7250-lc1-1 + Ethernet30/1 + 100000 + + + DeviceInterfaceLink + ARISTA31T3 + Ethernet1 + svcstr-7250-lc1-1 + Ethernet31/1 + 100000 + + + DeviceInterfaceLink + ARISTA32T3 + Ethernet1 + svcstr-7250-lc1-1 + Ethernet32/1 + 100000 + + + DeviceInterfaceLink + 100000 + true + ASIC0 + Eth0 + true + svcstr-7250-lc1-1 + Ethernet1/1 + true + + + DeviceInterfaceLink + 100000 + true + ASIC0 + Eth8 + true + svcstr-7250-lc1-1 + Ethernet2/1 + true + + + DeviceInterfaceLink + 100000 + true + ASIC0 + Eth16 + true + svcstr-7250-lc1-1 + Ethernet3/1 + true + + + DeviceInterfaceLink + 100000 + true + ASIC0 + Eth24 + true + svcstr-7250-lc1-1 + Ethernet4/1 + true + + + DeviceInterfaceLink + 100000 + true + ASIC0 + Eth32 + true + svcstr-7250-lc1-1 + Ethernet5/1 + true + + + DeviceInterfaceLink + 100000 + true + ASIC0 + Eth40 + true + svcstr-7250-lc1-1 + Ethernet6/1 + true + + + DeviceInterfaceLink + 100000 + true + ASIC0 + Eth48 + true + svcstr-7250-lc1-1 + Ethernet7/1 + true + + + DeviceInterfaceLink + 100000 + true + ASIC0 + Eth56 + true + svcstr-7250-lc1-1 + Ethernet8/1 + true + + + DeviceInterfaceLink + 100000 + true + ASIC0 + Eth64 + true + svcstr-7250-lc1-1 + Ethernet9/1 + true + + + DeviceInterfaceLink + 100000 + true + ASIC0 + Eth72 + true + svcstr-7250-lc1-1 + Ethernet10/1 + true + + + DeviceInterfaceLink + 100000 + true + ASIC0 + Eth80 + true + svcstr-7250-lc1-1 + Ethernet11/1 + true + + + DeviceInterfaceLink + 100000 + true + ASIC0 + Eth88 + true + svcstr-7250-lc1-1 + Ethernet12/1 + true + + + DeviceInterfaceLink + 100000 + true + ASIC0 + Eth96 + true + svcstr-7250-lc1-1 + Ethernet13/1 + true + + + DeviceInterfaceLink + 100000 + true + ASIC0 + Eth104 + true + svcstr-7250-lc1-1 + Ethernet14/1 + true + + + DeviceInterfaceLink + 100000 + true + ASIC0 + Eth112 + true + svcstr-7250-lc1-1 + Ethernet15/1 + true + + + DeviceInterfaceLink + 100000 + true + ASIC0 + Eth120 + true + svcstr-7250-lc1-1 + Ethernet16/1 + true + + + DeviceInterfaceLink + 100000 + true + ASIC0 + Eth128 + true + svcstr-7250-lc1-1 + Ethernet17/1 + true + + + DeviceInterfaceLink + 100000 + true + ASIC0 + Eth136 + true + svcstr-7250-lc1-1 + Ethernet18/1 + true + + + DeviceInterfaceLink + 100000 + true + ASIC1 + Eth0 + true + svcstr-7250-lc1-1 + Ethernet19/1 + true + + + DeviceInterfaceLink + 100000 + true + ASIC1 + Eth8 + true + svcstr-7250-lc1-1 + Ethernet20/1 + true + + + DeviceInterfaceLink + 100000 + true + ASIC1 + Eth16 + true + svcstr-7250-lc1-1 + Ethernet21/1 + true + + + DeviceInterfaceLink + 100000 + true + ASIC1 + Eth24 + true + svcstr-7250-lc1-1 + Ethernet22/1 + true + + + DeviceInterfaceLink + 100000 + true + ASIC1 + Eth32 + true + svcstr-7250-lc1-1 + Ethernet23/1 + true + + + DeviceInterfaceLink + 100000 + true + ASIC1 + Eth40 + true + svcstr-7250-lc1-1 + Ethernet24/1 + true + + + DeviceInterfaceLink + 100000 + true + ASIC1 + Eth48 + true + svcstr-7250-lc1-1 + Ethernet25/1 + true + + + DeviceInterfaceLink + 100000 + true + ASIC1 + Eth56 + true + svcstr-7250-lc1-1 + Ethernet26/1 + true + + + DeviceInterfaceLink + 100000 + true + ASIC1 + Eth64 + true + svcstr-7250-lc1-1 + Ethernet27/1 + true + + + DeviceInterfaceLink + 100000 + true + ASIC1 + Eth72 + true + svcstr-7250-lc1-1 + Ethernet28/1 + true + + + DeviceInterfaceLink + 100000 + true + ASIC1 + Eth80 + true + svcstr-7250-lc1-1 + Ethernet29/1 + true + + + DeviceInterfaceLink + 100000 + true + ASIC1 + Eth88 + true + svcstr-7250-lc1-1 + Ethernet30/1 + true + + + DeviceInterfaceLink + 100000 + true + ASIC1 + Eth96 + true + svcstr-7250-lc1-1 + Ethernet31/1 + true + + + DeviceInterfaceLink + 100000 + true + ASIC1 + Eth104 + true + svcstr-7250-lc1-1 + Ethernet32/1 + true + + + DeviceInterfaceLink + 100000 + true + ASIC1 + Eth112 + true + svcstr-7250-lc1-1 + Ethernet33/1 + true + + + DeviceInterfaceLink + 100000 + true + ASIC1 + Eth120 + true + svcstr-7250-lc1-1 + Ethernet34/1 + true + + + DeviceInterfaceLink + 100000 + true + ASIC1 + Eth128 + true + svcstr-7250-lc1-1 + Ethernet35/1 + true + + + DeviceInterfaceLink + 100000 + true + ASIC1 + Eth136 + true + svcstr-7250-lc1-1 + Ethernet36/1 + true + + + + + svcstr-7250-lc1-1 + Nokia-IXR7250E-36x100G + + 10.206.144.145 + + + + ARISTA05T3 + + 10.206.144.152 + + Arista-VM + + + ARISTA11T3 + + 10.206.144.155 + + Arista-VM + + + ARISTA17T3 + + 10.206.144.158 + + Arista-VM + + + ARISTA21T3 + + 10.206.144.162 + + Arista-VM + + + ARISTA19T3 + + 10.206.144.160 + + Arista-VM + + + ARISTA09T3 + + 10.206.144.154 + + Arista-VM + + + ARISTA20T3 + + 10.206.144.161 + + Arista-VM + + + ARISTA03T3 + + 10.206.144.151 + + Arista-VM + + + ARISTA07T3 + + 10.206.144.153 + + Arista-VM + + + ARISTA01T3 + + 10.206.144.150 + + Arista-VM + + + ARISTA27T3 + + 10.206.144.168 + + Arista-VM + + + ARISTA26T3 + + 10.206.144.167 + + Arista-VM + + + ARISTA32T3 + + 10.206.144.173 + + Arista-VM + + + ARISTA23T3 + + 10.206.144.164 + + Arista-VM + + + ARISTA25T3 + + 10.206.144.166 + + Arista-VM + + + ARISTA24T3 + + 10.206.144.165 + + Arista-VM + + + ARISTA22T3 + + 10.206.144.163 + + Arista-VM + + + ARISTA28T3 + + 10.206.144.169 + + Arista-VM + + + ARISTA30T3 + + 10.206.144.171 + + Arista-VM + + + ARISTA18T3 + + 10.206.144.159 + + Arista-VM + + + ARISTA29T3 + + 10.206.144.170 + + Arista-VM + + + ARISTA15T3 + + 10.206.144.157 + + Arista-VM + + + ARISTA13T3 + + 10.206.144.156 + + Arista-VM + + + ARISTA31T3 + + 10.206.144.172 + + Arista-VM + + + Asic +
+ 0.0.0.0/0 +
+ + ::/0 + + + + + + + + + + 0.0.0.0/0 + + + ::/0 + + + ASIC0 + Broadcom-Trident2 + + + Asic +
+ 0.0.0.0/0 +
+ + ::/0 + + + + + + + + + + 0.0.0.0/0 + + + ::/0 + + + ASIC1 + Broadcom-Trident2 + + + + + + true + + + DeviceInterface + + true + true + 1 + Ethernet1/1 + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + true + 1 + Ethernet2/1 + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + true + 1 + Ethernet3/1 + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + true + 1 + Ethernet4/1 + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + true + 1 + Ethernet5/1 + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + true + 1 + Ethernet6/1 + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + true + 1 + Ethernet7/1 + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + true + 1 + Ethernet8/1 + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + true + 1 + Ethernet9/1 + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + true + 1 + Ethernet10/1 + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + true + 1 + Ethernet11/1 + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + true + 1 + Ethernet12/1 + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + true + 1 + Ethernet13/1 + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + true + 1 + Ethernet14/1 + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + true + 1 + Ethernet15/1 + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + true + 1 + Ethernet16/1 + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + true + 1 + Ethernet17/1 + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + true + 1 + Ethernet18/1 + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + true + 1 + Ethernet19/1 + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + true + 1 + Ethernet20/1 + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + true + 1 + Ethernet21/1 + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + true + 1 + Ethernet22/1 + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + true + 1 + Ethernet23/1 + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + true + 1 + Ethernet24/1 + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + true + 1 + Ethernet25/1 + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + true + 1 + Ethernet26/1 + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + true + 1 + Ethernet27/1 + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + true + 1 + Ethernet28/1 + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + true + 1 + Ethernet29/1 + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + true + 1 + Ethernet30/1 + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + true + 1 + Ethernet31/1 + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + true + 1 + Ethernet32/1 + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + true + 1 + Ethernet33/1 + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + true + 1 + Ethernet34/1 + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + true + 1 + Ethernet35/1 + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + true + 1 + Ethernet36/1 + + false + 0 + 0 + 100000 + + + DeviceInterface + + true + true + 1 + Recirc0/0 + + false + 0 + 0 + 10000 + + + DeviceInterface + + true + true + 1 + Recirc1/0 + + false + 0 + 0 + 10000 + + + DeviceInterface + + true + true + 1 + Recirc0/1 + + false + 0 + 0 + 10000 + + + DeviceInterface + + true + true + 1 + Recirc1/1 + + false + 0 + 0 + 10000 + + + + + Cpu0 + svcstr-7250-lc1-1 + asic0 + 10000 + 0 + 0 + 0 + 0 + 8 + + + Ethernet0 + svcstr-7250-lc1-1 + asic0 + 100000 + 1 + 0 + 1 + 1 + 8 + + + Ethernet8 + svcstr-7250-lc1-1 + asic0 + 100000 + 2 + 0 + 1 + 2 + 8 + + + Ethernet16 + svcstr-7250-lc1-1 + asic0 + 100000 + 3 + 0 + 1 + 3 + 8 + + + Ethernet24 + svcstr-7250-lc1-1 + asic0 + 100000 + 4 + 0 + 1 + 4 + 8 + + + Ethernet32 + svcstr-7250-lc1-1 + asic0 + 100000 + 5 + 0 + 1 + 5 + 8 + + + Ethernet40 + svcstr-7250-lc1-1 + asic0 + 100000 + 6 + 0 + 1 + 6 + 8 + + + Ethernet48 + svcstr-7250-lc1-1 + asic0 + 100000 + 7 + 0 + 1 + 7 + 8 + + + Ethernet56 + svcstr-7250-lc1-1 + asic0 + 100000 + 8 + 0 + 1 + 8 + 8 + + + Ethernet64 + svcstr-7250-lc1-1 + asic0 + 100000 + 9 + 0 + 1 + 9 + 8 + + + Ethernet72 + svcstr-7250-lc1-1 + asic0 + 100000 + 10 + 0 + 0 + 10 + 8 + + + Ethernet80 + svcstr-7250-lc1-1 + asic0 + 100000 + 11 + 0 + 0 + 11 + 8 + + + Ethernet88 + svcstr-7250-lc1-1 + asic0 + 100000 + 12 + 0 + 0 + 12 + 8 + + + Ethernet96 + svcstr-7250-lc1-1 + asic0 + 100000 + 13 + 0 + 0 + 13 + 8 + + + Ethernet104 + svcstr-7250-lc1-1 + asic0 + 100000 + 14 + 0 + 0 + 14 + 8 + + + Ethernet112 + svcstr-7250-lc1-1 + asic0 + 100000 + 15 + 0 + 0 + 15 + 8 + + + Ethernet120 + svcstr-7250-lc1-1 + asic0 + 100000 + 16 + 0 + 0 + 16 + 8 + + + Ethernet128 + svcstr-7250-lc1-1 + asic0 + 100000 + 17 + 0 + 0 + 17 + 8 + + + Ethernet136 + svcstr-7250-lc1-1 + asic0 + 100000 + 18 + 0 + 0 + 18 + 8 + + + Ethernet-IB0 + svcstr-7250-lc1-1 + asic0 + 10000 + 19 + 0 + 0 + 19 + 8 + + + Ethernet-Rec0 + svcstr-7250-lc1-1 + asic0 + 10000 + 20 + 0 + 1 + 20 + 8 + + + Cpu0 + svcstr-7250-lc1-1 + asic1 + 10000 + 21 + 2 + 0 + 0 + 8 + + + Ethernet144 + svcstr-7250-lc1-1 + asic1 + 100000 + 22 + 2 + 1 + 1 + 8 + + + Ethernet152 + svcstr-7250-lc1-1 + asic1 + 100000 + 23 + 2 + 1 + 2 + 8 + + + Ethernet160 + svcstr-7250-lc1-1 + asic1 + 100000 + 24 + 2 + 1 + 3 + 8 + + + Ethernet168 + svcstr-7250-lc1-1 + asic1 + 100000 + 25 + 2 + 1 + 4 + 8 + + + Ethernet176 + svcstr-7250-lc1-1 + asic1 + 100000 + 26 + 2 + 1 + 5 + 8 + + + Ethernet184 + svcstr-7250-lc1-1 + asic1 + 100000 + 27 + 2 + 1 + 6 + 8 + + + Ethernet192 + svcstr-7250-lc1-1 + asic1 + 100000 + 28 + 2 + 1 + 7 + 8 + + + Ethernet200 + svcstr-7250-lc1-1 + asic1 + 100000 + 29 + 2 + 1 + 8 + 8 + + + Ethernet208 + svcstr-7250-lc1-1 + asic1 + 100000 + 30 + 2 + 1 + 9 + 8 + + + Ethernet216 + svcstr-7250-lc1-1 + asic1 + 100000 + 31 + 2 + 0 + 10 + 8 + + + Ethernet224 + svcstr-7250-lc1-1 + asic1 + 100000 + 32 + 2 + 0 + 11 + 8 + + + Ethernet232 + svcstr-7250-lc1-1 + asic1 + 100000 + 33 + 2 + 0 + 12 + 8 + + + Ethernet240 + svcstr-7250-lc1-1 + asic1 + 100000 + 34 + 2 + 0 + 13 + 8 + + + Ethernet248 + svcstr-7250-lc1-1 + asic1 + 100000 + 35 + 2 + 0 + 14 + 8 + + + Ethernet256 + svcstr-7250-lc1-1 + asic1 + 100000 + 36 + 2 + 0 + 15 + 8 + + + Ethernet264 + svcstr-7250-lc1-1 + asic1 + 100000 + 37 + 2 + 0 + 16 + 8 + + + Ethernet272 + svcstr-7250-lc1-1 + asic1 + 100000 + 38 + 2 + 0 + 17 + 8 + + + Ethernet280 + svcstr-7250-lc1-1 + asic1 + 100000 + 39 + 2 + 0 + 18 + 8 + + + Ethernet-IB1 + svcstr-7250-lc1-1 + asic1 + 10000 + 40 + 2 + 0 + 19 + 8 + + + Ethernet-Rec1 + svcstr-7250-lc1-1 + asic1 + 10000 + 41 + 2 + 1 + 20 + 8 + + + Cpu0 + svcstr-7250-lc2-1 + asic0 + 10000 + 42 + 6 + 0 + 0 + 8 + + + Ethernet0 + svcstr-7250-lc2-1 + asic0 + 100000 + 43 + 6 + 1 + 1 + 8 + + + Ethernet8 + svcstr-7250-lc2-1 + asic0 + 100000 + 44 + 6 + 1 + 2 + 8 + + + Ethernet16 + svcstr-7250-lc2-1 + asic0 + 100000 + 45 + 6 + 1 + 3 + 8 + + + Ethernet24 + svcstr-7250-lc2-1 + asic0 + 100000 + 46 + 6 + 1 + 4 + 8 + + + Ethernet32 + svcstr-7250-lc2-1 + asic0 + 100000 + 47 + 6 + 1 + 5 + 8 + + + Ethernet40 + svcstr-7250-lc2-1 + asic0 + 100000 + 48 + 6 + 1 + 6 + 8 + + + Ethernet48 + svcstr-7250-lc2-1 + asic0 + 100000 + 49 + 6 + 1 + 7 + 8 + + + Ethernet56 + svcstr-7250-lc2-1 + asic0 + 100000 + 50 + 6 + 1 + 8 + 8 + + + Ethernet64 + svcstr-7250-lc2-1 + asic0 + 100000 + 51 + 6 + 1 + 9 + 8 + + + Ethernet72 + svcstr-7250-lc2-1 + asic0 + 100000 + 52 + 6 + 0 + 10 + 8 + + + Ethernet80 + svcstr-7250-lc2-1 + asic0 + 100000 + 53 + 6 + 0 + 11 + 8 + + + Ethernet88 + svcstr-7250-lc2-1 + asic0 + 100000 + 54 + 6 + 0 + 12 + 8 + + + Ethernet96 + svcstr-7250-lc2-1 + asic0 + 100000 + 55 + 6 + 0 + 13 + 8 + + + Ethernet104 + svcstr-7250-lc2-1 + asic0 + 100000 + 56 + 6 + 0 + 14 + 8 + + + Ethernet112 + svcstr-7250-lc2-1 + asic0 + 100000 + 57 + 6 + 0 + 15 + 8 + + + Ethernet120 + svcstr-7250-lc2-1 + asic0 + 100000 + 58 + 6 + 0 + 16 + 8 + + + Ethernet128 + svcstr-7250-lc2-1 + asic0 + 100000 + 59 + 6 + 0 + 17 + 8 + + + Ethernet136 + svcstr-7250-lc2-1 + asic0 + 100000 + 60 + 6 + 0 + 18 + 8 + + + Ethernet-IB0 + svcstr-7250-lc2-1 + asic0 + 10000 + 61 + 6 + 0 + 19 + 8 + + + Ethernet-Rec0 + svcstr-7250-lc2-1 + asic0 + 10000 + 62 + 6 + 1 + 20 + 8 + + + Cpu0 + svcstr-7250-lc2-1 + asic1 + 10000 + 63 + 8 + 0 + 0 + 8 + + + Ethernet144 + svcstr-7250-lc2-1 + asic1 + 100000 + 64 + 8 + 1 + 1 + 8 + + + Ethernet152 + svcstr-7250-lc2-1 + asic1 + 100000 + 65 + 8 + 1 + 2 + 8 + + + Ethernet160 + svcstr-7250-lc2-1 + asic1 + 100000 + 66 + 8 + 1 + 3 + 8 + + + Ethernet168 + svcstr-7250-lc2-1 + asic1 + 100000 + 67 + 8 + 1 + 4 + 8 + + + Ethernet176 + svcstr-7250-lc2-1 + asic1 + 100000 + 68 + 8 + 1 + 5 + 8 + + + Ethernet184 + svcstr-7250-lc2-1 + asic1 + 100000 + 69 + 8 + 1 + 6 + 8 + + + Ethernet192 + svcstr-7250-lc2-1 + asic1 + 100000 + 70 + 8 + 1 + 7 + 8 + + + Ethernet200 + svcstr-7250-lc2-1 + asic1 + 100000 + 71 + 8 + 1 + 8 + 8 + + + Ethernet208 + svcstr-7250-lc2-1 + asic1 + 100000 + 72 + 8 + 1 + 9 + 8 + + + Ethernet216 + svcstr-7250-lc2-1 + asic1 + 100000 + 73 + 8 + 0 + 10 + 8 + + + Ethernet224 + svcstr-7250-lc2-1 + asic1 + 100000 + 74 + 8 + 0 + 11 + 8 + + + Ethernet232 + svcstr-7250-lc2-1 + asic1 + 100000 + 75 + 8 + 0 + 12 + 8 + + + Ethernet240 + svcstr-7250-lc2-1 + asic1 + 100000 + 76 + 8 + 0 + 13 + 8 + + + Ethernet248 + svcstr-7250-lc2-1 + asic1 + 100000 + 77 + 8 + 0 + 14 + 8 + + + Ethernet256 + svcstr-7250-lc2-1 + asic1 + 100000 + 78 + 8 + 0 + 15 + 8 + + + Ethernet264 + svcstr-7250-lc2-1 + asic1 + 100000 + 79 + 8 + 0 + 16 + 8 + + + Ethernet272 + svcstr-7250-lc2-1 + asic1 + 100000 + 80 + 8 + 0 + 17 + 8 + + + Ethernet280 + svcstr-7250-lc2-1 + asic1 + 100000 + 81 + 8 + 0 + 18 + 8 + + + Ethernet-IB1 + svcstr-7250-lc2-1 + asic1 + 10000 + 82 + 8 + 0 + 19 + 8 + + + Ethernet-Rec1 + svcstr-7250-lc2-1 + asic1 + 10000 + 83 + 8 + 1 + 20 + 8 + + + Cpu0 + svcstr-7250-lc3-1 + asic0 + 10000 + 84 + 10 + 0 + 0 + 8 + + + Ethernet0 + svcstr-7250-lc3-1 + asic0 + 100000 + 85 + 10 + 1 + 1 + 8 + + + Ethernet8 + svcstr-7250-lc3-1 + asic0 + 100000 + 86 + 10 + 1 + 2 + 8 + + + Ethernet16 + svcstr-7250-lc3-1 + asic0 + 100000 + 87 + 10 + 1 + 3 + 8 + + + Ethernet24 + svcstr-7250-lc3-1 + asic0 + 100000 + 88 + 10 + 1 + 4 + 8 + + + Ethernet32 + svcstr-7250-lc3-1 + asic0 + 100000 + 89 + 10 + 1 + 5 + 8 + + + Ethernet40 + svcstr-7250-lc3-1 + asic0 + 100000 + 90 + 10 + 1 + 6 + 8 + + + Ethernet48 + svcstr-7250-lc3-1 + asic0 + 100000 + 91 + 10 + 1 + 7 + 8 + + + Ethernet56 + svcstr-7250-lc3-1 + asic0 + 100000 + 92 + 10 + 1 + 8 + 8 + + + Ethernet64 + svcstr-7250-lc3-1 + asic0 + 100000 + 93 + 10 + 1 + 9 + 8 + + + Ethernet72 + svcstr-7250-lc3-1 + asic0 + 100000 + 94 + 10 + 0 + 10 + 8 + + + Ethernet80 + svcstr-7250-lc3-1 + asic0 + 100000 + 95 + 10 + 0 + 11 + 8 + + + Ethernet88 + svcstr-7250-lc3-1 + asic0 + 100000 + 96 + 10 + 0 + 12 + 8 + + + Ethernet96 + svcstr-7250-lc3-1 + asic0 + 100000 + 97 + 10 + 0 + 13 + 8 + + + Ethernet104 + svcstr-7250-lc3-1 + asic0 + 100000 + 98 + 10 + 0 + 14 + 8 + + + Ethernet112 + svcstr-7250-lc3-1 + asic0 + 100000 + 99 + 10 + 0 + 15 + 8 + + + Ethernet120 + svcstr-7250-lc3-1 + asic0 + 100000 + 100 + 10 + 0 + 16 + 8 + + + Ethernet128 + svcstr-7250-lc3-1 + asic0 + 100000 + 101 + 10 + 0 + 17 + 8 + + + Ethernet136 + svcstr-7250-lc3-1 + asic0 + 100000 + 102 + 10 + 0 + 18 + 8 + + + Ethernet-IB0 + svcstr-7250-lc3-1 + asic0 + 10000 + 103 + 10 + 0 + 19 + 8 + + + Ethernet-Rec0 + svcstr-7250-lc3-1 + asic0 + 10000 + 104 + 10 + 1 + 20 + 8 + + + Cpu0 + svcstr-7250-lc3-1 + asic1 + 10000 + 105 + 12 + 0 + 0 + 8 + + + Ethernet144 + svcstr-7250-lc3-1 + asic1 + 100000 + 106 + 12 + 1 + 1 + 8 + + + Ethernet152 + svcstr-7250-lc3-1 + asic1 + 100000 + 107 + 12 + 1 + 2 + 8 + + + Ethernet160 + svcstr-7250-lc3-1 + asic1 + 100000 + 108 + 12 + 1 + 3 + 8 + + + Ethernet168 + svcstr-7250-lc3-1 + asic1 + 100000 + 109 + 12 + 1 + 4 + 8 + + + Ethernet176 + svcstr-7250-lc3-1 + asic1 + 100000 + 110 + 12 + 1 + 5 + 8 + + + Ethernet184 + svcstr-7250-lc3-1 + asic1 + 100000 + 111 + 12 + 1 + 6 + 8 + + + Ethernet192 + svcstr-7250-lc3-1 + asic1 + 100000 + 112 + 12 + 1 + 7 + 8 + + + Ethernet200 + svcstr-7250-lc3-1 + asic1 + 100000 + 113 + 12 + 1 + 8 + 8 + + + Ethernet208 + svcstr-7250-lc3-1 + asic1 + 100000 + 114 + 12 + 1 + 9 + 8 + + + Ethernet216 + svcstr-7250-lc3-1 + asic1 + 100000 + 115 + 12 + 0 + 10 + 8 + + + Ethernet224 + svcstr-7250-lc3-1 + asic1 + 100000 + 116 + 12 + 0 + 11 + 8 + + + Ethernet232 + svcstr-7250-lc3-1 + asic1 + 100000 + 117 + 12 + 0 + 12 + 8 + + + Ethernet240 + svcstr-7250-lc3-1 + asic1 + 100000 + 118 + 12 + 0 + 13 + 8 + + + Ethernet248 + svcstr-7250-lc3-1 + asic1 + 100000 + 119 + 12 + 0 + 14 + 8 + + + Ethernet256 + svcstr-7250-lc3-1 + asic1 + 100000 + 120 + 12 + 0 + 15 + 8 + + + Ethernet264 + svcstr-7250-lc3-1 + asic1 + 100000 + 121 + 12 + 0 + 16 + 8 + + + Ethernet272 + svcstr-7250-lc3-1 + asic1 + 100000 + 122 + 12 + 0 + 17 + 8 + + + Ethernet280 + svcstr-7250-lc3-1 + asic1 + 100000 + 123 + 12 + 0 + 18 + 8 + + + Ethernet-IB1 + svcstr-7250-lc3-1 + asic1 + 10000 + 124 + 12 + 0 + 19 + 8 + + + Ethernet-Rec1 + svcstr-7250-lc3-1 + asic1 + 10000 + 125 + 12 + 1 + 20 + 8 + + + true + 0 + Nokia-IXR7250E-36x100G + + + + + + + svcstr-7250-lc1-1 + + + DeploymentId + + 1 + + + QosProfile + + Profile0 + + + DhcpResources + + 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 + + + NtpResources + + 10.20.8.129;10.20.8.130 + + + SnmpResources + + 10.3.145.98 + + + SyslogResources + + 10.64.246.95 + + + TacacsGroup + + Starlab + + + TacacsServer + + 100.127.20.21 + + + ForcedMgmtRoutes + + 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.206.144.0/24;10.3.146.0/23;10.64.5.5;10.201.148.32/28 + + + ErspanDestinationIpv4 + + 10.20.6.16 + + + SwitchType + + voq + + + MaxCores + + 48 + + + + + ASIC0 + + + SubRole + + FrontEnd + + + SwitchType + + voq + + + SwitchId + + 0 + + + MaxCores + + 48 + + + + + ASIC1 + + + SubRole + + FrontEnd + + + SwitchType + + voq + + + SwitchId + + 2 + + + MaxCores + + 48 + + + + + ASIC1 + + + DeploymentId + + 1 + + + SubRole + + FrontEnd + + + SwitchType + + voq + + + + + ASIC0 + + + DeploymentId + + 1 + + + SubRole + + FrontEnd + + + SwitchType + + voq + + + + + + + svcstr-7250-lc1-1 + Nokia-IXR7250E-36x100G + diff --git a/src/sonic-config-engine/tests/sample-nokia-ixr7250e-36x400g-t2-minigraph.xml b/src/sonic-config-engine/tests/sample-nokia-ixr7250e-36x400g-t2-minigraph.xml new file mode 100644 index 000000000000..ff923b50919e --- /dev/null +++ b/src/sonic-config-engine/tests/sample-nokia-ixr7250e-36x400g-t2-minigraph.xml @@ -0,0 +1,2973 @@ + + + + + + false + str2-7250-lc1-1 + 10.0.0.0 + ARISTA01T3 + 10.0.0.1 + 1 + 10 + 3 + + + false + ASIC0 + 10.0.0.0 + ARISTA01T3 + 10.0.0.1 + 1 + 10 + 3 + + + str2-7250-lc1-1 + FC00::1 + ARISTA01T3 + FC00::2 + 1 + 10 + 3 + + + ASIC0 + FC00::1 + ARISTA01T3 + FC00::2 + 1 + 10 + 3 + + + false + str2-7250-lc1-1 + 10.0.0.4 + ARISTA03T3 + 10.0.0.5 + 1 + 10 + 3 + + + false + ASIC0 + 10.0.0.4 + ARISTA03T3 + 10.0.0.5 + 1 + 10 + 3 + + + str2-7250-lc1-1 + FC00::9 + ARISTA03T3 + FC00::A + 1 + 10 + 3 + + + ASIC0 + FC00::9 + ARISTA03T3 + FC00::A + 1 + 10 + 3 + + + false + str2-7250-lc1-1 + 10.0.0.6 + ARISTA04T3 + 10.0.0.7 + 1 + 10 + 3 + + + false + ASIC1 + 10.0.0.6 + ARISTA04T3 + 10.0.0.7 + 1 + 10 + 3 + + + str2-7250-lc1-1 + FC00::D + ARISTA04T3 + FC00::E + 1 + 10 + 3 + + + ASIC1 + FC00::D + ARISTA04T3 + FC00::E + 1 + 10 + 3 + + + false + str2-7250-lc1-1 + 10.0.0.10 + ARISTA06T3 + 10.0.0.11 + 1 + 10 + 3 + + + false + ASIC1 + 10.0.0.10 + ARISTA06T3 + 10.0.0.11 + 1 + 10 + 3 + + + str2-7250-lc1-1 + FC00::15 + ARISTA06T3 + FC00::16 + 1 + 10 + 3 + + + ASIC1 + FC00::15 + ARISTA06T3 + FC00::16 + 1 + 10 + 3 + + + + + ASIC0 + ASIC1 + 3.3.3.1 + 3.3.3.2 + 1 + 0 + 0 + voq + + + ASIC0 + ASIC1 + 3333::3:1 + 3333::3:2 + 1 + 0 + 0 + voq + + + ASIC0 + str2-7250-lc2-1-ASIC0 + 3.3.3.1 + 3.3.3.6 + 1 + 0 + 0 + voq + + + ASIC0 + str2-7250-lc2-1-ASIC0 + 3333::3:1 + 3333::3:6 + 1 + 0 + 0 + voq + + + ASIC0 + str2-7250-lc2-1-ASIC1 + 3.3.3.1 + 3.3.3.8 + 1 + 0 + 0 + voq + + + ASIC0 + str2-7250-lc2-1-ASIC1 + 3333::3:1 + 3333::3:8 + 1 + 0 + 0 + voq + + + ASIC1 + ASIC0 + 3.3.3.2 + 3.3.3.1 + 1 + 0 + 0 + voq + + + ASIC1 + ASIC0 + 3333::3:2 + 3333::3:1 + 1 + 0 + 0 + voq + + + ASIC1 + str2-7250-lc2-1-ASIC0 + 3.3.3.2 + 3.3.3.6 + 1 + 0 + 0 + voq + + + ASIC1 + str2-7250-lc2-1-ASIC0 + 3333::3:2 + 3333::3:6 + 1 + 0 + 0 + voq + + + ASIC1 + str2-7250-lc2-1-ASIC1 + 3.3.3.2 + 3.3.3.8 + 1 + 0 + 0 + voq + + + ASIC1 + str2-7250-lc2-1-ASIC1 + 3333::3:2 + 3333::3:8 + 1 + 0 + 0 + voq + + + + + 65100 + str2-7250-lc1-1 + + +
10.0.0.1
+ + + + + +
10.0.0.5
+ + + + + +
10.0.0.7
+ + + + + +
10.0.0.11
+ + + + + + + + + 65200 + ARISTA01T3 + + + + 65200 + ARISTA03T3 + + + + 65200 + ARISTA04T3 + + + + 65200 + ARISTA06T3 + + + + 65100 + ASIC1 + + +
10.0.0.7
+ + + + + +
10.0.0.11
+ + + + + +
3.3.3.1/32
+ + + + + +
3.3.3.6/32
+ + + + + +
3.3.3.8/32
+ + + + + + + + + 65100 + ASIC0 + + +
10.0.0.1
+ + + + + +
10.0.0.5
+ + + + + +
3.3.3.2/32
+ + + + + +
3.3.3.6/32
+ + + + + +
3.3.3.8/32
+ + + + + + + + + 65100 + str2-7250-lc2-1-ASIC0 + + + + 65100 + str2-7250-lc2-1-ASIC1 + + + + + + + + + + HostIP + Loopback0 + + 10.1.0.1/32 + + 10.1.0.1/32 + + + HostIP1 + Loopback0 + + FC00:10::1/128 + + FC00:10::1/128 + + + + + HostIP + eth0 + + 10.3.147.134/23 + + 10.3.147.134/23 + + + V6HostIP + eth0 + + FC00:2::32/64 + + FC00:2::32/64 + + + + + + + str2-7250-lc1-1 + + + PortChannel102 + Ethernet5/1;Ethernet6/1 + + + + PortChannel106 + Ethernet27/1;Ethernet28/1 + + + + + + + + + PortChannel102 + 10.0.0.0/31 + + + + PortChannel102 + FC00::1/126 + + + + Ethernet17/1 + 10.0.0.4/31 + + + + Ethernet17/1 + FC00::9/126 + + + + PortChannel106 + 10.0.0.6/31 + + + + PortChannel106 + FC00::D/126 + + + + Ethernet24/1 + 10.0.0.10/31 + + + + Ethernet24/1 + FC00::15/126 + + + + + + NTP_ACL + NTP + NTP + + + SNMP_ACL + SNMP + SNMP + + + VTY_LINE + ssh-only + SSH + + + ERSPAN + Everflow + Everflow + + + ERSPANV6 + EverflowV6 + EverflowV6 + + + PortChannel102;PortChannel106;Ethernet17/1;Ethernet24/1 + DataAcl + DataPlane + + + + + + + + + + HostIP + Loopback0 + + 10.1.0.1/32 + + 10.1.0.1/32 + + + HostIP1 + Loopback0 + + FC00:10::1/128 + + FC00:10::1/128 + + + HostIP1 + Loopback4096 + + 192.0.0.2/32 + + 192.0.0.2/32 + + + HostIP1 + Loopback4096 + + 2603:10e2:400::2/128 + + 2603:10e2:400::2/128 + + + + + HostIP + eth0 + + 10.3.147.134/23 + + 10.3.147.134/23 + + + V6HostIP + eth0 + + FC00:2::32/64 + + FC00:2::32/64 + + + + + + Ethernet-IB1 + port + 3.3.3.2/32 + + + Ethernet-IB1 + port + 3333::3:2/128 + + + + + + ASIC1 + + + PortChannel106 + Eth64;Eth72 + + + + + + + + PortChannel106 + 10.0.0.6/31 + + + + PortChannel106 + FC00::D/126 + + + + Eth40 + 10.0.0.10/31 + + + + Eth40 + FC00::15/126 + + + + + + SNMP_ACL + SNMP + SNMP + + + ERSPAN + Everflow + Everflow + + + ERSPANV6 + EverflowV6 + EverflowV6 + + + VTY_LINE + ssh-only + SSH + + + PortChannel106;Eth64;Eth40 + DataAcl + DataPlane + + + + + + + + + + HostIP + Loopback0 + + 10.1.0.1/32 + + 10.1.0.1/32 + + + HostIP1 + Loopback0 + + FC00:10::1/128 + + FC00:10::1/128 + + + HostIP1 + Loopback4096 + + 192.0.0.1/32 + + 192.0.0.1/32 + + + HostIP1 + Loopback4096 + + 2603:10e2:400::1/128 + + 2603:10e2:400::1/128 + + + + + HostIP + eth0 + + 10.3.147.134/23 + + 10.3.147.134/23 + + + V6HostIP + eth0 + + FC00:2::32/64 + + FC00:2::32/64 + + + + + + Ethernet-IB0 + port + 3.3.3.1/32 + + + Ethernet-IB0 + port + 3333::3:1/128 + + + + + + ASIC0 + + + PortChannel102 + Eth32;Eth40 + + + + + + + + PortChannel102 + 10.0.0.0/31 + + + + PortChannel102 + FC00::1/126 + + + + Eth128 + 10.0.0.4/31 + + + + Eth128 + FC00::9/126 + + + + + + SNMP_ACL + SNMP + SNMP + + + ERSPAN + Everflow + Everflow + + + ERSPANV6 + EverflowV6 + EverflowV6 + + + VTY_LINE + ssh-only + SSH + + + PortChannel102;Eth32;Eth128 + DataAcl + DataPlane + + + + + + + + + + DeviceInterfaceLink + ARISTA01T3 + Ethernet1 + str2-7250-lc1-1 + Ethernet5/1 + 400000 + + + DeviceInterfaceLink + ARISTA01T3 + Ethernet2 + str2-7250-lc1-1 + Ethernet6/1 + 400000 + + + DeviceInterfaceLink + ARISTA03T3 + Ethernet1 + str2-7250-lc1-1 + Ethernet17/1 + 400000 + + + DeviceInterfaceLink + ARISTA04T3 + Ethernet1 + str2-7250-lc1-1 + Ethernet27/1 + 400000 + + + DeviceInterfaceLink + ARISTA04T3 + Ethernet2 + str2-7250-lc1-1 + Ethernet28/1 + 400000 + + + DeviceInterfaceLink + ARISTA06T3 + Ethernet1 + str2-7250-lc1-1 + Ethernet24/1 + 400000 + + + DeviceInterfaceLink + 400000 + true + ASIC0 + Eth0 + true + str2-7250-lc1-1 + Ethernet1/1 + true + + + DeviceInterfaceLink + 400000 + true + ASIC0 + Eth8 + true + str2-7250-lc1-1 + Ethernet2/1 + true + + + DeviceInterfaceLink + 400000 + true + ASIC0 + Eth16 + true + str2-7250-lc1-1 + Ethernet3/1 + true + + + DeviceInterfaceLink + 400000 + true + ASIC0 + Eth24 + true + str2-7250-lc1-1 + Ethernet4/1 + true + + + DeviceInterfaceLink + 400000 + true + ASIC0 + Eth32 + true + str2-7250-lc1-1 + Ethernet5/1 + true + + + DeviceInterfaceLink + 400000 + true + ASIC0 + Eth40 + true + str2-7250-lc1-1 + Ethernet6/1 + true + + + DeviceInterfaceLink + 400000 + true + ASIC0 + Eth48 + true + str2-7250-lc1-1 + Ethernet7/1 + true + + + DeviceInterfaceLink + 400000 + true + ASIC0 + Eth56 + true + str2-7250-lc1-1 + Ethernet8/1 + true + + + DeviceInterfaceLink + 400000 + true + ASIC0 + Eth64 + true + str2-7250-lc1-1 + Ethernet9/1 + true + + + DeviceInterfaceLink + 400000 + true + ASIC0 + Eth72 + true + str2-7250-lc1-1 + Ethernet10/1 + true + + + DeviceInterfaceLink + 400000 + true + ASIC0 + Eth80 + true + str2-7250-lc1-1 + Ethernet11/1 + true + + + DeviceInterfaceLink + 400000 + true + ASIC0 + Eth88 + true + str2-7250-lc1-1 + Ethernet12/1 + true + + + DeviceInterfaceLink + 400000 + true + ASIC0 + Eth96 + true + str2-7250-lc1-1 + Ethernet13/1 + true + + + DeviceInterfaceLink + 400000 + true + ASIC0 + Eth104 + true + str2-7250-lc1-1 + Ethernet14/1 + true + + + DeviceInterfaceLink + 400000 + true + ASIC0 + Eth112 + true + str2-7250-lc1-1 + Ethernet15/1 + true + + + DeviceInterfaceLink + 400000 + true + ASIC0 + Eth120 + true + str2-7250-lc1-1 + Ethernet16/1 + true + + + DeviceInterfaceLink + 400000 + true + ASIC0 + Eth128 + true + str2-7250-lc1-1 + Ethernet17/1 + true + + + DeviceInterfaceLink + 400000 + true + ASIC0 + Eth136 + true + str2-7250-lc1-1 + Ethernet18/1 + true + + + DeviceInterfaceLink + 400000 + true + ASIC1 + Eth0 + true + str2-7250-lc1-1 + Ethernet19/1 + true + + + DeviceInterfaceLink + 400000 + true + ASIC1 + Eth8 + true + str2-7250-lc1-1 + Ethernet20/1 + true + + + DeviceInterfaceLink + 400000 + true + ASIC1 + Eth16 + true + str2-7250-lc1-1 + Ethernet21/1 + true + + + DeviceInterfaceLink + 400000 + true + ASIC1 + Eth24 + true + str2-7250-lc1-1 + Ethernet22/1 + true + + + DeviceInterfaceLink + 400000 + true + ASIC1 + Eth32 + true + str2-7250-lc1-1 + Ethernet23/1 + true + + + DeviceInterfaceLink + 400000 + true + ASIC1 + Eth40 + true + str2-7250-lc1-1 + Ethernet24/1 + true + + + DeviceInterfaceLink + 400000 + true + ASIC1 + Eth48 + true + str2-7250-lc1-1 + Ethernet25/1 + true + + + DeviceInterfaceLink + 400000 + true + ASIC1 + Eth56 + true + str2-7250-lc1-1 + Ethernet26/1 + true + + + DeviceInterfaceLink + 400000 + true + ASIC1 + Eth64 + true + str2-7250-lc1-1 + Ethernet27/1 + true + + + DeviceInterfaceLink + 400000 + true + ASIC1 + Eth72 + true + str2-7250-lc1-1 + Ethernet28/1 + true + + + DeviceInterfaceLink + 400000 + true + ASIC1 + Eth80 + true + str2-7250-lc1-1 + Ethernet29/1 + true + + + DeviceInterfaceLink + 400000 + true + ASIC1 + Eth88 + true + str2-7250-lc1-1 + Ethernet30/1 + true + + + DeviceInterfaceLink + 400000 + true + ASIC1 + Eth96 + true + str2-7250-lc1-1 + Ethernet31/1 + true + + + DeviceInterfaceLink + 400000 + true + ASIC1 + Eth104 + true + str2-7250-lc1-1 + Ethernet32/1 + true + + + DeviceInterfaceLink + 400000 + true + ASIC1 + Eth112 + true + str2-7250-lc1-1 + Ethernet33/1 + true + + + DeviceInterfaceLink + 400000 + true + ASIC1 + Eth120 + true + str2-7250-lc1-1 + Ethernet34/1 + true + + + DeviceInterfaceLink + 400000 + true + ASIC1 + Eth128 + true + str2-7250-lc1-1 + Ethernet35/1 + true + + + DeviceInterfaceLink + 400000 + true + ASIC1 + Eth136 + true + str2-7250-lc1-1 + Ethernet36/1 + true + + + + + str2-7250-lc1-1 + Nokia-IXR7250E-36x400G + + 10.3.147.134 + + + + ARISTA06T3 + + 172.16.148.107 + + Arista-VM + + + ARISTA03T3 + + 172.16.148.105 + + Arista-VM + + + ARISTA04T3 + + 172.16.148.106 + + Arista-VM + + + ARISTA01T3 + + 172.16.148.104 + + Arista-VM + + + Asic +
+ 0.0.0.0/0 +
+ + ::/0 + + + + + + + + + + 0.0.0.0/0 + + + ::/0 + + + ASIC0 + Broadcom-Trident2 + + + Asic +
+ 0.0.0.0/0 +
+ + ::/0 + + + + + + + + + + 0.0.0.0/0 + + + ::/0 + + + ASIC1 + Broadcom-Trident2 + + + + + + true + + + DeviceInterface + + true + true + 1 + Ethernet1/1 + + false + 0 + 0 + 400000 + + + DeviceInterface + + true + true + 1 + Ethernet2/1 + + false + 0 + 0 + 400000 + + + DeviceInterface + + true + true + 1 + Ethernet3/1 + + false + 0 + 0 + 400000 + + + DeviceInterface + + true + true + 1 + Ethernet4/1 + + false + 0 + 0 + 400000 + + + DeviceInterface + + true + true + 1 + Ethernet5/1 + + false + 0 + 0 + 400000 + + + DeviceInterface + + true + true + 1 + Ethernet6/1 + + false + 0 + 0 + 400000 + + + DeviceInterface + + true + true + 1 + Ethernet7/1 + + false + 0 + 0 + 400000 + + + DeviceInterface + + true + true + 1 + Ethernet8/1 + + false + 0 + 0 + 400000 + + + DeviceInterface + + true + true + 1 + Ethernet9/1 + + false + 0 + 0 + 400000 + + + DeviceInterface + + true + true + 1 + Ethernet10/1 + + false + 0 + 0 + 400000 + + + DeviceInterface + + true + true + 1 + Ethernet11/1 + + false + 0 + 0 + 400000 + + + DeviceInterface + + true + true + 1 + Ethernet12/1 + + false + 0 + 0 + 400000 + + + DeviceInterface + + true + true + 1 + Ethernet13/1 + + false + 0 + 0 + 400000 + + + DeviceInterface + + true + true + 1 + Ethernet14/1 + + false + 0 + 0 + 400000 + + + DeviceInterface + + true + true + 1 + Ethernet15/1 + + false + 0 + 0 + 400000 + + + DeviceInterface + + true + true + 1 + Ethernet16/1 + + false + 0 + 0 + 400000 + + + DeviceInterface + + true + true + 1 + Ethernet17/1 + + false + 0 + 0 + 400000 + + + DeviceInterface + + true + true + 1 + Ethernet18/1 + + false + 0 + 0 + 400000 + + + DeviceInterface + + true + true + 1 + Ethernet19/1 + + false + 0 + 0 + 400000 + + + DeviceInterface + + true + true + 1 + Ethernet20/1 + + false + 0 + 0 + 400000 + + + DeviceInterface + + true + true + 1 + Ethernet21/1 + + false + 0 + 0 + 400000 + + + DeviceInterface + + true + true + 1 + Ethernet22/1 + + false + 0 + 0 + 400000 + + + DeviceInterface + + true + true + 1 + Ethernet23/1 + + false + 0 + 0 + 400000 + + + DeviceInterface + + true + true + 1 + Ethernet24/1 + + false + 0 + 0 + 400000 + + + DeviceInterface + + true + true + 1 + Ethernet25/1 + + false + 0 + 0 + 400000 + + + DeviceInterface + + true + true + 1 + Ethernet26/1 + + false + 0 + 0 + 400000 + + + DeviceInterface + + true + true + 1 + Ethernet27/1 + + false + 0 + 0 + 400000 + + + DeviceInterface + + true + true + 1 + Ethernet28/1 + + false + 0 + 0 + 400000 + + + DeviceInterface + + true + true + 1 + Ethernet29/1 + + false + 0 + 0 + 400000 + + + DeviceInterface + + true + true + 1 + Ethernet30/1 + + false + 0 + 0 + 400000 + + + DeviceInterface + + true + true + 1 + Ethernet31/1 + + false + 0 + 0 + 400000 + + + DeviceInterface + + true + true + 1 + Ethernet32/1 + + false + 0 + 0 + 400000 + + + DeviceInterface + + true + true + 1 + Ethernet33/1 + + false + 0 + 0 + 400000 + + + DeviceInterface + + true + true + 1 + Ethernet34/1 + + false + 0 + 0 + 400000 + + + DeviceInterface + + true + true + 1 + Ethernet35/1 + + false + 0 + 0 + 400000 + + + DeviceInterface + + true + true + 1 + Ethernet36/1 + + false + 0 + 0 + 400000 + + + DeviceInterface + + true + true + 1 + Recirc0/0 + + false + 0 + 0 + 10000 + + + DeviceInterface + + true + true + 1 + Recirc1/0 + + false + 0 + 0 + 10000 + + + DeviceInterface + + true + true + 1 + Recirc0/1 + + false + 0 + 0 + 10000 + + + DeviceInterface + + true + true + 1 + Recirc1/1 + + false + 0 + 0 + 10000 + + + + + Cpu0 + str2-7250-lc1-1 + asic0 + 10000 + 0 + 0 + 0 + 0 + 8 + + + Ethernet0 + str2-7250-lc1-1 + asic0 + 400000 + 1 + 0 + 1 + 1 + 8 + + + Ethernet8 + str2-7250-lc1-1 + asic0 + 400000 + 2 + 0 + 1 + 2 + 8 + + + Ethernet16 + str2-7250-lc1-1 + asic0 + 400000 + 3 + 0 + 1 + 3 + 8 + + + Ethernet24 + str2-7250-lc1-1 + asic0 + 400000 + 4 + 0 + 1 + 4 + 8 + + + Ethernet32 + str2-7250-lc1-1 + asic0 + 400000 + 5 + 0 + 1 + 5 + 8 + + + Ethernet40 + str2-7250-lc1-1 + asic0 + 400000 + 6 + 0 + 1 + 6 + 8 + + + Ethernet48 + str2-7250-lc1-1 + asic0 + 400000 + 7 + 0 + 1 + 7 + 8 + + + Ethernet56 + str2-7250-lc1-1 + asic0 + 400000 + 8 + 0 + 1 + 8 + 8 + + + Ethernet64 + str2-7250-lc1-1 + asic0 + 400000 + 9 + 0 + 1 + 9 + 8 + + + Ethernet72 + str2-7250-lc1-1 + asic0 + 400000 + 10 + 0 + 0 + 10 + 8 + + + Ethernet80 + str2-7250-lc1-1 + asic0 + 400000 + 11 + 0 + 0 + 11 + 8 + + + Ethernet88 + str2-7250-lc1-1 + asic0 + 400000 + 12 + 0 + 0 + 12 + 8 + + + Ethernet96 + str2-7250-lc1-1 + asic0 + 400000 + 13 + 0 + 0 + 13 + 8 + + + Ethernet104 + str2-7250-lc1-1 + asic0 + 400000 + 14 + 0 + 0 + 14 + 8 + + + Ethernet112 + str2-7250-lc1-1 + asic0 + 400000 + 15 + 0 + 0 + 15 + 8 + + + Ethernet120 + str2-7250-lc1-1 + asic0 + 400000 + 16 + 0 + 0 + 16 + 8 + + + Ethernet128 + str2-7250-lc1-1 + asic0 + 400000 + 17 + 0 + 0 + 17 + 8 + + + Ethernet136 + str2-7250-lc1-1 + asic0 + 400000 + 18 + 0 + 0 + 18 + 8 + + + Ethernet-IB0 + str2-7250-lc1-1 + asic0 + 10000 + 19 + 0 + 0 + 19 + 8 + + + Ethernet-Rec0 + str2-7250-lc1-1 + asic0 + 10000 + 20 + 0 + 1 + 20 + 8 + + + Cpu0 + str2-7250-lc1-1 + asic1 + 10000 + 21 + 2 + 0 + 0 + 8 + + + Ethernet144 + str2-7250-lc1-1 + asic1 + 400000 + 22 + 2 + 1 + 1 + 8 + + + Ethernet152 + str2-7250-lc1-1 + asic1 + 400000 + 23 + 2 + 1 + 2 + 8 + + + Ethernet160 + str2-7250-lc1-1 + asic1 + 400000 + 24 + 2 + 1 + 3 + 8 + + + Ethernet168 + str2-7250-lc1-1 + asic1 + 400000 + 25 + 2 + 1 + 4 + 8 + + + Ethernet176 + str2-7250-lc1-1 + asic1 + 400000 + 26 + 2 + 1 + 5 + 8 + + + Ethernet184 + str2-7250-lc1-1 + asic1 + 400000 + 27 + 2 + 1 + 6 + 8 + + + Ethernet192 + str2-7250-lc1-1 + asic1 + 400000 + 28 + 2 + 1 + 7 + 8 + + + Ethernet200 + str2-7250-lc1-1 + asic1 + 400000 + 29 + 2 + 1 + 8 + 8 + + + Ethernet208 + str2-7250-lc1-1 + asic1 + 400000 + 30 + 2 + 1 + 9 + 8 + + + Ethernet216 + str2-7250-lc1-1 + asic1 + 400000 + 31 + 2 + 0 + 10 + 8 + + + Ethernet224 + str2-7250-lc1-1 + asic1 + 400000 + 32 + 2 + 0 + 11 + 8 + + + Ethernet232 + str2-7250-lc1-1 + asic1 + 400000 + 33 + 2 + 0 + 12 + 8 + + + Ethernet240 + str2-7250-lc1-1 + asic1 + 400000 + 34 + 2 + 0 + 13 + 8 + + + Ethernet248 + str2-7250-lc1-1 + asic1 + 400000 + 35 + 2 + 0 + 14 + 8 + + + Ethernet256 + str2-7250-lc1-1 + asic1 + 400000 + 36 + 2 + 0 + 15 + 8 + + + Ethernet264 + str2-7250-lc1-1 + asic1 + 400000 + 37 + 2 + 0 + 16 + 8 + + + Ethernet272 + str2-7250-lc1-1 + asic1 + 400000 + 38 + 2 + 0 + 17 + 8 + + + Ethernet280 + str2-7250-lc1-1 + asic1 + 400000 + 39 + 2 + 0 + 18 + 8 + + + Ethernet-IB1 + str2-7250-lc1-1 + asic1 + 10000 + 40 + 2 + 0 + 19 + 8 + + + Ethernet-Rec1 + str2-7250-lc1-1 + asic1 + 10000 + 41 + 2 + 1 + 20 + 8 + + + Cpu0 + str2-7250-lc2-1 + asic0 + 10000 + 42 + 6 + 0 + 0 + 8 + + + Ethernet0 + str2-7250-lc2-1 + asic0 + 400000 + 43 + 6 + 1 + 1 + 8 + + + Ethernet8 + str2-7250-lc2-1 + asic0 + 400000 + 44 + 6 + 1 + 2 + 8 + + + Ethernet16 + str2-7250-lc2-1 + asic0 + 400000 + 45 + 6 + 1 + 3 + 8 + + + Ethernet24 + str2-7250-lc2-1 + asic0 + 400000 + 46 + 6 + 1 + 4 + 8 + + + Ethernet32 + str2-7250-lc2-1 + asic0 + 400000 + 47 + 6 + 1 + 5 + 8 + + + Ethernet40 + str2-7250-lc2-1 + asic0 + 400000 + 48 + 6 + 1 + 6 + 8 + + + Ethernet48 + str2-7250-lc2-1 + asic0 + 400000 + 49 + 6 + 1 + 7 + 8 + + + Ethernet56 + str2-7250-lc2-1 + asic0 + 400000 + 50 + 6 + 1 + 8 + 8 + + + Ethernet64 + str2-7250-lc2-1 + asic0 + 400000 + 51 + 6 + 1 + 9 + 8 + + + Ethernet72 + str2-7250-lc2-1 + asic0 + 400000 + 52 + 6 + 0 + 10 + 8 + + + Ethernet80 + str2-7250-lc2-1 + asic0 + 400000 + 53 + 6 + 0 + 11 + 8 + + + Ethernet88 + str2-7250-lc2-1 + asic0 + 400000 + 54 + 6 + 0 + 12 + 8 + + + Ethernet96 + str2-7250-lc2-1 + asic0 + 400000 + 55 + 6 + 0 + 13 + 8 + + + Ethernet104 + str2-7250-lc2-1 + asic0 + 400000 + 56 + 6 + 0 + 14 + 8 + + + Ethernet112 + str2-7250-lc2-1 + asic0 + 400000 + 57 + 6 + 0 + 15 + 8 + + + Ethernet120 + str2-7250-lc2-1 + asic0 + 400000 + 58 + 6 + 0 + 16 + 8 + + + Ethernet128 + str2-7250-lc2-1 + asic0 + 400000 + 59 + 6 + 0 + 17 + 8 + + + Ethernet136 + str2-7250-lc2-1 + asic0 + 400000 + 60 + 6 + 0 + 18 + 8 + + + Ethernet-IB0 + str2-7250-lc2-1 + asic0 + 10000 + 61 + 6 + 0 + 19 + 8 + + + Ethernet-Rec0 + str2-7250-lc2-1 + asic0 + 10000 + 62 + 6 + 1 + 20 + 8 + + + Cpu0 + str2-7250-lc2-1 + asic1 + 10000 + 63 + 8 + 0 + 0 + 8 + + + Ethernet144 + str2-7250-lc2-1 + asic1 + 400000 + 64 + 8 + 1 + 1 + 8 + + + Ethernet152 + str2-7250-lc2-1 + asic1 + 400000 + 65 + 8 + 1 + 2 + 8 + + + Ethernet160 + str2-7250-lc2-1 + asic1 + 400000 + 66 + 8 + 1 + 3 + 8 + + + Ethernet168 + str2-7250-lc2-1 + asic1 + 400000 + 67 + 8 + 1 + 4 + 8 + + + Ethernet176 + str2-7250-lc2-1 + asic1 + 400000 + 68 + 8 + 1 + 5 + 8 + + + Ethernet184 + str2-7250-lc2-1 + asic1 + 400000 + 69 + 8 + 1 + 6 + 8 + + + Ethernet192 + str2-7250-lc2-1 + asic1 + 400000 + 70 + 8 + 1 + 7 + 8 + + + Ethernet200 + str2-7250-lc2-1 + asic1 + 400000 + 71 + 8 + 1 + 8 + 8 + + + Ethernet208 + str2-7250-lc2-1 + asic1 + 400000 + 72 + 8 + 1 + 9 + 8 + + + Ethernet216 + str2-7250-lc2-1 + asic1 + 400000 + 73 + 8 + 0 + 10 + 8 + + + Ethernet224 + str2-7250-lc2-1 + asic1 + 400000 + 74 + 8 + 0 + 11 + 8 + + + Ethernet232 + str2-7250-lc2-1 + asic1 + 400000 + 75 + 8 + 0 + 12 + 8 + + + Ethernet240 + str2-7250-lc2-1 + asic1 + 400000 + 76 + 8 + 0 + 13 + 8 + + + Ethernet248 + str2-7250-lc2-1 + asic1 + 400000 + 77 + 8 + 0 + 14 + 8 + + + Ethernet256 + str2-7250-lc2-1 + asic1 + 400000 + 78 + 8 + 0 + 15 + 8 + + + Ethernet264 + str2-7250-lc2-1 + asic1 + 400000 + 79 + 8 + 0 + 16 + 8 + + + Ethernet272 + str2-7250-lc2-1 + asic1 + 400000 + 80 + 8 + 0 + 17 + 8 + + + Ethernet280 + str2-7250-lc2-1 + asic1 + 400000 + 81 + 8 + 0 + 18 + 8 + + + Ethernet-IB1 + str2-7250-lc2-1 + asic1 + 10000 + 82 + 8 + 0 + 19 + 8 + + + Ethernet-Rec1 + str2-7250-lc2-1 + asic1 + 10000 + 83 + 8 + 1 + 20 + 8 + + + true + 0 + Nokia-IXR7250E-36x400G + + + + + + + str2-7250-lc1-1 + + + DeploymentId + + 1 + + + QosProfile + + Profile0 + + + DhcpResources + + 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 + + + NtpResources + + 10.20.8.129;10.20.8.130 + + + SnmpResources + + 10.3.145.98 + + + SyslogResources + + 10.64.246.95 + + + TacacsGroup + + Starlab + + + TacacsServer + + 10.3.145.14;10.3.145.15 + + + ForcedMgmtRoutes + + 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.64.246.0/23;10.3.146.0/23;10.64.5.5;10.201.148.32/28 + + + ErspanDestinationIpv4 + + 10.20.6.16 + + + SwitchType + + voq + + + MaxCores + + 48 + + + + + ASIC0 + + + SubRole + + FrontEnd + + + SwitchType + + voq + + + SwitchId + + 0 + + + MaxCores + + 48 + + + + + ASIC1 + + + SubRole + + FrontEnd + + + SwitchType + + voq + + + SwitchId + + 2 + + + MaxCores + + 48 + + + + + ASIC1 + + + DeploymentId + + 1 + + + SubRole + + FrontEnd + + + SwitchType + + voq + + + + + ASIC0 + + + DeploymentId + + 1 + + + SubRole + + FrontEnd + + + SwitchType + + voq + + + + + + + str2-7250-lc1-1 + Nokia-IXR7250E-36x400G + diff --git a/src/sonic-config-engine/tests/sample_output/py2/buffer-arista7800r3-48cq2-lc.json b/src/sonic-config-engine/tests/sample_output/py2/buffer-arista7800r3-48cq2-lc.json index aa8dab48684a..305640a45d69 100644 --- a/src/sonic-config-engine/tests/sample_output/py2/buffer-arista7800r3-48cq2-lc.json +++ b/src/sonic-config-engine/tests/sample_output/py2/buffer-arista7800r3-48cq2-lc.json @@ -57,7 +57,7 @@ "size": "6441610000", "type": "both", "mode": "dynamic", - "xoff": "11678515" + "xoff": "20761804" } }, "BUFFER_PROFILE": { diff --git a/src/sonic-config-engine/tests/sample_output/py2/buffer-arista7800r3-48cqm2-lc.json b/src/sonic-config-engine/tests/sample_output/py2/buffer-arista7800r3-48cqm2-lc.json new file mode 100644 index 000000000000..8dacec342179 --- /dev/null +++ b/src/sonic-config-engine/tests/sample_output/py2/buffer-arista7800r3-48cqm2-lc.json @@ -0,0 +1,1517 @@ +{ + "CABLE_LENGTH": { + "AZURE": { + "Ethernet180": "300m", + "Ethernet8": "300m", + "Ethernet184": "300m", + "Ethernet188": "300m", + "Ethernet0": "300m", + "Ethernet4": "300m", + "Ethernet108": "300m", + "Ethernet100": "300m", + "Ethernet128": "300m", + "Ethernet104": "300m", + "Ethernet68": "300m", + "Ethernet96": "300m", + "Ethernet124": "300m", + "Ethernet148": "300m", + "Ethernet92": "300m", + "Ethernet120": "300m", + "Ethernet144": "300m", + "Ethernet52": "300m", + "Ethernet160": "300m", + "Ethernet140": "300m", + "Ethernet56": "300m", + "Ethernet164": "300m", + "Ethernet76": "300m", + "Ethernet72": "300m", + "Ethernet64": "300m", + "Ethernet32": "300m", + "Ethernet16": "300m", + "Ethernet36": "300m", + "Ethernet12": "300m", + "Ethernet168": "300m", + "Ethernet116": "300m", + "Ethernet80": "300m", + "Ethernet112": "300m", + "Ethernet84": "300m", + "Ethernet152": "300m", + "Ethernet136": "300m", + "Ethernet156": "300m", + "Ethernet132": "300m", + "Ethernet48": "300m", + "Ethernet172": "300m", + "Ethernet44": "300m", + "Ethernet176": "300m", + "Ethernet40": "300m", + "Ethernet28": "300m", + "Ethernet88": "300m", + "Ethernet60": "300m", + "Ethernet20": "300m", + "Ethernet24": "300m" + } + }, + + "BUFFER_POOL": { + "ingress_lossless_pool": { + "size": "6441610000", + "type": "both", + "mode": "dynamic", + "xoff": "1056256819" + } + }, + "BUFFER_PROFILE": { + "ingress_lossy_profile": { + "pool":"ingress_lossless_pool", + "size":"1280", + "xon_offset":"2560", + "dynamic_th":"0" + }, + "egress_lossless_profile": { + "pool":"ingress_lossless_pool", + "size":"0", + "static_th":"33030144" + }, + "egress_lossy_profile": { + "pool":"ingress_lossless_pool", + "size":"0", + "dynamic_th":"-1" + } + }, + "BUFFER_PG": { + "Ethernet180|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet8|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet184|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet188|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet0|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet4|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet108|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet100|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet128|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet104|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet68|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet96|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet124|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet148|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet92|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet120|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet144|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet52|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet140|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet56|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet164|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet76|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet72|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet64|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet32|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet16|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet36|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet12|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet88|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet116|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet80|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet112|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet84|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet152|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet136|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet156|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet132|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet48|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet44|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet176|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet40|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet28|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet60|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet20|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet24|0": { + "profile" : "ingress_lossy_profile" + } + }, + + "BUFFER_QUEUE": { + "dut-lc3|Asic0|Ethernet0|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc3|Asic0|Ethernet4|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc3|Asic0|Ethernet8|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc3|Asic0|Ethernet12|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc3|Asic0|Ethernet16|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc3|Asic0|Ethernet20|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc3|Asic0|Ethernet24|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc3|Asic0|Ethernet28|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc3|Asic0|Ethernet32|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc3|Asic0|Ethernet36|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc3|Asic0|Ethernet40|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc3|Asic0|Ethernet44|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc3|Asic0|Ethernet48|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc3|Asic0|Ethernet52|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc3|Asic0|Ethernet56|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc3|Asic0|Ethernet60|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc3|Asic0|Ethernet64|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc3|Asic0|Ethernet68|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc3|Asic0|Ethernet72|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc3|Asic0|Ethernet76|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc3|Asic0|Ethernet80|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc3|Asic0|Ethernet84|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc3|Asic0|Ethernet88|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc3|Asic0|Ethernet92|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc3|Asic0|Ethernet96|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc3|Asic0|Ethernet100|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc3|Asic0|Ethernet104|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc3|Asic0|Ethernet108|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc3|Asic0|Ethernet112|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc3|Asic0|Ethernet116|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc3|Asic0|Ethernet120|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc3|Asic0|Ethernet124|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc3|Asic0|Ethernet128|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc3|Asic0|Ethernet132|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc3|Asic0|Ethernet136|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc3|Asic0|Ethernet140|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc3|Asic0|Ethernet144|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc3|Asic0|Ethernet148|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc3|Asic0|Ethernet152|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc3|Asic0|Ethernet156|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc3|Asic0|Ethernet160|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc3|Asic0|Ethernet164|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc3|Asic0|Ethernet168|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc3|Asic0|Ethernet172|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc3|Asic0|Ethernet176|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc3|Asic0|Ethernet180|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc3|Asic0|Ethernet184|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc3|Asic0|Ethernet188|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc4|Asic0|Ethernet0|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc4|Asic0|Ethernet4|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc4|Asic0|Ethernet8|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc4|Asic0|Ethernet12|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc4|Asic0|Ethernet16|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc4|Asic0|Ethernet20|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc4|Asic0|Ethernet24|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc4|Asic0|Ethernet28|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc4|Asic0|Ethernet32|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc4|Asic0|Ethernet36|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc4|Asic0|Ethernet40|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc4|Asic0|Ethernet44|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc4|Asic0|Ethernet48|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc4|Asic0|Ethernet52|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc4|Asic0|Ethernet56|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc4|Asic0|Ethernet60|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc4|Asic0|Ethernet64|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc4|Asic0|Ethernet68|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc4|Asic0|Ethernet72|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc4|Asic0|Ethernet76|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc4|Asic0|Ethernet80|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc4|Asic0|Ethernet84|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc4|Asic0|Ethernet88|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc4|Asic0|Ethernet92|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc4|Asic0|Ethernet96|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc4|Asic0|Ethernet100|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc4|Asic0|Ethernet104|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc4|Asic0|Ethernet108|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc4|Asic0|Ethernet112|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc4|Asic0|Ethernet116|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc4|Asic0|Ethernet120|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc4|Asic0|Ethernet124|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc4|Asic0|Ethernet128|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc4|Asic0|Ethernet132|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc4|Asic0|Ethernet136|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc4|Asic0|Ethernet140|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc4|Asic0|Ethernet144|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc4|Asic0|Ethernet148|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc4|Asic0|Ethernet152|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc4|Asic0|Ethernet156|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc4|Asic0|Ethernet160|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc4|Asic0|Ethernet164|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc4|Asic0|Ethernet168|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc4|Asic0|Ethernet172|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc4|Asic0|Ethernet176|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc4|Asic0|Ethernet180|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc4|Asic0|Ethernet184|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc4|Asic0|Ethernet188|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc5|Asic0|Ethernet0|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc5|Asic0|Ethernet4|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc5|Asic0|Ethernet8|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc5|Asic0|Ethernet12|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc5|Asic0|Ethernet16|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc5|Asic0|Ethernet20|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc5|Asic0|Ethernet24|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc5|Asic0|Ethernet28|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc5|Asic0|Ethernet32|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc5|Asic0|Ethernet36|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc5|Asic0|Ethernet40|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc5|Asic0|Ethernet44|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc5|Asic0|Ethernet48|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc5|Asic0|Ethernet52|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc5|Asic0|Ethernet56|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc5|Asic0|Ethernet60|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc5|Asic0|Ethernet64|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc5|Asic0|Ethernet68|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc5|Asic0|Ethernet72|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc5|Asic0|Ethernet76|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc5|Asic0|Ethernet80|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc5|Asic0|Ethernet84|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc5|Asic0|Ethernet88|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc5|Asic0|Ethernet92|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc5|Asic0|Ethernet96|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc5|Asic0|Ethernet100|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc5|Asic0|Ethernet104|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc5|Asic0|Ethernet108|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc5|Asic0|Ethernet112|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc5|Asic0|Ethernet116|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc5|Asic0|Ethernet120|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc5|Asic0|Ethernet124|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc5|Asic0|Ethernet128|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc5|Asic0|Ethernet132|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc5|Asic0|Ethernet136|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc5|Asic0|Ethernet140|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc5|Asic0|Ethernet144|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc5|Asic0|Ethernet148|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc5|Asic0|Ethernet152|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc5|Asic0|Ethernet156|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc5|Asic0|Ethernet160|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc5|Asic0|Ethernet164|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc5|Asic0|Ethernet168|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc5|Asic0|Ethernet172|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc5|Asic0|Ethernet176|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc5|Asic0|Ethernet180|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc5|Asic0|Ethernet184|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc5|Asic0|Ethernet188|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc3|Asic0|Ethernet0|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc3|Asic0|Ethernet4|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc3|Asic0|Ethernet8|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc3|Asic0|Ethernet12|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc3|Asic0|Ethernet16|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc3|Asic0|Ethernet20|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc3|Asic0|Ethernet24|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc3|Asic0|Ethernet28|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc3|Asic0|Ethernet32|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc3|Asic0|Ethernet36|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc3|Asic0|Ethernet40|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc3|Asic0|Ethernet44|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc3|Asic0|Ethernet48|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc3|Asic0|Ethernet52|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc3|Asic0|Ethernet56|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc3|Asic0|Ethernet60|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc3|Asic0|Ethernet64|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc3|Asic0|Ethernet68|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc3|Asic0|Ethernet72|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc3|Asic0|Ethernet76|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc3|Asic0|Ethernet80|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc3|Asic0|Ethernet84|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc3|Asic0|Ethernet88|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc3|Asic0|Ethernet92|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc3|Asic0|Ethernet96|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc3|Asic0|Ethernet100|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc3|Asic0|Ethernet104|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc3|Asic0|Ethernet108|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc3|Asic0|Ethernet112|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc3|Asic0|Ethernet116|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc3|Asic0|Ethernet120|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc3|Asic0|Ethernet124|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc3|Asic0|Ethernet128|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc3|Asic0|Ethernet132|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc3|Asic0|Ethernet136|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc3|Asic0|Ethernet140|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc3|Asic0|Ethernet144|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc3|Asic0|Ethernet148|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc3|Asic0|Ethernet152|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc3|Asic0|Ethernet156|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc3|Asic0|Ethernet160|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc3|Asic0|Ethernet164|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc3|Asic0|Ethernet168|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc3|Asic0|Ethernet172|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc3|Asic0|Ethernet176|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc3|Asic0|Ethernet180|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc3|Asic0|Ethernet184|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc3|Asic0|Ethernet188|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc4|Asic0|Ethernet0|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc4|Asic0|Ethernet4|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc4|Asic0|Ethernet8|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc4|Asic0|Ethernet12|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc4|Asic0|Ethernet16|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc4|Asic0|Ethernet20|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc4|Asic0|Ethernet24|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc4|Asic0|Ethernet28|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc4|Asic0|Ethernet32|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc4|Asic0|Ethernet36|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc4|Asic0|Ethernet40|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc4|Asic0|Ethernet44|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc4|Asic0|Ethernet48|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc4|Asic0|Ethernet52|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc4|Asic0|Ethernet56|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc4|Asic0|Ethernet60|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc4|Asic0|Ethernet64|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc4|Asic0|Ethernet68|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc4|Asic0|Ethernet72|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc4|Asic0|Ethernet76|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc4|Asic0|Ethernet80|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc4|Asic0|Ethernet84|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc4|Asic0|Ethernet88|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc4|Asic0|Ethernet92|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc4|Asic0|Ethernet96|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc4|Asic0|Ethernet100|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc4|Asic0|Ethernet104|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc4|Asic0|Ethernet108|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc4|Asic0|Ethernet112|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc4|Asic0|Ethernet116|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc4|Asic0|Ethernet120|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc4|Asic0|Ethernet124|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc4|Asic0|Ethernet128|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc4|Asic0|Ethernet132|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc4|Asic0|Ethernet136|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc4|Asic0|Ethernet140|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc4|Asic0|Ethernet144|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc4|Asic0|Ethernet148|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc4|Asic0|Ethernet152|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc4|Asic0|Ethernet156|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc4|Asic0|Ethernet160|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc4|Asic0|Ethernet164|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc4|Asic0|Ethernet168|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc4|Asic0|Ethernet172|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc4|Asic0|Ethernet176|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc4|Asic0|Ethernet180|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc4|Asic0|Ethernet184|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc4|Asic0|Ethernet188|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc5|Asic0|Ethernet0|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc5|Asic0|Ethernet4|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc5|Asic0|Ethernet8|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc5|Asic0|Ethernet12|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc5|Asic0|Ethernet16|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc5|Asic0|Ethernet20|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc5|Asic0|Ethernet24|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc5|Asic0|Ethernet28|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc5|Asic0|Ethernet32|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc5|Asic0|Ethernet36|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc5|Asic0|Ethernet40|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc5|Asic0|Ethernet44|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc5|Asic0|Ethernet48|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc5|Asic0|Ethernet52|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc5|Asic0|Ethernet56|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc5|Asic0|Ethernet60|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc5|Asic0|Ethernet64|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc5|Asic0|Ethernet68|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc5|Asic0|Ethernet72|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc5|Asic0|Ethernet76|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc5|Asic0|Ethernet80|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc5|Asic0|Ethernet84|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc5|Asic0|Ethernet88|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc5|Asic0|Ethernet92|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc5|Asic0|Ethernet96|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc5|Asic0|Ethernet100|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc5|Asic0|Ethernet104|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc5|Asic0|Ethernet108|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc5|Asic0|Ethernet112|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc5|Asic0|Ethernet116|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc5|Asic0|Ethernet120|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc5|Asic0|Ethernet124|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc5|Asic0|Ethernet128|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc5|Asic0|Ethernet132|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc5|Asic0|Ethernet136|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc5|Asic0|Ethernet140|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc5|Asic0|Ethernet144|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc5|Asic0|Ethernet148|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc5|Asic0|Ethernet152|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc5|Asic0|Ethernet156|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc5|Asic0|Ethernet160|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc5|Asic0|Ethernet164|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc5|Asic0|Ethernet168|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc5|Asic0|Ethernet172|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc5|Asic0|Ethernet176|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc5|Asic0|Ethernet180|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc5|Asic0|Ethernet184|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc5|Asic0|Ethernet188|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc3|Asic0|Ethernet0|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc3|Asic0|Ethernet4|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc3|Asic0|Ethernet8|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc3|Asic0|Ethernet12|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc3|Asic0|Ethernet16|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc3|Asic0|Ethernet20|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc3|Asic0|Ethernet24|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc3|Asic0|Ethernet28|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc3|Asic0|Ethernet32|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc3|Asic0|Ethernet36|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc3|Asic0|Ethernet40|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc3|Asic0|Ethernet44|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc3|Asic0|Ethernet48|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc3|Asic0|Ethernet52|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc3|Asic0|Ethernet56|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc3|Asic0|Ethernet60|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc3|Asic0|Ethernet64|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc3|Asic0|Ethernet68|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc3|Asic0|Ethernet72|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc3|Asic0|Ethernet76|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc3|Asic0|Ethernet80|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc3|Asic0|Ethernet84|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc3|Asic0|Ethernet88|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc3|Asic0|Ethernet92|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc3|Asic0|Ethernet96|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc3|Asic0|Ethernet100|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc3|Asic0|Ethernet104|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc3|Asic0|Ethernet108|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc3|Asic0|Ethernet112|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc3|Asic0|Ethernet116|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc3|Asic0|Ethernet120|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc3|Asic0|Ethernet124|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc3|Asic0|Ethernet128|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc3|Asic0|Ethernet132|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc3|Asic0|Ethernet136|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc3|Asic0|Ethernet140|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc3|Asic0|Ethernet144|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc3|Asic0|Ethernet148|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc3|Asic0|Ethernet152|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc3|Asic0|Ethernet156|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc3|Asic0|Ethernet160|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc3|Asic0|Ethernet164|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc3|Asic0|Ethernet168|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc3|Asic0|Ethernet172|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc3|Asic0|Ethernet176|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc3|Asic0|Ethernet180|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc3|Asic0|Ethernet184|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc3|Asic0|Ethernet188|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc4|Asic0|Ethernet0|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc4|Asic0|Ethernet4|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc4|Asic0|Ethernet8|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc4|Asic0|Ethernet12|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc4|Asic0|Ethernet16|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc4|Asic0|Ethernet20|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc4|Asic0|Ethernet24|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc4|Asic0|Ethernet28|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc4|Asic0|Ethernet32|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc4|Asic0|Ethernet36|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc4|Asic0|Ethernet40|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc4|Asic0|Ethernet44|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc4|Asic0|Ethernet48|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc4|Asic0|Ethernet52|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc4|Asic0|Ethernet56|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc4|Asic0|Ethernet60|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc4|Asic0|Ethernet64|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc4|Asic0|Ethernet68|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc4|Asic0|Ethernet72|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc4|Asic0|Ethernet76|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc4|Asic0|Ethernet80|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc4|Asic0|Ethernet84|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc4|Asic0|Ethernet88|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc4|Asic0|Ethernet92|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc4|Asic0|Ethernet96|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc4|Asic0|Ethernet100|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc4|Asic0|Ethernet104|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc4|Asic0|Ethernet108|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc4|Asic0|Ethernet112|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc4|Asic0|Ethernet116|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc4|Asic0|Ethernet120|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc4|Asic0|Ethernet124|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc4|Asic0|Ethernet128|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc4|Asic0|Ethernet132|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc4|Asic0|Ethernet136|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc4|Asic0|Ethernet140|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc4|Asic0|Ethernet144|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc4|Asic0|Ethernet148|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc4|Asic0|Ethernet152|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc4|Asic0|Ethernet156|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc4|Asic0|Ethernet160|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc4|Asic0|Ethernet164|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc4|Asic0|Ethernet168|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc4|Asic0|Ethernet172|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc4|Asic0|Ethernet176|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc4|Asic0|Ethernet180|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc4|Asic0|Ethernet184|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc4|Asic0|Ethernet188|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc5|Asic0|Ethernet0|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc5|Asic0|Ethernet4|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc5|Asic0|Ethernet8|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc5|Asic0|Ethernet12|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc5|Asic0|Ethernet16|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc5|Asic0|Ethernet20|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc5|Asic0|Ethernet24|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc5|Asic0|Ethernet28|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc5|Asic0|Ethernet32|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc5|Asic0|Ethernet36|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc5|Asic0|Ethernet40|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc5|Asic0|Ethernet44|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc5|Asic0|Ethernet48|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc5|Asic0|Ethernet52|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc5|Asic0|Ethernet56|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc5|Asic0|Ethernet60|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc5|Asic0|Ethernet64|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc5|Asic0|Ethernet68|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc5|Asic0|Ethernet72|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc5|Asic0|Ethernet76|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc5|Asic0|Ethernet80|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc5|Asic0|Ethernet84|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc5|Asic0|Ethernet88|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc5|Asic0|Ethernet92|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc5|Asic0|Ethernet96|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc5|Asic0|Ethernet100|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc5|Asic0|Ethernet104|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc5|Asic0|Ethernet108|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc5|Asic0|Ethernet112|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc5|Asic0|Ethernet116|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc5|Asic0|Ethernet120|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc5|Asic0|Ethernet124|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc5|Asic0|Ethernet128|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc5|Asic0|Ethernet132|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc5|Asic0|Ethernet136|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc5|Asic0|Ethernet140|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc5|Asic0|Ethernet144|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc5|Asic0|Ethernet148|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc5|Asic0|Ethernet152|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc5|Asic0|Ethernet156|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc5|Asic0|Ethernet160|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc5|Asic0|Ethernet164|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc5|Asic0|Ethernet168|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc5|Asic0|Ethernet172|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc5|Asic0|Ethernet176|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc5|Asic0|Ethernet180|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc5|Asic0|Ethernet184|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc5|Asic0|Ethernet188|5-6": { + "profile" : "egress_lossy_profile" + } + } +} diff --git a/src/sonic-config-engine/tests/sample_output/py2/buffer-arista7800r3a-36dm2-c36-lc.json b/src/sonic-config-engine/tests/sample_output/py2/buffer-arista7800r3a-36dm2-c36-lc.json new file mode 100644 index 000000000000..fa6b56ab02d9 --- /dev/null +++ b/src/sonic-config-engine/tests/sample_output/py2/buffer-arista7800r3a-36dm2-c36-lc.json @@ -0,0 +1,1299 @@ + { + "CABLE_LENGTH": { + "AZURE": { + "Ethernet0": "5m", + "Ethernet8": "5m", + "Ethernet16": "5m", + "Ethernet24": "5m", + "Ethernet32": "5m", + "Ethernet40": "5m", + "Ethernet48": "5m", + "Ethernet56": "5m", + "Ethernet64": "5m", + "Ethernet72": "5m", + "Ethernet80": "5m", + "Ethernet88": "5m", + "Ethernet96": "5m", + "Ethernet104": "5m", + "Ethernet112": "5m", + "Ethernet120": "5m", + "Ethernet128": "5m", + "Ethernet136": "5m" + } + }, + + "BUFFER_POOL": { + "ingress_lossless_pool": { + "size": "6441610000", + "type": "both", + "mode": "dynamic", + "xoff": "396096307" + } + }, + "BUFFER_PROFILE": { + "ingress_lossy_profile": { + "pool":"ingress_lossless_pool", + "size":"1280", + "xon_offset": "2560", + "dynamic_th":"0" + }, + "egress_lossless_profile": { + "pool":"ingress_lossless_pool", + "size":"0", + "static_th":"33030144" + }, + "egress_lossy_profile": { + "pool":"ingress_lossless_pool", + "size":"0", + "dynamic_th":"-1" + } + }, + + "BUFFER_PG": { + "Ethernet0|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet8|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet16|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet24|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet32|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet40|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet48|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet56|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet64|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet72|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet80|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet88|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet96|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet104|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet112|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet120|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet128|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet136|0": { + "profile" : "ingress_lossy_profile" + } + }, + + "BUFFER_QUEUE": { + "str2-7804-lc3-1|Asic0|Ethernet0|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet4|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet8|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet12|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet16|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet20|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet24|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet28|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet32|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet36|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet40|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet44|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet48|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet52|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet56|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet60|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet64|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet68|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet72|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet76|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet80|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet84|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet88|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet92|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet96|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet100|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet104|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet108|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet112|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet116|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet120|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet124|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet128|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet132|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet136|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet140|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet144|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet148|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet152|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet156|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet160|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet164|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet168|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet172|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet176|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet180|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet184|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet188|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet0|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet4|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet8|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet12|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet16|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet20|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet24|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet28|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet32|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet36|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet40|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet44|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet48|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet52|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet56|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet60|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet64|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet68|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet72|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet76|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet80|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet84|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet88|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet92|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet96|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet100|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet104|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet108|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet112|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet116|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet120|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet124|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet128|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet132|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet136|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet140|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet144|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet148|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet152|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet156|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet160|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet164|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet168|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet172|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet176|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet180|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet184|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet188|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc5-1|asic0|Ethernet0|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc5-1|asic0|Ethernet8|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc5-1|asic0|Ethernet16|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc5-1|asic0|Ethernet24|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc5-1|asic0|Ethernet32|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc5-1|asic0|Ethernet40|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc5-1|asic0|Ethernet48|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc5-1|asic0|Ethernet56|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc5-1|asic0|Ethernet64|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc5-1|asic0|Ethernet72|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc5-1|asic0|Ethernet80|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc5-1|asic0|Ethernet88|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc5-1|asic0|Ethernet96|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc5-1|asic0|Ethernet104|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc5-1|asic0|Ethernet112|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc5-1|asic0|Ethernet120|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc5-1|asic0|Ethernet128|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc5-1|asic0|Ethernet136|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc5-1|asic1|Ethernet144|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc5-1|asic1|Ethernet152|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc5-1|asic1|Ethernet160|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc5-1|asic1|Ethernet168|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc5-1|asic1|Ethernet176|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc5-1|asic1|Ethernet184|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc5-1|asic1|Ethernet192|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc5-1|asic1|Ethernet200|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc5-1|asic1|Ethernet208|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc5-1|asic1|Ethernet216|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc5-1|asic1|Ethernet224|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc5-1|asic1|Ethernet232|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc5-1|asic1|Ethernet240|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc5-1|asic1|Ethernet248|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc5-1|asic1|Ethernet256|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc5-1|asic1|Ethernet264|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc5-1|asic1|Ethernet272|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc5-1|asic1|Ethernet280|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet0|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet4|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet8|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet12|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet16|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet20|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet24|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet28|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet32|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet36|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet40|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet44|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet48|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet52|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet56|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet60|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet64|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet68|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet72|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet76|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet80|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet84|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet88|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet92|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet96|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet100|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet104|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet108|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet112|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet116|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet120|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet124|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet128|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet132|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet136|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet140|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet144|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet148|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet152|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet156|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet160|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet164|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet168|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet172|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet176|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet180|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet184|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet188|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet0|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet4|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet8|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet12|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet16|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet20|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet24|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet28|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet32|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet36|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet40|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet44|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet48|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet52|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet56|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet60|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet64|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet68|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet72|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet76|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet80|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet84|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet88|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet92|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet96|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet100|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet104|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet108|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet112|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet116|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet120|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet124|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet128|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet132|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet136|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet140|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet144|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet148|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet152|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet156|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet160|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet164|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet168|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet172|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet176|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet180|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet184|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet188|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc5-1|asic0|Ethernet0|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc5-1|asic0|Ethernet8|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc5-1|asic0|Ethernet16|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc5-1|asic0|Ethernet24|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc5-1|asic0|Ethernet32|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc5-1|asic0|Ethernet40|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc5-1|asic0|Ethernet48|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc5-1|asic0|Ethernet56|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc5-1|asic0|Ethernet64|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc5-1|asic0|Ethernet72|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc5-1|asic0|Ethernet80|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc5-1|asic0|Ethernet88|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc5-1|asic0|Ethernet96|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc5-1|asic0|Ethernet104|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc5-1|asic0|Ethernet112|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc5-1|asic0|Ethernet120|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc5-1|asic0|Ethernet128|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc5-1|asic0|Ethernet136|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc5-1|asic1|Ethernet144|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc5-1|asic1|Ethernet152|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc5-1|asic1|Ethernet160|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc5-1|asic1|Ethernet168|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc5-1|asic1|Ethernet176|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc5-1|asic1|Ethernet184|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc5-1|asic1|Ethernet192|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc5-1|asic1|Ethernet200|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc5-1|asic1|Ethernet208|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc5-1|asic1|Ethernet216|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc5-1|asic1|Ethernet224|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc5-1|asic1|Ethernet232|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc5-1|asic1|Ethernet240|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc5-1|asic1|Ethernet248|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc5-1|asic1|Ethernet256|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc5-1|asic1|Ethernet264|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc5-1|asic1|Ethernet272|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc5-1|asic1|Ethernet280|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet0|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet4|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet8|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet12|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet16|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet20|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet24|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet28|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet32|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet36|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet40|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet44|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet48|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet52|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet56|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet60|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet64|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet68|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet72|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet76|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet80|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet84|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet88|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet92|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet96|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet100|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet104|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet108|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet112|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet116|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet120|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet124|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet128|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet132|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet136|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet140|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet144|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet148|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet152|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet156|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet160|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet164|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet168|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet172|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet176|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet180|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet184|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet188|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet0|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet4|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet8|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet12|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet16|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet20|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet24|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet28|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet32|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet36|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet40|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet44|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet48|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet52|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet56|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet60|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet64|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet68|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet72|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet76|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet80|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet84|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet88|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet92|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet96|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet100|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet104|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet108|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet112|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet116|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet120|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet124|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet128|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet132|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet136|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet140|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet144|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet148|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet152|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet156|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet160|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet164|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet168|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet172|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet176|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet180|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet184|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet188|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc5-1|asic0|Ethernet0|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc5-1|asic0|Ethernet8|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc5-1|asic0|Ethernet16|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc5-1|asic0|Ethernet24|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc5-1|asic0|Ethernet32|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc5-1|asic0|Ethernet40|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc5-1|asic0|Ethernet48|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc5-1|asic0|Ethernet56|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc5-1|asic0|Ethernet64|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc5-1|asic0|Ethernet72|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc5-1|asic0|Ethernet80|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc5-1|asic0|Ethernet88|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc5-1|asic0|Ethernet96|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc5-1|asic0|Ethernet104|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc5-1|asic0|Ethernet112|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc5-1|asic0|Ethernet120|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc5-1|asic0|Ethernet128|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc5-1|asic0|Ethernet136|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc5-1|asic1|Ethernet144|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc5-1|asic1|Ethernet152|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc5-1|asic1|Ethernet160|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc5-1|asic1|Ethernet168|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc5-1|asic1|Ethernet176|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc5-1|asic1|Ethernet184|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc5-1|asic1|Ethernet192|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc5-1|asic1|Ethernet200|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc5-1|asic1|Ethernet208|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc5-1|asic1|Ethernet216|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc5-1|asic1|Ethernet224|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc5-1|asic1|Ethernet232|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc5-1|asic1|Ethernet240|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc5-1|asic1|Ethernet248|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc5-1|asic1|Ethernet256|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc5-1|asic1|Ethernet264|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc5-1|asic1|Ethernet272|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc5-1|asic1|Ethernet280|5-6": { + "profile" : "egress_lossy_profile" + } + } +} diff --git a/src/sonic-config-engine/tests/sample_output/py2/buffer-arista7800r3a-36dm2-d36-lc.json b/src/sonic-config-engine/tests/sample_output/py2/buffer-arista7800r3a-36dm2-d36-lc.json new file mode 100644 index 000000000000..026f88f033f7 --- /dev/null +++ b/src/sonic-config-engine/tests/sample_output/py2/buffer-arista7800r3a-36dm2-d36-lc.json @@ -0,0 +1,1299 @@ + { + "CABLE_LENGTH": { + "AZURE": { + "Ethernet0": "5m", + "Ethernet8": "5m", + "Ethernet16": "5m", + "Ethernet24": "5m", + "Ethernet32": "5m", + "Ethernet40": "5m", + "Ethernet48": "5m", + "Ethernet56": "5m", + "Ethernet64": "5m", + "Ethernet72": "5m", + "Ethernet80": "5m", + "Ethernet88": "5m", + "Ethernet96": "5m", + "Ethernet104": "5m", + "Ethernet112": "5m", + "Ethernet120": "5m", + "Ethernet128": "5m", + "Ethernet136": "5m" + } + }, + + "BUFFER_POOL": { + "ingress_lossless_pool": { + "size": "6441610000", + "type": "both", + "mode": "dynamic", + "xoff": "1582033305" + } + }, + "BUFFER_PROFILE": { + "ingress_lossy_profile": { + "pool":"ingress_lossless_pool", + "size":"1280", + "xon_offset": "2560", + "dynamic_th":"0" + }, + "egress_lossless_profile": { + "pool":"ingress_lossless_pool", + "size":"0", + "static_th":"33030144" + }, + "egress_lossy_profile": { + "pool":"ingress_lossless_pool", + "size":"0", + "dynamic_th":"-1" + } + }, + + "BUFFER_PG": { + "Ethernet0|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet8|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet16|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet24|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet32|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet40|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet48|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet56|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet64|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet72|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet80|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet88|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet96|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet104|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet112|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet120|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet128|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet136|0": { + "profile" : "ingress_lossy_profile" + } + }, + + "BUFFER_QUEUE": { + "str3-7800-lc8-1|asic0|Ethernet0|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc8-1|asic0|Ethernet8|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc8-1|asic0|Ethernet16|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc8-1|asic0|Ethernet24|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc8-1|asic0|Ethernet32|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc8-1|asic0|Ethernet40|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc8-1|asic0|Ethernet48|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc8-1|asic0|Ethernet56|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc8-1|asic0|Ethernet64|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc8-1|asic0|Ethernet72|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc8-1|asic0|Ethernet80|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc8-1|asic0|Ethernet88|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc8-1|asic0|Ethernet96|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc8-1|asic0|Ethernet104|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc8-1|asic0|Ethernet112|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc8-1|asic0|Ethernet120|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc8-1|asic0|Ethernet128|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc8-1|asic0|Ethernet136|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc8-1|asic1|Ethernet144|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc8-1|asic1|Ethernet152|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc8-1|asic1|Ethernet160|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc8-1|asic1|Ethernet168|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc8-1|asic1|Ethernet176|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc8-1|asic1|Ethernet184|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc8-1|asic1|Ethernet192|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc8-1|asic1|Ethernet200|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc8-1|asic1|Ethernet208|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc8-1|asic1|Ethernet216|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc8-1|asic1|Ethernet224|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc8-1|asic1|Ethernet232|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc8-1|asic1|Ethernet240|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc8-1|asic1|Ethernet248|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc8-1|asic1|Ethernet256|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc8-1|asic1|Ethernet264|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc8-1|asic1|Ethernet272|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc8-1|asic1|Ethernet280|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet0|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet4|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet8|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet12|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet16|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet20|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet24|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet28|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet32|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet36|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet40|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet44|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet48|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet52|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet56|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet60|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet64|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet68|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet72|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet76|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet80|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet84|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet88|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet92|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet96|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet100|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet104|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet108|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet112|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet116|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet120|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet124|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet128|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet132|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet136|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet140|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet144|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet148|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet152|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet156|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet160|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet164|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet168|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet172|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet176|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet180|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet184|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet188|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet0|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet4|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet8|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet12|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet16|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet20|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet24|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet28|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet32|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet36|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet40|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet44|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet48|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet52|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet56|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet60|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet64|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet68|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet72|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet76|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet80|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet84|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet88|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet92|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet96|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet100|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet104|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet108|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet112|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet116|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet120|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet124|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet128|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet132|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet136|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet140|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet144|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet148|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet152|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet156|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet160|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet164|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet168|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet172|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet176|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet180|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet184|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet188|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc8-1|asic0|Ethernet0|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc8-1|asic0|Ethernet8|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc8-1|asic0|Ethernet16|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc8-1|asic0|Ethernet24|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc8-1|asic0|Ethernet32|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc8-1|asic0|Ethernet40|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc8-1|asic0|Ethernet48|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc8-1|asic0|Ethernet56|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc8-1|asic0|Ethernet64|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc8-1|asic0|Ethernet72|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc8-1|asic0|Ethernet80|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc8-1|asic0|Ethernet88|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc8-1|asic0|Ethernet96|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc8-1|asic0|Ethernet104|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc8-1|asic0|Ethernet112|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc8-1|asic0|Ethernet120|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc8-1|asic0|Ethernet128|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc8-1|asic0|Ethernet136|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc8-1|asic1|Ethernet144|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc8-1|asic1|Ethernet152|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc8-1|asic1|Ethernet160|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc8-1|asic1|Ethernet168|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc8-1|asic1|Ethernet176|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc8-1|asic1|Ethernet184|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc8-1|asic1|Ethernet192|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc8-1|asic1|Ethernet200|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc8-1|asic1|Ethernet208|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc8-1|asic1|Ethernet216|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc8-1|asic1|Ethernet224|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc8-1|asic1|Ethernet232|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc8-1|asic1|Ethernet240|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc8-1|asic1|Ethernet248|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc8-1|asic1|Ethernet256|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc8-1|asic1|Ethernet264|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc8-1|asic1|Ethernet272|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc8-1|asic1|Ethernet280|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet0|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet4|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet8|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet12|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet16|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet20|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet24|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet28|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet32|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet36|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet40|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet44|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet48|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet52|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet56|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet60|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet64|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet68|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet72|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet76|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet80|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet84|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet88|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet92|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet96|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet100|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet104|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet108|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet112|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet116|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet120|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet124|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet128|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet132|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet136|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet140|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet144|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet148|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet152|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet156|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet160|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet164|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet168|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet172|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet176|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet180|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet184|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet188|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet0|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet4|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet8|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet12|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet16|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet20|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet24|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet28|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet32|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet36|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet40|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet44|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet48|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet52|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet56|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet60|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet64|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet68|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet72|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet76|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet80|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet84|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet88|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet92|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet96|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet100|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet104|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet108|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet112|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet116|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet120|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet124|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet128|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet132|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet136|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet140|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet144|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet148|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet152|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet156|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet160|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet164|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet168|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet172|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet176|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet180|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet184|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet188|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc8-1|asic0|Ethernet0|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc8-1|asic0|Ethernet8|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc8-1|asic0|Ethernet16|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc8-1|asic0|Ethernet24|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc8-1|asic0|Ethernet32|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc8-1|asic0|Ethernet40|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc8-1|asic0|Ethernet48|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc8-1|asic0|Ethernet56|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc8-1|asic0|Ethernet64|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc8-1|asic0|Ethernet72|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc8-1|asic0|Ethernet80|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc8-1|asic0|Ethernet88|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc8-1|asic0|Ethernet96|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc8-1|asic0|Ethernet104|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc8-1|asic0|Ethernet112|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc8-1|asic0|Ethernet120|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc8-1|asic0|Ethernet128|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc8-1|asic0|Ethernet136|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc8-1|asic1|Ethernet144|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc8-1|asic1|Ethernet152|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc8-1|asic1|Ethernet160|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc8-1|asic1|Ethernet168|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc8-1|asic1|Ethernet176|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc8-1|asic1|Ethernet184|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc8-1|asic1|Ethernet192|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc8-1|asic1|Ethernet200|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc8-1|asic1|Ethernet208|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc8-1|asic1|Ethernet216|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc8-1|asic1|Ethernet224|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc8-1|asic1|Ethernet232|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc8-1|asic1|Ethernet240|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc8-1|asic1|Ethernet248|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc8-1|asic1|Ethernet256|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc8-1|asic1|Ethernet264|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc8-1|asic1|Ethernet272|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc8-1|asic1|Ethernet280|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet0|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet4|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet8|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet12|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet16|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet20|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet24|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet28|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet32|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet36|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet40|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet44|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet48|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet52|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet56|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet60|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet64|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet68|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet72|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet76|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet80|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet84|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet88|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet92|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet96|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet100|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet104|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet108|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet112|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet116|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet120|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet124|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet128|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet132|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet136|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet140|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet144|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet148|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet152|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet156|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet160|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet164|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet168|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet172|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet176|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet180|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet184|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet188|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet0|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet4|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet8|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet12|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet16|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet20|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet24|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet28|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet32|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet36|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet40|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet44|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet48|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet52|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet56|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet60|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet64|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet68|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet72|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet76|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet80|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet84|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet88|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet92|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet96|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet100|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet104|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet108|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet112|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet116|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet120|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet124|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet128|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet132|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet136|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet140|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet144|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet148|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet152|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet156|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet160|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet164|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet168|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet172|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet176|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet180|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet184|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet188|5-6": { + "profile" : "egress_lossy_profile" + } + } +} diff --git a/src/sonic-config-engine/tests/sample_output/py2/buffer-nokia-ixr7250e-36x100g.json b/src/sonic-config-engine/tests/sample_output/py2/buffer-nokia-ixr7250e-36x100g.json new file mode 100644 index 000000000000..32bb54925738 --- /dev/null +++ b/src/sonic-config-engine/tests/sample_output/py2/buffer-nokia-ixr7250e-36x100g.json @@ -0,0 +1,1083 @@ + { + "CABLE_LENGTH": { + "AZURE": { + "Ethernet0": "5m", + "Ethernet8": "5m", + "Ethernet16": "5m", + "Ethernet24": "5m", + "Ethernet32": "5m", + "Ethernet40": "5m", + "Ethernet48": "5m", + "Ethernet56": "5m", + "Ethernet64": "5m", + "Ethernet72": "5m", + "Ethernet80": "5m", + "Ethernet88": "5m", + "Ethernet96": "5m", + "Ethernet104": "5m", + "Ethernet112": "5m", + "Ethernet120": "5m", + "Ethernet128": "5m", + "Ethernet136": "5m" + } + }, + + "BUFFER_POOL": { + "ingress_lossless_pool": { + "size": "6441610000", + "type": "both", + "mode": "dynamic", + "xoff": "7785676" + } + }, + "BUFFER_PROFILE": { + "ingress_lossy_profile": { + "pool":"ingress_lossless_pool", + "size":"1280", + "xon_offset": "2560", + "dynamic_th":"0" + }, + "egress_lossless_profile": { + "pool":"ingress_lossless_pool", + "size":"0", + "static_th":"33030144" + }, + "egress_lossy_profile": { + "pool":"ingress_lossless_pool", + "size":"0", + "dynamic_th":"-1" + } + }, + + "BUFFER_PG": { + "Ethernet0|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet8|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet16|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet24|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet32|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet40|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet48|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet56|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet64|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet72|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet80|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet88|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet96|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet104|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet112|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet120|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet128|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet136|0": { + "profile" : "ingress_lossy_profile" + } + }, + + "BUFFER_QUEUE": { + "svcstr-7250-lc1-1|asic0|Ethernet0|3-4": { + "profile" : "egress_lossless_profile" + }, + "svcstr-7250-lc1-1|asic0|Ethernet8|3-4": { + "profile" : "egress_lossless_profile" + }, + "svcstr-7250-lc1-1|asic0|Ethernet16|3-4": { + "profile" : "egress_lossless_profile" + }, + "svcstr-7250-lc1-1|asic0|Ethernet24|3-4": { + "profile" : "egress_lossless_profile" + }, + "svcstr-7250-lc1-1|asic0|Ethernet32|3-4": { + "profile" : "egress_lossless_profile" + }, + "svcstr-7250-lc1-1|asic0|Ethernet40|3-4": { + "profile" : "egress_lossless_profile" + }, + "svcstr-7250-lc1-1|asic0|Ethernet48|3-4": { + "profile" : "egress_lossless_profile" + }, + "svcstr-7250-lc1-1|asic0|Ethernet56|3-4": { + "profile" : "egress_lossless_profile" + }, + "svcstr-7250-lc1-1|asic0|Ethernet64|3-4": { + "profile" : "egress_lossless_profile" + }, + "svcstr-7250-lc1-1|asic0|Ethernet72|3-4": { + "profile" : "egress_lossless_profile" + }, + "svcstr-7250-lc1-1|asic0|Ethernet80|3-4": { + "profile" : "egress_lossless_profile" + }, + "svcstr-7250-lc1-1|asic0|Ethernet88|3-4": { + "profile" : "egress_lossless_profile" + }, + "svcstr-7250-lc1-1|asic0|Ethernet96|3-4": { + "profile" : "egress_lossless_profile" + }, + "svcstr-7250-lc1-1|asic0|Ethernet104|3-4": { + "profile" : "egress_lossless_profile" + }, + "svcstr-7250-lc1-1|asic0|Ethernet112|3-4": { + "profile" : "egress_lossless_profile" + }, + "svcstr-7250-lc1-1|asic0|Ethernet120|3-4": { + "profile" : "egress_lossless_profile" + }, + "svcstr-7250-lc1-1|asic0|Ethernet128|3-4": { + "profile" : "egress_lossless_profile" + }, + "svcstr-7250-lc1-1|asic0|Ethernet136|3-4": { + "profile" : "egress_lossless_profile" + }, + "svcstr-7250-lc1-1|asic1|Ethernet144|3-4": { + "profile" : "egress_lossless_profile" + }, + "svcstr-7250-lc1-1|asic1|Ethernet152|3-4": { + "profile" : "egress_lossless_profile" + }, + "svcstr-7250-lc1-1|asic1|Ethernet160|3-4": { + "profile" : "egress_lossless_profile" + }, + "svcstr-7250-lc1-1|asic1|Ethernet168|3-4": { + "profile" : "egress_lossless_profile" + }, + "svcstr-7250-lc1-1|asic1|Ethernet176|3-4": { + "profile" : "egress_lossless_profile" + }, + "svcstr-7250-lc1-1|asic1|Ethernet184|3-4": { + "profile" : "egress_lossless_profile" + }, + "svcstr-7250-lc1-1|asic1|Ethernet192|3-4": { + "profile" : "egress_lossless_profile" + }, + "svcstr-7250-lc1-1|asic1|Ethernet200|3-4": { + "profile" : "egress_lossless_profile" + }, + "svcstr-7250-lc1-1|asic1|Ethernet208|3-4": { + "profile" : "egress_lossless_profile" + }, + "svcstr-7250-lc1-1|asic1|Ethernet216|3-4": { + "profile" : "egress_lossless_profile" + }, + "svcstr-7250-lc1-1|asic1|Ethernet224|3-4": { + "profile" : "egress_lossless_profile" + }, + "svcstr-7250-lc1-1|asic1|Ethernet232|3-4": { + "profile" : "egress_lossless_profile" + }, + "svcstr-7250-lc1-1|asic1|Ethernet240|3-4": { + "profile" : "egress_lossless_profile" + }, + "svcstr-7250-lc1-1|asic1|Ethernet248|3-4": { + "profile" : "egress_lossless_profile" + }, + "svcstr-7250-lc1-1|asic1|Ethernet256|3-4": { + "profile" : "egress_lossless_profile" + }, + "svcstr-7250-lc1-1|asic1|Ethernet264|3-4": { + "profile" : "egress_lossless_profile" + }, + "svcstr-7250-lc1-1|asic1|Ethernet272|3-4": { + "profile" : "egress_lossless_profile" + }, + "svcstr-7250-lc1-1|asic1|Ethernet280|3-4": { + "profile" : "egress_lossless_profile" + }, + "svcstr-7250-lc2-1|asic0|Ethernet0|3-4": { + "profile" : "egress_lossless_profile" + }, + "svcstr-7250-lc2-1|asic0|Ethernet8|3-4": { + "profile" : "egress_lossless_profile" + }, + "svcstr-7250-lc2-1|asic0|Ethernet16|3-4": { + "profile" : "egress_lossless_profile" + }, + "svcstr-7250-lc2-1|asic0|Ethernet24|3-4": { + "profile" : "egress_lossless_profile" + }, + "svcstr-7250-lc2-1|asic0|Ethernet32|3-4": { + "profile" : "egress_lossless_profile" + }, + "svcstr-7250-lc2-1|asic0|Ethernet40|3-4": { + "profile" : "egress_lossless_profile" + }, + "svcstr-7250-lc2-1|asic0|Ethernet48|3-4": { + "profile" : "egress_lossless_profile" + }, + "svcstr-7250-lc2-1|asic0|Ethernet56|3-4": { + "profile" : "egress_lossless_profile" + }, + "svcstr-7250-lc2-1|asic0|Ethernet64|3-4": { + "profile" : "egress_lossless_profile" + }, + "svcstr-7250-lc2-1|asic0|Ethernet72|3-4": { + "profile" : "egress_lossless_profile" + }, + "svcstr-7250-lc2-1|asic0|Ethernet80|3-4": { + "profile" : "egress_lossless_profile" + }, + "svcstr-7250-lc2-1|asic0|Ethernet88|3-4": { + "profile" : "egress_lossless_profile" + }, + "svcstr-7250-lc2-1|asic0|Ethernet96|3-4": { + "profile" : "egress_lossless_profile" + }, + "svcstr-7250-lc2-1|asic0|Ethernet104|3-4": { + "profile" : "egress_lossless_profile" + }, + "svcstr-7250-lc2-1|asic0|Ethernet112|3-4": { + "profile" : "egress_lossless_profile" + }, + "svcstr-7250-lc2-1|asic0|Ethernet120|3-4": { + "profile" : "egress_lossless_profile" + }, + "svcstr-7250-lc2-1|asic0|Ethernet128|3-4": { + "profile" : "egress_lossless_profile" + }, + "svcstr-7250-lc2-1|asic0|Ethernet136|3-4": { + "profile" : "egress_lossless_profile" + }, + "svcstr-7250-lc2-1|asic1|Ethernet144|3-4": { + "profile" : "egress_lossless_profile" + }, + "svcstr-7250-lc2-1|asic1|Ethernet152|3-4": { + "profile" : "egress_lossless_profile" + }, + "svcstr-7250-lc2-1|asic1|Ethernet160|3-4": { + "profile" : "egress_lossless_profile" + }, + "svcstr-7250-lc2-1|asic1|Ethernet168|3-4": { + "profile" : "egress_lossless_profile" + }, + "svcstr-7250-lc2-1|asic1|Ethernet176|3-4": { + "profile" : "egress_lossless_profile" + }, + "svcstr-7250-lc2-1|asic1|Ethernet184|3-4": { + "profile" : "egress_lossless_profile" + }, + "svcstr-7250-lc2-1|asic1|Ethernet192|3-4": { + "profile" : "egress_lossless_profile" + }, + "svcstr-7250-lc2-1|asic1|Ethernet200|3-4": { + "profile" : "egress_lossless_profile" + }, + "svcstr-7250-lc2-1|asic1|Ethernet208|3-4": { + "profile" : "egress_lossless_profile" + }, + "svcstr-7250-lc2-1|asic1|Ethernet216|3-4": { + "profile" : "egress_lossless_profile" + }, + "svcstr-7250-lc2-1|asic1|Ethernet224|3-4": { + "profile" : "egress_lossless_profile" + }, + "svcstr-7250-lc2-1|asic1|Ethernet232|3-4": { + "profile" : "egress_lossless_profile" + }, + "svcstr-7250-lc2-1|asic1|Ethernet240|3-4": { + "profile" : "egress_lossless_profile" + }, + "svcstr-7250-lc2-1|asic1|Ethernet248|3-4": { + "profile" : "egress_lossless_profile" + }, + "svcstr-7250-lc2-1|asic1|Ethernet256|3-4": { + "profile" : "egress_lossless_profile" + }, + "svcstr-7250-lc2-1|asic1|Ethernet264|3-4": { + "profile" : "egress_lossless_profile" + }, + "svcstr-7250-lc2-1|asic1|Ethernet272|3-4": { + "profile" : "egress_lossless_profile" + }, + "svcstr-7250-lc2-1|asic1|Ethernet280|3-4": { + "profile" : "egress_lossless_profile" + }, + "svcstr-7250-lc3-1|asic0|Ethernet0|3-4": { + "profile" : "egress_lossless_profile" + }, + "svcstr-7250-lc3-1|asic0|Ethernet8|3-4": { + "profile" : "egress_lossless_profile" + }, + "svcstr-7250-lc3-1|asic0|Ethernet16|3-4": { + "profile" : "egress_lossless_profile" + }, + "svcstr-7250-lc3-1|asic0|Ethernet24|3-4": { + "profile" : "egress_lossless_profile" + }, + "svcstr-7250-lc3-1|asic0|Ethernet32|3-4": { + "profile" : "egress_lossless_profile" + }, + "svcstr-7250-lc3-1|asic0|Ethernet40|3-4": { + "profile" : "egress_lossless_profile" + }, + "svcstr-7250-lc3-1|asic0|Ethernet48|3-4": { + "profile" : "egress_lossless_profile" + }, + "svcstr-7250-lc3-1|asic0|Ethernet56|3-4": { + "profile" : "egress_lossless_profile" + }, + "svcstr-7250-lc3-1|asic0|Ethernet64|3-4": { + "profile" : "egress_lossless_profile" + }, + "svcstr-7250-lc3-1|asic0|Ethernet72|3-4": { + "profile" : "egress_lossless_profile" + }, + "svcstr-7250-lc3-1|asic0|Ethernet80|3-4": { + "profile" : "egress_lossless_profile" + }, + "svcstr-7250-lc3-1|asic0|Ethernet88|3-4": { + "profile" : "egress_lossless_profile" + }, + "svcstr-7250-lc3-1|asic0|Ethernet96|3-4": { + "profile" : "egress_lossless_profile" + }, + "svcstr-7250-lc3-1|asic0|Ethernet104|3-4": { + "profile" : "egress_lossless_profile" + }, + "svcstr-7250-lc3-1|asic0|Ethernet112|3-4": { + "profile" : "egress_lossless_profile" + }, + "svcstr-7250-lc3-1|asic0|Ethernet120|3-4": { + "profile" : "egress_lossless_profile" + }, + "svcstr-7250-lc3-1|asic0|Ethernet128|3-4": { + "profile" : "egress_lossless_profile" + }, + "svcstr-7250-lc3-1|asic0|Ethernet136|3-4": { + "profile" : "egress_lossless_profile" + }, + "svcstr-7250-lc3-1|asic1|Ethernet144|3-4": { + "profile" : "egress_lossless_profile" + }, + "svcstr-7250-lc3-1|asic1|Ethernet152|3-4": { + "profile" : "egress_lossless_profile" + }, + "svcstr-7250-lc3-1|asic1|Ethernet160|3-4": { + "profile" : "egress_lossless_profile" + }, + "svcstr-7250-lc3-1|asic1|Ethernet168|3-4": { + "profile" : "egress_lossless_profile" + }, + "svcstr-7250-lc3-1|asic1|Ethernet176|3-4": { + "profile" : "egress_lossless_profile" + }, + "svcstr-7250-lc3-1|asic1|Ethernet184|3-4": { + "profile" : "egress_lossless_profile" + }, + "svcstr-7250-lc3-1|asic1|Ethernet192|3-4": { + "profile" : "egress_lossless_profile" + }, + "svcstr-7250-lc3-1|asic1|Ethernet200|3-4": { + "profile" : "egress_lossless_profile" + }, + "svcstr-7250-lc3-1|asic1|Ethernet208|3-4": { + "profile" : "egress_lossless_profile" + }, + "svcstr-7250-lc3-1|asic1|Ethernet216|3-4": { + "profile" : "egress_lossless_profile" + }, + "svcstr-7250-lc3-1|asic1|Ethernet224|3-4": { + "profile" : "egress_lossless_profile" + }, + "svcstr-7250-lc3-1|asic1|Ethernet232|3-4": { + "profile" : "egress_lossless_profile" + }, + "svcstr-7250-lc3-1|asic1|Ethernet240|3-4": { + "profile" : "egress_lossless_profile" + }, + "svcstr-7250-lc3-1|asic1|Ethernet248|3-4": { + "profile" : "egress_lossless_profile" + }, + "svcstr-7250-lc3-1|asic1|Ethernet256|3-4": { + "profile" : "egress_lossless_profile" + }, + "svcstr-7250-lc3-1|asic1|Ethernet264|3-4": { + "profile" : "egress_lossless_profile" + }, + "svcstr-7250-lc3-1|asic1|Ethernet272|3-4": { + "profile" : "egress_lossless_profile" + }, + "svcstr-7250-lc3-1|asic1|Ethernet280|3-4": { + "profile" : "egress_lossless_profile" + }, + "svcstr-7250-lc1-1|asic0|Ethernet0|0-2": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc1-1|asic0|Ethernet8|0-2": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc1-1|asic0|Ethernet16|0-2": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc1-1|asic0|Ethernet24|0-2": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc1-1|asic0|Ethernet32|0-2": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc1-1|asic0|Ethernet40|0-2": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc1-1|asic0|Ethernet48|0-2": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc1-1|asic0|Ethernet56|0-2": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc1-1|asic0|Ethernet64|0-2": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc1-1|asic0|Ethernet72|0-2": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc1-1|asic0|Ethernet80|0-2": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc1-1|asic0|Ethernet88|0-2": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc1-1|asic0|Ethernet96|0-2": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc1-1|asic0|Ethernet104|0-2": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc1-1|asic0|Ethernet112|0-2": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc1-1|asic0|Ethernet120|0-2": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc1-1|asic0|Ethernet128|0-2": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc1-1|asic0|Ethernet136|0-2": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc1-1|asic1|Ethernet144|0-2": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc1-1|asic1|Ethernet152|0-2": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc1-1|asic1|Ethernet160|0-2": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc1-1|asic1|Ethernet168|0-2": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc1-1|asic1|Ethernet176|0-2": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc1-1|asic1|Ethernet184|0-2": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc1-1|asic1|Ethernet192|0-2": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc1-1|asic1|Ethernet200|0-2": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc1-1|asic1|Ethernet208|0-2": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc1-1|asic1|Ethernet216|0-2": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc1-1|asic1|Ethernet224|0-2": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc1-1|asic1|Ethernet232|0-2": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc1-1|asic1|Ethernet240|0-2": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc1-1|asic1|Ethernet248|0-2": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc1-1|asic1|Ethernet256|0-2": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc1-1|asic1|Ethernet264|0-2": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc1-1|asic1|Ethernet272|0-2": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc1-1|asic1|Ethernet280|0-2": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc2-1|asic0|Ethernet0|0-2": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc2-1|asic0|Ethernet8|0-2": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc2-1|asic0|Ethernet16|0-2": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc2-1|asic0|Ethernet24|0-2": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc2-1|asic0|Ethernet32|0-2": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc2-1|asic0|Ethernet40|0-2": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc2-1|asic0|Ethernet48|0-2": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc2-1|asic0|Ethernet56|0-2": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc2-1|asic0|Ethernet64|0-2": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc2-1|asic0|Ethernet72|0-2": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc2-1|asic0|Ethernet80|0-2": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc2-1|asic0|Ethernet88|0-2": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc2-1|asic0|Ethernet96|0-2": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc2-1|asic0|Ethernet104|0-2": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc2-1|asic0|Ethernet112|0-2": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc2-1|asic0|Ethernet120|0-2": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc2-1|asic0|Ethernet128|0-2": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc2-1|asic0|Ethernet136|0-2": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc2-1|asic1|Ethernet144|0-2": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc2-1|asic1|Ethernet152|0-2": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc2-1|asic1|Ethernet160|0-2": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc2-1|asic1|Ethernet168|0-2": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc2-1|asic1|Ethernet176|0-2": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc2-1|asic1|Ethernet184|0-2": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc2-1|asic1|Ethernet192|0-2": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc2-1|asic1|Ethernet200|0-2": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc2-1|asic1|Ethernet208|0-2": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc2-1|asic1|Ethernet216|0-2": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc2-1|asic1|Ethernet224|0-2": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc2-1|asic1|Ethernet232|0-2": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc2-1|asic1|Ethernet240|0-2": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc2-1|asic1|Ethernet248|0-2": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc2-1|asic1|Ethernet256|0-2": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc2-1|asic1|Ethernet264|0-2": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc2-1|asic1|Ethernet272|0-2": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc2-1|asic1|Ethernet280|0-2": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc3-1|asic0|Ethernet0|0-2": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc3-1|asic0|Ethernet8|0-2": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc3-1|asic0|Ethernet16|0-2": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc3-1|asic0|Ethernet24|0-2": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc3-1|asic0|Ethernet32|0-2": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc3-1|asic0|Ethernet40|0-2": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc3-1|asic0|Ethernet48|0-2": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc3-1|asic0|Ethernet56|0-2": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc3-1|asic0|Ethernet64|0-2": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc3-1|asic0|Ethernet72|0-2": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc3-1|asic0|Ethernet80|0-2": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc3-1|asic0|Ethernet88|0-2": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc3-1|asic0|Ethernet96|0-2": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc3-1|asic0|Ethernet104|0-2": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc3-1|asic0|Ethernet112|0-2": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc3-1|asic0|Ethernet120|0-2": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc3-1|asic0|Ethernet128|0-2": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc3-1|asic0|Ethernet136|0-2": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc3-1|asic1|Ethernet144|0-2": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc3-1|asic1|Ethernet152|0-2": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc3-1|asic1|Ethernet160|0-2": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc3-1|asic1|Ethernet168|0-2": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc3-1|asic1|Ethernet176|0-2": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc3-1|asic1|Ethernet184|0-2": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc3-1|asic1|Ethernet192|0-2": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc3-1|asic1|Ethernet200|0-2": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc3-1|asic1|Ethernet208|0-2": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc3-1|asic1|Ethernet216|0-2": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc3-1|asic1|Ethernet224|0-2": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc3-1|asic1|Ethernet232|0-2": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc3-1|asic1|Ethernet240|0-2": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc3-1|asic1|Ethernet248|0-2": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc3-1|asic1|Ethernet256|0-2": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc3-1|asic1|Ethernet264|0-2": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc3-1|asic1|Ethernet272|0-2": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc3-1|asic1|Ethernet280|0-2": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc1-1|asic0|Ethernet0|5-6": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc1-1|asic0|Ethernet8|5-6": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc1-1|asic0|Ethernet16|5-6": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc1-1|asic0|Ethernet24|5-6": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc1-1|asic0|Ethernet32|5-6": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc1-1|asic0|Ethernet40|5-6": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc1-1|asic0|Ethernet48|5-6": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc1-1|asic0|Ethernet56|5-6": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc1-1|asic0|Ethernet64|5-6": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc1-1|asic0|Ethernet72|5-6": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc1-1|asic0|Ethernet80|5-6": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc1-1|asic0|Ethernet88|5-6": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc1-1|asic0|Ethernet96|5-6": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc1-1|asic0|Ethernet104|5-6": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc1-1|asic0|Ethernet112|5-6": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc1-1|asic0|Ethernet120|5-6": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc1-1|asic0|Ethernet128|5-6": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc1-1|asic0|Ethernet136|5-6": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc1-1|asic1|Ethernet144|5-6": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc1-1|asic1|Ethernet152|5-6": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc1-1|asic1|Ethernet160|5-6": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc1-1|asic1|Ethernet168|5-6": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc1-1|asic1|Ethernet176|5-6": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc1-1|asic1|Ethernet184|5-6": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc1-1|asic1|Ethernet192|5-6": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc1-1|asic1|Ethernet200|5-6": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc1-1|asic1|Ethernet208|5-6": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc1-1|asic1|Ethernet216|5-6": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc1-1|asic1|Ethernet224|5-6": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc1-1|asic1|Ethernet232|5-6": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc1-1|asic1|Ethernet240|5-6": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc1-1|asic1|Ethernet248|5-6": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc1-1|asic1|Ethernet256|5-6": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc1-1|asic1|Ethernet264|5-6": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc1-1|asic1|Ethernet272|5-6": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc1-1|asic1|Ethernet280|5-6": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc2-1|asic0|Ethernet0|5-6": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc2-1|asic0|Ethernet8|5-6": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc2-1|asic0|Ethernet16|5-6": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc2-1|asic0|Ethernet24|5-6": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc2-1|asic0|Ethernet32|5-6": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc2-1|asic0|Ethernet40|5-6": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc2-1|asic0|Ethernet48|5-6": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc2-1|asic0|Ethernet56|5-6": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc2-1|asic0|Ethernet64|5-6": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc2-1|asic0|Ethernet72|5-6": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc2-1|asic0|Ethernet80|5-6": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc2-1|asic0|Ethernet88|5-6": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc2-1|asic0|Ethernet96|5-6": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc2-1|asic0|Ethernet104|5-6": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc2-1|asic0|Ethernet112|5-6": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc2-1|asic0|Ethernet120|5-6": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc2-1|asic0|Ethernet128|5-6": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc2-1|asic0|Ethernet136|5-6": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc2-1|asic1|Ethernet144|5-6": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc2-1|asic1|Ethernet152|5-6": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc2-1|asic1|Ethernet160|5-6": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc2-1|asic1|Ethernet168|5-6": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc2-1|asic1|Ethernet176|5-6": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc2-1|asic1|Ethernet184|5-6": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc2-1|asic1|Ethernet192|5-6": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc2-1|asic1|Ethernet200|5-6": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc2-1|asic1|Ethernet208|5-6": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc2-1|asic1|Ethernet216|5-6": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc2-1|asic1|Ethernet224|5-6": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc2-1|asic1|Ethernet232|5-6": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc2-1|asic1|Ethernet240|5-6": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc2-1|asic1|Ethernet248|5-6": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc2-1|asic1|Ethernet256|5-6": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc2-1|asic1|Ethernet264|5-6": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc2-1|asic1|Ethernet272|5-6": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc2-1|asic1|Ethernet280|5-6": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc3-1|asic0|Ethernet0|5-6": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc3-1|asic0|Ethernet8|5-6": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc3-1|asic0|Ethernet16|5-6": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc3-1|asic0|Ethernet24|5-6": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc3-1|asic0|Ethernet32|5-6": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc3-1|asic0|Ethernet40|5-6": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc3-1|asic0|Ethernet48|5-6": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc3-1|asic0|Ethernet56|5-6": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc3-1|asic0|Ethernet64|5-6": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc3-1|asic0|Ethernet72|5-6": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc3-1|asic0|Ethernet80|5-6": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc3-1|asic0|Ethernet88|5-6": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc3-1|asic0|Ethernet96|5-6": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc3-1|asic0|Ethernet104|5-6": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc3-1|asic0|Ethernet112|5-6": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc3-1|asic0|Ethernet120|5-6": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc3-1|asic0|Ethernet128|5-6": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc3-1|asic0|Ethernet136|5-6": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc3-1|asic1|Ethernet144|5-6": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc3-1|asic1|Ethernet152|5-6": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc3-1|asic1|Ethernet160|5-6": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc3-1|asic1|Ethernet168|5-6": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc3-1|asic1|Ethernet176|5-6": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc3-1|asic1|Ethernet184|5-6": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc3-1|asic1|Ethernet192|5-6": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc3-1|asic1|Ethernet200|5-6": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc3-1|asic1|Ethernet208|5-6": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc3-1|asic1|Ethernet216|5-6": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc3-1|asic1|Ethernet224|5-6": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc3-1|asic1|Ethernet232|5-6": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc3-1|asic1|Ethernet240|5-6": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc3-1|asic1|Ethernet248|5-6": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc3-1|asic1|Ethernet256|5-6": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc3-1|asic1|Ethernet264|5-6": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc3-1|asic1|Ethernet272|5-6": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc3-1|asic1|Ethernet280|5-6": { + "profile" : "egress_lossy_profile" + } + } +} diff --git a/src/sonic-config-engine/tests/sample_output/py2/buffer-nokia-ixr7250e-36x400g.json b/src/sonic-config-engine/tests/sample_output/py2/buffer-nokia-ixr7250e-36x400g.json new file mode 100644 index 000000000000..ef1882e0666e --- /dev/null +++ b/src/sonic-config-engine/tests/sample_output/py2/buffer-nokia-ixr7250e-36x400g.json @@ -0,0 +1,759 @@ + { + "CABLE_LENGTH": { + "AZURE": { + "Ethernet0": "5m", + "Ethernet8": "5m", + "Ethernet16": "5m", + "Ethernet24": "5m", + "Ethernet32": "5m", + "Ethernet40": "5m", + "Ethernet48": "5m", + "Ethernet56": "5m", + "Ethernet64": "5m", + "Ethernet72": "5m", + "Ethernet80": "5m", + "Ethernet88": "5m", + "Ethernet96": "5m", + "Ethernet104": "5m", + "Ethernet112": "5m", + "Ethernet120": "5m", + "Ethernet128": "5m", + "Ethernet136": "5m" + } + }, + + "BUFFER_POOL": { + "ingress_lossless_pool": { + "size": "6441610000", + "type": "both", + "mode": "dynamic", + "xoff": "1582033305" + } + }, + "BUFFER_PROFILE": { + "ingress_lossy_profile": { + "pool":"ingress_lossless_pool", + "size":"1280", + "xon_offset": "2560", + "dynamic_th":"0" + }, + "egress_lossless_profile": { + "pool":"ingress_lossless_pool", + "size":"0", + "static_th":"33030144" + }, + "egress_lossy_profile": { + "pool":"ingress_lossless_pool", + "size":"0", + "dynamic_th":"-1" + } + }, + + "BUFFER_PG": { + "Ethernet32|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet40|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet128|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet0|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet8|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet16|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet24|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet48|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet56|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet64|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet72|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet80|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet88|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet96|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet104|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet112|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet120|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet136|0": { + "profile" : "ingress_lossy_profile" + } + }, + + "BUFFER_QUEUE": { + "str2-7250-lc1-1|asic0|Ethernet0|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7250-lc1-1|asic0|Ethernet8|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7250-lc1-1|asic0|Ethernet16|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7250-lc1-1|asic0|Ethernet24|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7250-lc1-1|asic0|Ethernet32|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7250-lc1-1|asic0|Ethernet40|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7250-lc1-1|asic0|Ethernet48|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7250-lc1-1|asic0|Ethernet56|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7250-lc1-1|asic0|Ethernet64|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7250-lc1-1|asic0|Ethernet72|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7250-lc1-1|asic0|Ethernet80|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7250-lc1-1|asic0|Ethernet88|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7250-lc1-1|asic0|Ethernet96|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7250-lc1-1|asic0|Ethernet104|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7250-lc1-1|asic0|Ethernet112|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7250-lc1-1|asic0|Ethernet120|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7250-lc1-1|asic0|Ethernet128|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7250-lc1-1|asic0|Ethernet136|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7250-lc1-1|asic1|Ethernet144|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7250-lc1-1|asic1|Ethernet152|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7250-lc1-1|asic1|Ethernet160|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7250-lc1-1|asic1|Ethernet168|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7250-lc1-1|asic1|Ethernet176|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7250-lc1-1|asic1|Ethernet184|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7250-lc1-1|asic1|Ethernet192|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7250-lc1-1|asic1|Ethernet200|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7250-lc1-1|asic1|Ethernet208|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7250-lc1-1|asic1|Ethernet216|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7250-lc1-1|asic1|Ethernet224|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7250-lc1-1|asic1|Ethernet232|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7250-lc1-1|asic1|Ethernet240|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7250-lc1-1|asic1|Ethernet248|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7250-lc1-1|asic1|Ethernet256|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7250-lc1-1|asic1|Ethernet264|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7250-lc1-1|asic1|Ethernet272|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7250-lc1-1|asic1|Ethernet280|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7250-lc2-1|asic0|Ethernet0|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7250-lc2-1|asic0|Ethernet8|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7250-lc2-1|asic0|Ethernet16|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7250-lc2-1|asic0|Ethernet24|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7250-lc2-1|asic0|Ethernet32|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7250-lc2-1|asic0|Ethernet40|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7250-lc2-1|asic0|Ethernet48|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7250-lc2-1|asic0|Ethernet56|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7250-lc2-1|asic0|Ethernet64|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7250-lc2-1|asic0|Ethernet72|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7250-lc2-1|asic0|Ethernet80|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7250-lc2-1|asic0|Ethernet88|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7250-lc2-1|asic0|Ethernet96|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7250-lc2-1|asic0|Ethernet104|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7250-lc2-1|asic0|Ethernet112|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7250-lc2-1|asic0|Ethernet120|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7250-lc2-1|asic0|Ethernet128|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7250-lc2-1|asic0|Ethernet136|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7250-lc2-1|asic1|Ethernet144|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7250-lc2-1|asic1|Ethernet152|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7250-lc2-1|asic1|Ethernet160|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7250-lc2-1|asic1|Ethernet168|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7250-lc2-1|asic1|Ethernet176|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7250-lc2-1|asic1|Ethernet184|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7250-lc2-1|asic1|Ethernet192|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7250-lc2-1|asic1|Ethernet200|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7250-lc2-1|asic1|Ethernet208|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7250-lc2-1|asic1|Ethernet216|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7250-lc2-1|asic1|Ethernet224|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7250-lc2-1|asic1|Ethernet232|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7250-lc2-1|asic1|Ethernet240|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7250-lc2-1|asic1|Ethernet248|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7250-lc2-1|asic1|Ethernet256|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7250-lc2-1|asic1|Ethernet264|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7250-lc2-1|asic1|Ethernet272|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7250-lc2-1|asic1|Ethernet280|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7250-lc1-1|asic0|Ethernet0|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc1-1|asic0|Ethernet8|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc1-1|asic0|Ethernet16|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc1-1|asic0|Ethernet24|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc1-1|asic0|Ethernet32|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc1-1|asic0|Ethernet40|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc1-1|asic0|Ethernet48|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc1-1|asic0|Ethernet56|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc1-1|asic0|Ethernet64|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc1-1|asic0|Ethernet72|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc1-1|asic0|Ethernet80|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc1-1|asic0|Ethernet88|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc1-1|asic0|Ethernet96|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc1-1|asic0|Ethernet104|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc1-1|asic0|Ethernet112|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc1-1|asic0|Ethernet120|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc1-1|asic0|Ethernet128|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc1-1|asic0|Ethernet136|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc1-1|asic1|Ethernet144|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc1-1|asic1|Ethernet152|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc1-1|asic1|Ethernet160|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc1-1|asic1|Ethernet168|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc1-1|asic1|Ethernet176|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc1-1|asic1|Ethernet184|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc1-1|asic1|Ethernet192|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc1-1|asic1|Ethernet200|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc1-1|asic1|Ethernet208|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc1-1|asic1|Ethernet216|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc1-1|asic1|Ethernet224|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc1-1|asic1|Ethernet232|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc1-1|asic1|Ethernet240|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc1-1|asic1|Ethernet248|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc1-1|asic1|Ethernet256|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc1-1|asic1|Ethernet264|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc1-1|asic1|Ethernet272|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc1-1|asic1|Ethernet280|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc2-1|asic0|Ethernet0|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc2-1|asic0|Ethernet8|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc2-1|asic0|Ethernet16|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc2-1|asic0|Ethernet24|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc2-1|asic0|Ethernet32|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc2-1|asic0|Ethernet40|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc2-1|asic0|Ethernet48|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc2-1|asic0|Ethernet56|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc2-1|asic0|Ethernet64|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc2-1|asic0|Ethernet72|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc2-1|asic0|Ethernet80|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc2-1|asic0|Ethernet88|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc2-1|asic0|Ethernet96|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc2-1|asic0|Ethernet104|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc2-1|asic0|Ethernet112|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc2-1|asic0|Ethernet120|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc2-1|asic0|Ethernet128|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc2-1|asic0|Ethernet136|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc2-1|asic1|Ethernet144|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc2-1|asic1|Ethernet152|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc2-1|asic1|Ethernet160|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc2-1|asic1|Ethernet168|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc2-1|asic1|Ethernet176|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc2-1|asic1|Ethernet184|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc2-1|asic1|Ethernet192|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc2-1|asic1|Ethernet200|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc2-1|asic1|Ethernet208|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc2-1|asic1|Ethernet216|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc2-1|asic1|Ethernet224|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc2-1|asic1|Ethernet232|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc2-1|asic1|Ethernet240|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc2-1|asic1|Ethernet248|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc2-1|asic1|Ethernet256|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc2-1|asic1|Ethernet264|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc2-1|asic1|Ethernet272|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc2-1|asic1|Ethernet280|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc1-1|asic0|Ethernet0|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc1-1|asic0|Ethernet8|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc1-1|asic0|Ethernet16|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc1-1|asic0|Ethernet24|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc1-1|asic0|Ethernet32|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc1-1|asic0|Ethernet40|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc1-1|asic0|Ethernet48|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc1-1|asic0|Ethernet56|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc1-1|asic0|Ethernet64|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc1-1|asic0|Ethernet72|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc1-1|asic0|Ethernet80|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc1-1|asic0|Ethernet88|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc1-1|asic0|Ethernet96|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc1-1|asic0|Ethernet104|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc1-1|asic0|Ethernet112|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc1-1|asic0|Ethernet120|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc1-1|asic0|Ethernet128|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc1-1|asic0|Ethernet136|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc1-1|asic1|Ethernet144|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc1-1|asic1|Ethernet152|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc1-1|asic1|Ethernet160|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc1-1|asic1|Ethernet168|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc1-1|asic1|Ethernet176|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc1-1|asic1|Ethernet184|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc1-1|asic1|Ethernet192|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc1-1|asic1|Ethernet200|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc1-1|asic1|Ethernet208|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc1-1|asic1|Ethernet216|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc1-1|asic1|Ethernet224|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc1-1|asic1|Ethernet232|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc1-1|asic1|Ethernet240|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc1-1|asic1|Ethernet248|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc1-1|asic1|Ethernet256|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc1-1|asic1|Ethernet264|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc1-1|asic1|Ethernet272|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc1-1|asic1|Ethernet280|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc2-1|asic0|Ethernet0|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc2-1|asic0|Ethernet8|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc2-1|asic0|Ethernet16|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc2-1|asic0|Ethernet24|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc2-1|asic0|Ethernet32|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc2-1|asic0|Ethernet40|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc2-1|asic0|Ethernet48|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc2-1|asic0|Ethernet56|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc2-1|asic0|Ethernet64|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc2-1|asic0|Ethernet72|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc2-1|asic0|Ethernet80|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc2-1|asic0|Ethernet88|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc2-1|asic0|Ethernet96|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc2-1|asic0|Ethernet104|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc2-1|asic0|Ethernet112|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc2-1|asic0|Ethernet120|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc2-1|asic0|Ethernet128|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc2-1|asic0|Ethernet136|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc2-1|asic1|Ethernet144|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc2-1|asic1|Ethernet152|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc2-1|asic1|Ethernet160|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc2-1|asic1|Ethernet168|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc2-1|asic1|Ethernet176|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc2-1|asic1|Ethernet184|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc2-1|asic1|Ethernet192|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc2-1|asic1|Ethernet200|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc2-1|asic1|Ethernet208|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc2-1|asic1|Ethernet216|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc2-1|asic1|Ethernet224|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc2-1|asic1|Ethernet232|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc2-1|asic1|Ethernet240|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc2-1|asic1|Ethernet248|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc2-1|asic1|Ethernet256|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc2-1|asic1|Ethernet264|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc2-1|asic1|Ethernet272|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc2-1|asic1|Ethernet280|5-6": { + "profile" : "egress_lossy_profile" + } + } +} diff --git a/src/sonic-config-engine/tests/sample_output/py2/qos-arista7800r3-48cqm2-lc.json b/src/sonic-config-engine/tests/sample_output/py2/qos-arista7800r3-48cqm2-lc.json new file mode 100644 index 000000000000..bd8f5a22a9f5 --- /dev/null +++ b/src/sonic-config-engine/tests/sample_output/py2/qos-arista7800r3-48cqm2-lc.json @@ -0,0 +1,1535 @@ +{ + "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": { + "global": { + "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", + "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" : "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.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-arista7800r3a-36dm2-c36-lc.json b/src/sonic-config-engine/tests/sample_output/py2/qos-arista7800r3a-36dm2-c36-lc.json new file mode 100644 index 000000000000..f1dff3a0bd7c --- /dev/null +++ b/src/sonic-config-engine/tests/sample_output/py2/qos-arista7800r3a-36dm2-c36-lc.json @@ -0,0 +1,698 @@ +{ + "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": { + "global": { + "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", + "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" + }, + "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" + }, + "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" + }, + "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" + }, + "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" + }, + "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" + }, + "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" + }, + "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" + }, + "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" + }, + "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" + }, + "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" + }, + "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" + }, + "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" + }, + "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" + }, + "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" + }, + "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" + }, + "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" + } + }, + "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.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet8|3": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet16|3": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet24|3": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet32|3": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet40|3": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet48|3": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet56|3": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet64|3": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet72|3": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet80|3": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet88|3": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet96|3": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet104|3": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet112|3": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet120|3": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet128|3": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet136|3": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet0|4": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet8|4": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet16|4": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet24|4": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet32|4": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet40|4": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet48|4": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet56|4": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet64|4": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet72|4": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet80|4": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet88|4": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet96|4": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet104|4": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet112|4": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet120|4": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet128|4": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet136|4": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet0|0": { + "scheduler": "scheduler.0" + }, + "Ethernet8|0": { + "scheduler": "scheduler.0" + }, + "Ethernet16|0": { + "scheduler": "scheduler.0" + }, + "Ethernet24|0": { + "scheduler": "scheduler.0" + }, + "Ethernet32|0": { + "scheduler": "scheduler.0" + }, + "Ethernet40|0": { + "scheduler": "scheduler.0" + }, + "Ethernet48|0": { + "scheduler": "scheduler.0" + }, + "Ethernet56|0": { + "scheduler": "scheduler.0" + }, + "Ethernet64|0": { + "scheduler": "scheduler.0" + }, + "Ethernet72|0": { + "scheduler": "scheduler.0" + }, + "Ethernet80|0": { + "scheduler": "scheduler.0" + }, + "Ethernet88|0": { + "scheduler": "scheduler.0" + }, + "Ethernet96|0": { + "scheduler": "scheduler.0" + }, + "Ethernet104|0": { + "scheduler": "scheduler.0" + }, + "Ethernet112|0": { + "scheduler": "scheduler.0" + }, + "Ethernet120|0": { + "scheduler": "scheduler.0" + }, + "Ethernet128|0": { + "scheduler": "scheduler.0" + }, + "Ethernet136|0": { + "scheduler": "scheduler.0" + }, + "Ethernet0|1": { + "scheduler": "scheduler.0" + }, + "Ethernet8|1": { + "scheduler": "scheduler.0" + }, + "Ethernet16|1": { + "scheduler": "scheduler.0" + }, + "Ethernet24|1": { + "scheduler": "scheduler.0" + }, + "Ethernet32|1": { + "scheduler": "scheduler.0" + }, + "Ethernet40|1": { + "scheduler": "scheduler.0" + }, + "Ethernet48|1": { + "scheduler": "scheduler.0" + }, + "Ethernet56|1": { + "scheduler": "scheduler.0" + }, + "Ethernet64|1": { + "scheduler": "scheduler.0" + }, + "Ethernet72|1": { + "scheduler": "scheduler.0" + }, + "Ethernet80|1": { + "scheduler": "scheduler.0" + }, + "Ethernet88|1": { + "scheduler": "scheduler.0" + }, + "Ethernet96|1": { + "scheduler": "scheduler.0" + }, + "Ethernet104|1": { + "scheduler": "scheduler.0" + }, + "Ethernet112|1": { + "scheduler": "scheduler.0" + }, + "Ethernet120|1": { + "scheduler": "scheduler.0" + }, + "Ethernet128|1": { + "scheduler": "scheduler.0" + }, + "Ethernet136|1": { + "scheduler": "scheduler.0" + }, + "Ethernet0|2": { + "scheduler": "scheduler.0" + }, + "Ethernet8|2": { + "scheduler": "scheduler.0" + }, + "Ethernet16|2": { + "scheduler": "scheduler.0" + }, + "Ethernet24|2": { + "scheduler": "scheduler.0" + }, + "Ethernet32|2": { + "scheduler": "scheduler.0" + }, + "Ethernet40|2": { + "scheduler": "scheduler.0" + }, + "Ethernet48|2": { + "scheduler": "scheduler.0" + }, + "Ethernet56|2": { + "scheduler": "scheduler.0" + }, + "Ethernet64|2": { + "scheduler": "scheduler.0" + }, + "Ethernet72|2": { + "scheduler": "scheduler.0" + }, + "Ethernet80|2": { + "scheduler": "scheduler.0" + }, + "Ethernet88|2": { + "scheduler": "scheduler.0" + }, + "Ethernet96|2": { + "scheduler": "scheduler.0" + }, + "Ethernet104|2": { + "scheduler": "scheduler.0" + }, + "Ethernet112|2": { + "scheduler": "scheduler.0" + }, + "Ethernet120|2": { + "scheduler": "scheduler.0" + }, + "Ethernet128|2": { + "scheduler": "scheduler.0" + }, + "Ethernet136|2": { + "scheduler": "scheduler.0" + }, + "Ethernet0|5": { + "scheduler": "scheduler.0" + }, + "Ethernet8|5": { + "scheduler": "scheduler.0" + }, + "Ethernet16|5": { + "scheduler": "scheduler.0" + }, + "Ethernet24|5": { + "scheduler": "scheduler.0" + }, + "Ethernet32|5": { + "scheduler": "scheduler.0" + }, + "Ethernet40|5": { + "scheduler": "scheduler.0" + }, + "Ethernet48|5": { + "scheduler": "scheduler.0" + }, + "Ethernet56|5": { + "scheduler": "scheduler.0" + }, + "Ethernet64|5": { + "scheduler": "scheduler.0" + }, + "Ethernet72|5": { + "scheduler": "scheduler.0" + }, + "Ethernet80|5": { + "scheduler": "scheduler.0" + }, + "Ethernet88|5": { + "scheduler": "scheduler.0" + }, + "Ethernet96|5": { + "scheduler": "scheduler.0" + }, + "Ethernet104|5": { + "scheduler": "scheduler.0" + }, + "Ethernet112|5": { + "scheduler": "scheduler.0" + }, + "Ethernet120|5": { + "scheduler": "scheduler.0" + }, + "Ethernet128|5": { + "scheduler": "scheduler.0" + }, + "Ethernet136|5": { + "scheduler": "scheduler.0" + }, + "Ethernet0|6": { + "scheduler": "scheduler.0" + }, + "Ethernet8|6": { + "scheduler": "scheduler.0" + }, + "Ethernet16|6": { + "scheduler": "scheduler.0" + }, + "Ethernet24|6": { + "scheduler": "scheduler.0" + }, + "Ethernet32|6": { + "scheduler": "scheduler.0" + }, + "Ethernet40|6": { + "scheduler": "scheduler.0" + }, + "Ethernet48|6": { + "scheduler": "scheduler.0" + }, + "Ethernet56|6": { + "scheduler": "scheduler.0" + }, + "Ethernet64|6": { + "scheduler": "scheduler.0" + }, + "Ethernet72|6": { + "scheduler": "scheduler.0" + }, + "Ethernet80|6": { + "scheduler": "scheduler.0" + }, + "Ethernet88|6": { + "scheduler": "scheduler.0" + }, + "Ethernet96|6": { + "scheduler": "scheduler.0" + }, + "Ethernet104|6": { + "scheduler": "scheduler.0" + }, + "Ethernet112|6": { + "scheduler": "scheduler.0" + }, + "Ethernet120|6": { + "scheduler": "scheduler.0" + }, + "Ethernet128|6": { + "scheduler": "scheduler.0" + }, + "Ethernet136|6": { + "scheduler": "scheduler.0" + } + } +} diff --git a/src/sonic-config-engine/tests/sample_output/py2/qos-arista7800r3a-36dm2-d36-lc.json b/src/sonic-config-engine/tests/sample_output/py2/qos-arista7800r3a-36dm2-d36-lc.json new file mode 100644 index 000000000000..f1dff3a0bd7c --- /dev/null +++ b/src/sonic-config-engine/tests/sample_output/py2/qos-arista7800r3a-36dm2-d36-lc.json @@ -0,0 +1,698 @@ +{ + "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": { + "global": { + "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", + "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" + }, + "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" + }, + "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" + }, + "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" + }, + "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" + }, + "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" + }, + "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" + }, + "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" + }, + "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" + }, + "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" + }, + "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" + }, + "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" + }, + "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" + }, + "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" + }, + "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" + }, + "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" + }, + "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" + } + }, + "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.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet8|3": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet16|3": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet24|3": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet32|3": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet40|3": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet48|3": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet56|3": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet64|3": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet72|3": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet80|3": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet88|3": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet96|3": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet104|3": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet112|3": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet120|3": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet128|3": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet136|3": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet0|4": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet8|4": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet16|4": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet24|4": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet32|4": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet40|4": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet48|4": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet56|4": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet64|4": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet72|4": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet80|4": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet88|4": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet96|4": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet104|4": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet112|4": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet120|4": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet128|4": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet136|4": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet0|0": { + "scheduler": "scheduler.0" + }, + "Ethernet8|0": { + "scheduler": "scheduler.0" + }, + "Ethernet16|0": { + "scheduler": "scheduler.0" + }, + "Ethernet24|0": { + "scheduler": "scheduler.0" + }, + "Ethernet32|0": { + "scheduler": "scheduler.0" + }, + "Ethernet40|0": { + "scheduler": "scheduler.0" + }, + "Ethernet48|0": { + "scheduler": "scheduler.0" + }, + "Ethernet56|0": { + "scheduler": "scheduler.0" + }, + "Ethernet64|0": { + "scheduler": "scheduler.0" + }, + "Ethernet72|0": { + "scheduler": "scheduler.0" + }, + "Ethernet80|0": { + "scheduler": "scheduler.0" + }, + "Ethernet88|0": { + "scheduler": "scheduler.0" + }, + "Ethernet96|0": { + "scheduler": "scheduler.0" + }, + "Ethernet104|0": { + "scheduler": "scheduler.0" + }, + "Ethernet112|0": { + "scheduler": "scheduler.0" + }, + "Ethernet120|0": { + "scheduler": "scheduler.0" + }, + "Ethernet128|0": { + "scheduler": "scheduler.0" + }, + "Ethernet136|0": { + "scheduler": "scheduler.0" + }, + "Ethernet0|1": { + "scheduler": "scheduler.0" + }, + "Ethernet8|1": { + "scheduler": "scheduler.0" + }, + "Ethernet16|1": { + "scheduler": "scheduler.0" + }, + "Ethernet24|1": { + "scheduler": "scheduler.0" + }, + "Ethernet32|1": { + "scheduler": "scheduler.0" + }, + "Ethernet40|1": { + "scheduler": "scheduler.0" + }, + "Ethernet48|1": { + "scheduler": "scheduler.0" + }, + "Ethernet56|1": { + "scheduler": "scheduler.0" + }, + "Ethernet64|1": { + "scheduler": "scheduler.0" + }, + "Ethernet72|1": { + "scheduler": "scheduler.0" + }, + "Ethernet80|1": { + "scheduler": "scheduler.0" + }, + "Ethernet88|1": { + "scheduler": "scheduler.0" + }, + "Ethernet96|1": { + "scheduler": "scheduler.0" + }, + "Ethernet104|1": { + "scheduler": "scheduler.0" + }, + "Ethernet112|1": { + "scheduler": "scheduler.0" + }, + "Ethernet120|1": { + "scheduler": "scheduler.0" + }, + "Ethernet128|1": { + "scheduler": "scheduler.0" + }, + "Ethernet136|1": { + "scheduler": "scheduler.0" + }, + "Ethernet0|2": { + "scheduler": "scheduler.0" + }, + "Ethernet8|2": { + "scheduler": "scheduler.0" + }, + "Ethernet16|2": { + "scheduler": "scheduler.0" + }, + "Ethernet24|2": { + "scheduler": "scheduler.0" + }, + "Ethernet32|2": { + "scheduler": "scheduler.0" + }, + "Ethernet40|2": { + "scheduler": "scheduler.0" + }, + "Ethernet48|2": { + "scheduler": "scheduler.0" + }, + "Ethernet56|2": { + "scheduler": "scheduler.0" + }, + "Ethernet64|2": { + "scheduler": "scheduler.0" + }, + "Ethernet72|2": { + "scheduler": "scheduler.0" + }, + "Ethernet80|2": { + "scheduler": "scheduler.0" + }, + "Ethernet88|2": { + "scheduler": "scheduler.0" + }, + "Ethernet96|2": { + "scheduler": "scheduler.0" + }, + "Ethernet104|2": { + "scheduler": "scheduler.0" + }, + "Ethernet112|2": { + "scheduler": "scheduler.0" + }, + "Ethernet120|2": { + "scheduler": "scheduler.0" + }, + "Ethernet128|2": { + "scheduler": "scheduler.0" + }, + "Ethernet136|2": { + "scheduler": "scheduler.0" + }, + "Ethernet0|5": { + "scheduler": "scheduler.0" + }, + "Ethernet8|5": { + "scheduler": "scheduler.0" + }, + "Ethernet16|5": { + "scheduler": "scheduler.0" + }, + "Ethernet24|5": { + "scheduler": "scheduler.0" + }, + "Ethernet32|5": { + "scheduler": "scheduler.0" + }, + "Ethernet40|5": { + "scheduler": "scheduler.0" + }, + "Ethernet48|5": { + "scheduler": "scheduler.0" + }, + "Ethernet56|5": { + "scheduler": "scheduler.0" + }, + "Ethernet64|5": { + "scheduler": "scheduler.0" + }, + "Ethernet72|5": { + "scheduler": "scheduler.0" + }, + "Ethernet80|5": { + "scheduler": "scheduler.0" + }, + "Ethernet88|5": { + "scheduler": "scheduler.0" + }, + "Ethernet96|5": { + "scheduler": "scheduler.0" + }, + "Ethernet104|5": { + "scheduler": "scheduler.0" + }, + "Ethernet112|5": { + "scheduler": "scheduler.0" + }, + "Ethernet120|5": { + "scheduler": "scheduler.0" + }, + "Ethernet128|5": { + "scheduler": "scheduler.0" + }, + "Ethernet136|5": { + "scheduler": "scheduler.0" + }, + "Ethernet0|6": { + "scheduler": "scheduler.0" + }, + "Ethernet8|6": { + "scheduler": "scheduler.0" + }, + "Ethernet16|6": { + "scheduler": "scheduler.0" + }, + "Ethernet24|6": { + "scheduler": "scheduler.0" + }, + "Ethernet32|6": { + "scheduler": "scheduler.0" + }, + "Ethernet40|6": { + "scheduler": "scheduler.0" + }, + "Ethernet48|6": { + "scheduler": "scheduler.0" + }, + "Ethernet56|6": { + "scheduler": "scheduler.0" + }, + "Ethernet64|6": { + "scheduler": "scheduler.0" + }, + "Ethernet72|6": { + "scheduler": "scheduler.0" + }, + "Ethernet80|6": { + "scheduler": "scheduler.0" + }, + "Ethernet88|6": { + "scheduler": "scheduler.0" + }, + "Ethernet96|6": { + "scheduler": "scheduler.0" + }, + "Ethernet104|6": { + "scheduler": "scheduler.0" + }, + "Ethernet112|6": { + "scheduler": "scheduler.0" + }, + "Ethernet120|6": { + "scheduler": "scheduler.0" + }, + "Ethernet128|6": { + "scheduler": "scheduler.0" + }, + "Ethernet136|6": { + "scheduler": "scheduler.0" + } + } +} diff --git a/src/sonic-config-engine/tests/sample_output/py2/qos-nokia-ixr7250e-36x100g.json b/src/sonic-config-engine/tests/sample_output/py2/qos-nokia-ixr7250e-36x100g.json new file mode 100644 index 000000000000..f1dff3a0bd7c --- /dev/null +++ b/src/sonic-config-engine/tests/sample_output/py2/qos-nokia-ixr7250e-36x100g.json @@ -0,0 +1,698 @@ +{ + "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": { + "global": { + "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", + "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" + }, + "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" + }, + "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" + }, + "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" + }, + "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" + }, + "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" + }, + "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" + }, + "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" + }, + "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" + }, + "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" + }, + "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" + }, + "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" + }, + "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" + }, + "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" + }, + "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" + }, + "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" + }, + "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" + } + }, + "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.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet8|3": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet16|3": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet24|3": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet32|3": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet40|3": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet48|3": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet56|3": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet64|3": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet72|3": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet80|3": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet88|3": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet96|3": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet104|3": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet112|3": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet120|3": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet128|3": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet136|3": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet0|4": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet8|4": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet16|4": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet24|4": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet32|4": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet40|4": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet48|4": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet56|4": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet64|4": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet72|4": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet80|4": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet88|4": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet96|4": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet104|4": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet112|4": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet120|4": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet128|4": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet136|4": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet0|0": { + "scheduler": "scheduler.0" + }, + "Ethernet8|0": { + "scheduler": "scheduler.0" + }, + "Ethernet16|0": { + "scheduler": "scheduler.0" + }, + "Ethernet24|0": { + "scheduler": "scheduler.0" + }, + "Ethernet32|0": { + "scheduler": "scheduler.0" + }, + "Ethernet40|0": { + "scheduler": "scheduler.0" + }, + "Ethernet48|0": { + "scheduler": "scheduler.0" + }, + "Ethernet56|0": { + "scheduler": "scheduler.0" + }, + "Ethernet64|0": { + "scheduler": "scheduler.0" + }, + "Ethernet72|0": { + "scheduler": "scheduler.0" + }, + "Ethernet80|0": { + "scheduler": "scheduler.0" + }, + "Ethernet88|0": { + "scheduler": "scheduler.0" + }, + "Ethernet96|0": { + "scheduler": "scheduler.0" + }, + "Ethernet104|0": { + "scheduler": "scheduler.0" + }, + "Ethernet112|0": { + "scheduler": "scheduler.0" + }, + "Ethernet120|0": { + "scheduler": "scheduler.0" + }, + "Ethernet128|0": { + "scheduler": "scheduler.0" + }, + "Ethernet136|0": { + "scheduler": "scheduler.0" + }, + "Ethernet0|1": { + "scheduler": "scheduler.0" + }, + "Ethernet8|1": { + "scheduler": "scheduler.0" + }, + "Ethernet16|1": { + "scheduler": "scheduler.0" + }, + "Ethernet24|1": { + "scheduler": "scheduler.0" + }, + "Ethernet32|1": { + "scheduler": "scheduler.0" + }, + "Ethernet40|1": { + "scheduler": "scheduler.0" + }, + "Ethernet48|1": { + "scheduler": "scheduler.0" + }, + "Ethernet56|1": { + "scheduler": "scheduler.0" + }, + "Ethernet64|1": { + "scheduler": "scheduler.0" + }, + "Ethernet72|1": { + "scheduler": "scheduler.0" + }, + "Ethernet80|1": { + "scheduler": "scheduler.0" + }, + "Ethernet88|1": { + "scheduler": "scheduler.0" + }, + "Ethernet96|1": { + "scheduler": "scheduler.0" + }, + "Ethernet104|1": { + "scheduler": "scheduler.0" + }, + "Ethernet112|1": { + "scheduler": "scheduler.0" + }, + "Ethernet120|1": { + "scheduler": "scheduler.0" + }, + "Ethernet128|1": { + "scheduler": "scheduler.0" + }, + "Ethernet136|1": { + "scheduler": "scheduler.0" + }, + "Ethernet0|2": { + "scheduler": "scheduler.0" + }, + "Ethernet8|2": { + "scheduler": "scheduler.0" + }, + "Ethernet16|2": { + "scheduler": "scheduler.0" + }, + "Ethernet24|2": { + "scheduler": "scheduler.0" + }, + "Ethernet32|2": { + "scheduler": "scheduler.0" + }, + "Ethernet40|2": { + "scheduler": "scheduler.0" + }, + "Ethernet48|2": { + "scheduler": "scheduler.0" + }, + "Ethernet56|2": { + "scheduler": "scheduler.0" + }, + "Ethernet64|2": { + "scheduler": "scheduler.0" + }, + "Ethernet72|2": { + "scheduler": "scheduler.0" + }, + "Ethernet80|2": { + "scheduler": "scheduler.0" + }, + "Ethernet88|2": { + "scheduler": "scheduler.0" + }, + "Ethernet96|2": { + "scheduler": "scheduler.0" + }, + "Ethernet104|2": { + "scheduler": "scheduler.0" + }, + "Ethernet112|2": { + "scheduler": "scheduler.0" + }, + "Ethernet120|2": { + "scheduler": "scheduler.0" + }, + "Ethernet128|2": { + "scheduler": "scheduler.0" + }, + "Ethernet136|2": { + "scheduler": "scheduler.0" + }, + "Ethernet0|5": { + "scheduler": "scheduler.0" + }, + "Ethernet8|5": { + "scheduler": "scheduler.0" + }, + "Ethernet16|5": { + "scheduler": "scheduler.0" + }, + "Ethernet24|5": { + "scheduler": "scheduler.0" + }, + "Ethernet32|5": { + "scheduler": "scheduler.0" + }, + "Ethernet40|5": { + "scheduler": "scheduler.0" + }, + "Ethernet48|5": { + "scheduler": "scheduler.0" + }, + "Ethernet56|5": { + "scheduler": "scheduler.0" + }, + "Ethernet64|5": { + "scheduler": "scheduler.0" + }, + "Ethernet72|5": { + "scheduler": "scheduler.0" + }, + "Ethernet80|5": { + "scheduler": "scheduler.0" + }, + "Ethernet88|5": { + "scheduler": "scheduler.0" + }, + "Ethernet96|5": { + "scheduler": "scheduler.0" + }, + "Ethernet104|5": { + "scheduler": "scheduler.0" + }, + "Ethernet112|5": { + "scheduler": "scheduler.0" + }, + "Ethernet120|5": { + "scheduler": "scheduler.0" + }, + "Ethernet128|5": { + "scheduler": "scheduler.0" + }, + "Ethernet136|5": { + "scheduler": "scheduler.0" + }, + "Ethernet0|6": { + "scheduler": "scheduler.0" + }, + "Ethernet8|6": { + "scheduler": "scheduler.0" + }, + "Ethernet16|6": { + "scheduler": "scheduler.0" + }, + "Ethernet24|6": { + "scheduler": "scheduler.0" + }, + "Ethernet32|6": { + "scheduler": "scheduler.0" + }, + "Ethernet40|6": { + "scheduler": "scheduler.0" + }, + "Ethernet48|6": { + "scheduler": "scheduler.0" + }, + "Ethernet56|6": { + "scheduler": "scheduler.0" + }, + "Ethernet64|6": { + "scheduler": "scheduler.0" + }, + "Ethernet72|6": { + "scheduler": "scheduler.0" + }, + "Ethernet80|6": { + "scheduler": "scheduler.0" + }, + "Ethernet88|6": { + "scheduler": "scheduler.0" + }, + "Ethernet96|6": { + "scheduler": "scheduler.0" + }, + "Ethernet104|6": { + "scheduler": "scheduler.0" + }, + "Ethernet112|6": { + "scheduler": "scheduler.0" + }, + "Ethernet120|6": { + "scheduler": "scheduler.0" + }, + "Ethernet128|6": { + "scheduler": "scheduler.0" + }, + "Ethernet136|6": { + "scheduler": "scheduler.0" + } + } +} diff --git a/src/sonic-config-engine/tests/sample_output/py2/qos-nokia-ixr7250e-36x400g.json b/src/sonic-config-engine/tests/sample_output/py2/qos-nokia-ixr7250e-36x400g.json new file mode 100644 index 000000000000..f1dff3a0bd7c --- /dev/null +++ b/src/sonic-config-engine/tests/sample_output/py2/qos-nokia-ixr7250e-36x400g.json @@ -0,0 +1,698 @@ +{ + "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": { + "global": { + "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", + "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" + }, + "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" + }, + "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" + }, + "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" + }, + "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" + }, + "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" + }, + "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" + }, + "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" + }, + "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" + }, + "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" + }, + "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" + }, + "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" + }, + "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" + }, + "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" + }, + "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" + }, + "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" + }, + "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" + } + }, + "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.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet8|3": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet16|3": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet24|3": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet32|3": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet40|3": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet48|3": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet56|3": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet64|3": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet72|3": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet80|3": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet88|3": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet96|3": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet104|3": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet112|3": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet120|3": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet128|3": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet136|3": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet0|4": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet8|4": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet16|4": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet24|4": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet32|4": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet40|4": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet48|4": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet56|4": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet64|4": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet72|4": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet80|4": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet88|4": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet96|4": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet104|4": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet112|4": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet120|4": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet128|4": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet136|4": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet0|0": { + "scheduler": "scheduler.0" + }, + "Ethernet8|0": { + "scheduler": "scheduler.0" + }, + "Ethernet16|0": { + "scheduler": "scheduler.0" + }, + "Ethernet24|0": { + "scheduler": "scheduler.0" + }, + "Ethernet32|0": { + "scheduler": "scheduler.0" + }, + "Ethernet40|0": { + "scheduler": "scheduler.0" + }, + "Ethernet48|0": { + "scheduler": "scheduler.0" + }, + "Ethernet56|0": { + "scheduler": "scheduler.0" + }, + "Ethernet64|0": { + "scheduler": "scheduler.0" + }, + "Ethernet72|0": { + "scheduler": "scheduler.0" + }, + "Ethernet80|0": { + "scheduler": "scheduler.0" + }, + "Ethernet88|0": { + "scheduler": "scheduler.0" + }, + "Ethernet96|0": { + "scheduler": "scheduler.0" + }, + "Ethernet104|0": { + "scheduler": "scheduler.0" + }, + "Ethernet112|0": { + "scheduler": "scheduler.0" + }, + "Ethernet120|0": { + "scheduler": "scheduler.0" + }, + "Ethernet128|0": { + "scheduler": "scheduler.0" + }, + "Ethernet136|0": { + "scheduler": "scheduler.0" + }, + "Ethernet0|1": { + "scheduler": "scheduler.0" + }, + "Ethernet8|1": { + "scheduler": "scheduler.0" + }, + "Ethernet16|1": { + "scheduler": "scheduler.0" + }, + "Ethernet24|1": { + "scheduler": "scheduler.0" + }, + "Ethernet32|1": { + "scheduler": "scheduler.0" + }, + "Ethernet40|1": { + "scheduler": "scheduler.0" + }, + "Ethernet48|1": { + "scheduler": "scheduler.0" + }, + "Ethernet56|1": { + "scheduler": "scheduler.0" + }, + "Ethernet64|1": { + "scheduler": "scheduler.0" + }, + "Ethernet72|1": { + "scheduler": "scheduler.0" + }, + "Ethernet80|1": { + "scheduler": "scheduler.0" + }, + "Ethernet88|1": { + "scheduler": "scheduler.0" + }, + "Ethernet96|1": { + "scheduler": "scheduler.0" + }, + "Ethernet104|1": { + "scheduler": "scheduler.0" + }, + "Ethernet112|1": { + "scheduler": "scheduler.0" + }, + "Ethernet120|1": { + "scheduler": "scheduler.0" + }, + "Ethernet128|1": { + "scheduler": "scheduler.0" + }, + "Ethernet136|1": { + "scheduler": "scheduler.0" + }, + "Ethernet0|2": { + "scheduler": "scheduler.0" + }, + "Ethernet8|2": { + "scheduler": "scheduler.0" + }, + "Ethernet16|2": { + "scheduler": "scheduler.0" + }, + "Ethernet24|2": { + "scheduler": "scheduler.0" + }, + "Ethernet32|2": { + "scheduler": "scheduler.0" + }, + "Ethernet40|2": { + "scheduler": "scheduler.0" + }, + "Ethernet48|2": { + "scheduler": "scheduler.0" + }, + "Ethernet56|2": { + "scheduler": "scheduler.0" + }, + "Ethernet64|2": { + "scheduler": "scheduler.0" + }, + "Ethernet72|2": { + "scheduler": "scheduler.0" + }, + "Ethernet80|2": { + "scheduler": "scheduler.0" + }, + "Ethernet88|2": { + "scheduler": "scheduler.0" + }, + "Ethernet96|2": { + "scheduler": "scheduler.0" + }, + "Ethernet104|2": { + "scheduler": "scheduler.0" + }, + "Ethernet112|2": { + "scheduler": "scheduler.0" + }, + "Ethernet120|2": { + "scheduler": "scheduler.0" + }, + "Ethernet128|2": { + "scheduler": "scheduler.0" + }, + "Ethernet136|2": { + "scheduler": "scheduler.0" + }, + "Ethernet0|5": { + "scheduler": "scheduler.0" + }, + "Ethernet8|5": { + "scheduler": "scheduler.0" + }, + "Ethernet16|5": { + "scheduler": "scheduler.0" + }, + "Ethernet24|5": { + "scheduler": "scheduler.0" + }, + "Ethernet32|5": { + "scheduler": "scheduler.0" + }, + "Ethernet40|5": { + "scheduler": "scheduler.0" + }, + "Ethernet48|5": { + "scheduler": "scheduler.0" + }, + "Ethernet56|5": { + "scheduler": "scheduler.0" + }, + "Ethernet64|5": { + "scheduler": "scheduler.0" + }, + "Ethernet72|5": { + "scheduler": "scheduler.0" + }, + "Ethernet80|5": { + "scheduler": "scheduler.0" + }, + "Ethernet88|5": { + "scheduler": "scheduler.0" + }, + "Ethernet96|5": { + "scheduler": "scheduler.0" + }, + "Ethernet104|5": { + "scheduler": "scheduler.0" + }, + "Ethernet112|5": { + "scheduler": "scheduler.0" + }, + "Ethernet120|5": { + "scheduler": "scheduler.0" + }, + "Ethernet128|5": { + "scheduler": "scheduler.0" + }, + "Ethernet136|5": { + "scheduler": "scheduler.0" + }, + "Ethernet0|6": { + "scheduler": "scheduler.0" + }, + "Ethernet8|6": { + "scheduler": "scheduler.0" + }, + "Ethernet16|6": { + "scheduler": "scheduler.0" + }, + "Ethernet24|6": { + "scheduler": "scheduler.0" + }, + "Ethernet32|6": { + "scheduler": "scheduler.0" + }, + "Ethernet40|6": { + "scheduler": "scheduler.0" + }, + "Ethernet48|6": { + "scheduler": "scheduler.0" + }, + "Ethernet56|6": { + "scheduler": "scheduler.0" + }, + "Ethernet64|6": { + "scheduler": "scheduler.0" + }, + "Ethernet72|6": { + "scheduler": "scheduler.0" + }, + "Ethernet80|6": { + "scheduler": "scheduler.0" + }, + "Ethernet88|6": { + "scheduler": "scheduler.0" + }, + "Ethernet96|6": { + "scheduler": "scheduler.0" + }, + "Ethernet104|6": { + "scheduler": "scheduler.0" + }, + "Ethernet112|6": { + "scheduler": "scheduler.0" + }, + "Ethernet120|6": { + "scheduler": "scheduler.0" + }, + "Ethernet128|6": { + "scheduler": "scheduler.0" + }, + "Ethernet136|6": { + "scheduler": "scheduler.0" + } + } +} diff --git a/src/sonic-config-engine/tests/sample_output/py3/buffer-arista7800r3-48cq2-lc.json b/src/sonic-config-engine/tests/sample_output/py3/buffer-arista7800r3-48cq2-lc.json index aa8dab48684a..305640a45d69 100644 --- a/src/sonic-config-engine/tests/sample_output/py3/buffer-arista7800r3-48cq2-lc.json +++ b/src/sonic-config-engine/tests/sample_output/py3/buffer-arista7800r3-48cq2-lc.json @@ -57,7 +57,7 @@ "size": "6441610000", "type": "both", "mode": "dynamic", - "xoff": "11678515" + "xoff": "20761804" } }, "BUFFER_PROFILE": { diff --git a/src/sonic-config-engine/tests/sample_output/py3/buffer-arista7800r3-48cqm2-lc.json b/src/sonic-config-engine/tests/sample_output/py3/buffer-arista7800r3-48cqm2-lc.json new file mode 100644 index 000000000000..8dacec342179 --- /dev/null +++ b/src/sonic-config-engine/tests/sample_output/py3/buffer-arista7800r3-48cqm2-lc.json @@ -0,0 +1,1517 @@ +{ + "CABLE_LENGTH": { + "AZURE": { + "Ethernet180": "300m", + "Ethernet8": "300m", + "Ethernet184": "300m", + "Ethernet188": "300m", + "Ethernet0": "300m", + "Ethernet4": "300m", + "Ethernet108": "300m", + "Ethernet100": "300m", + "Ethernet128": "300m", + "Ethernet104": "300m", + "Ethernet68": "300m", + "Ethernet96": "300m", + "Ethernet124": "300m", + "Ethernet148": "300m", + "Ethernet92": "300m", + "Ethernet120": "300m", + "Ethernet144": "300m", + "Ethernet52": "300m", + "Ethernet160": "300m", + "Ethernet140": "300m", + "Ethernet56": "300m", + "Ethernet164": "300m", + "Ethernet76": "300m", + "Ethernet72": "300m", + "Ethernet64": "300m", + "Ethernet32": "300m", + "Ethernet16": "300m", + "Ethernet36": "300m", + "Ethernet12": "300m", + "Ethernet168": "300m", + "Ethernet116": "300m", + "Ethernet80": "300m", + "Ethernet112": "300m", + "Ethernet84": "300m", + "Ethernet152": "300m", + "Ethernet136": "300m", + "Ethernet156": "300m", + "Ethernet132": "300m", + "Ethernet48": "300m", + "Ethernet172": "300m", + "Ethernet44": "300m", + "Ethernet176": "300m", + "Ethernet40": "300m", + "Ethernet28": "300m", + "Ethernet88": "300m", + "Ethernet60": "300m", + "Ethernet20": "300m", + "Ethernet24": "300m" + } + }, + + "BUFFER_POOL": { + "ingress_lossless_pool": { + "size": "6441610000", + "type": "both", + "mode": "dynamic", + "xoff": "1056256819" + } + }, + "BUFFER_PROFILE": { + "ingress_lossy_profile": { + "pool":"ingress_lossless_pool", + "size":"1280", + "xon_offset":"2560", + "dynamic_th":"0" + }, + "egress_lossless_profile": { + "pool":"ingress_lossless_pool", + "size":"0", + "static_th":"33030144" + }, + "egress_lossy_profile": { + "pool":"ingress_lossless_pool", + "size":"0", + "dynamic_th":"-1" + } + }, + "BUFFER_PG": { + "Ethernet180|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet8|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet184|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet188|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet0|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet4|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet108|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet100|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet128|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet104|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet68|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet96|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet124|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet148|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet92|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet120|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet144|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet52|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet140|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet56|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet164|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet76|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet72|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet64|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet32|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet16|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet36|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet12|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet88|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet116|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet80|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet112|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet84|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet152|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet136|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet156|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet132|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet48|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet44|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet176|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet40|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet28|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet60|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet20|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet24|0": { + "profile" : "ingress_lossy_profile" + } + }, + + "BUFFER_QUEUE": { + "dut-lc3|Asic0|Ethernet0|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc3|Asic0|Ethernet4|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc3|Asic0|Ethernet8|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc3|Asic0|Ethernet12|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc3|Asic0|Ethernet16|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc3|Asic0|Ethernet20|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc3|Asic0|Ethernet24|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc3|Asic0|Ethernet28|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc3|Asic0|Ethernet32|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc3|Asic0|Ethernet36|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc3|Asic0|Ethernet40|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc3|Asic0|Ethernet44|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc3|Asic0|Ethernet48|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc3|Asic0|Ethernet52|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc3|Asic0|Ethernet56|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc3|Asic0|Ethernet60|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc3|Asic0|Ethernet64|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc3|Asic0|Ethernet68|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc3|Asic0|Ethernet72|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc3|Asic0|Ethernet76|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc3|Asic0|Ethernet80|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc3|Asic0|Ethernet84|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc3|Asic0|Ethernet88|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc3|Asic0|Ethernet92|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc3|Asic0|Ethernet96|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc3|Asic0|Ethernet100|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc3|Asic0|Ethernet104|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc3|Asic0|Ethernet108|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc3|Asic0|Ethernet112|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc3|Asic0|Ethernet116|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc3|Asic0|Ethernet120|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc3|Asic0|Ethernet124|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc3|Asic0|Ethernet128|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc3|Asic0|Ethernet132|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc3|Asic0|Ethernet136|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc3|Asic0|Ethernet140|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc3|Asic0|Ethernet144|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc3|Asic0|Ethernet148|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc3|Asic0|Ethernet152|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc3|Asic0|Ethernet156|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc3|Asic0|Ethernet160|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc3|Asic0|Ethernet164|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc3|Asic0|Ethernet168|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc3|Asic0|Ethernet172|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc3|Asic0|Ethernet176|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc3|Asic0|Ethernet180|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc3|Asic0|Ethernet184|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc3|Asic0|Ethernet188|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc4|Asic0|Ethernet0|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc4|Asic0|Ethernet4|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc4|Asic0|Ethernet8|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc4|Asic0|Ethernet12|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc4|Asic0|Ethernet16|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc4|Asic0|Ethernet20|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc4|Asic0|Ethernet24|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc4|Asic0|Ethernet28|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc4|Asic0|Ethernet32|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc4|Asic0|Ethernet36|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc4|Asic0|Ethernet40|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc4|Asic0|Ethernet44|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc4|Asic0|Ethernet48|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc4|Asic0|Ethernet52|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc4|Asic0|Ethernet56|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc4|Asic0|Ethernet60|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc4|Asic0|Ethernet64|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc4|Asic0|Ethernet68|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc4|Asic0|Ethernet72|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc4|Asic0|Ethernet76|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc4|Asic0|Ethernet80|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc4|Asic0|Ethernet84|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc4|Asic0|Ethernet88|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc4|Asic0|Ethernet92|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc4|Asic0|Ethernet96|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc4|Asic0|Ethernet100|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc4|Asic0|Ethernet104|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc4|Asic0|Ethernet108|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc4|Asic0|Ethernet112|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc4|Asic0|Ethernet116|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc4|Asic0|Ethernet120|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc4|Asic0|Ethernet124|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc4|Asic0|Ethernet128|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc4|Asic0|Ethernet132|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc4|Asic0|Ethernet136|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc4|Asic0|Ethernet140|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc4|Asic0|Ethernet144|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc4|Asic0|Ethernet148|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc4|Asic0|Ethernet152|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc4|Asic0|Ethernet156|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc4|Asic0|Ethernet160|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc4|Asic0|Ethernet164|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc4|Asic0|Ethernet168|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc4|Asic0|Ethernet172|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc4|Asic0|Ethernet176|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc4|Asic0|Ethernet180|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc4|Asic0|Ethernet184|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc4|Asic0|Ethernet188|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc5|Asic0|Ethernet0|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc5|Asic0|Ethernet4|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc5|Asic0|Ethernet8|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc5|Asic0|Ethernet12|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc5|Asic0|Ethernet16|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc5|Asic0|Ethernet20|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc5|Asic0|Ethernet24|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc5|Asic0|Ethernet28|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc5|Asic0|Ethernet32|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc5|Asic0|Ethernet36|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc5|Asic0|Ethernet40|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc5|Asic0|Ethernet44|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc5|Asic0|Ethernet48|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc5|Asic0|Ethernet52|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc5|Asic0|Ethernet56|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc5|Asic0|Ethernet60|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc5|Asic0|Ethernet64|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc5|Asic0|Ethernet68|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc5|Asic0|Ethernet72|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc5|Asic0|Ethernet76|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc5|Asic0|Ethernet80|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc5|Asic0|Ethernet84|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc5|Asic0|Ethernet88|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc5|Asic0|Ethernet92|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc5|Asic0|Ethernet96|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc5|Asic0|Ethernet100|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc5|Asic0|Ethernet104|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc5|Asic0|Ethernet108|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc5|Asic0|Ethernet112|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc5|Asic0|Ethernet116|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc5|Asic0|Ethernet120|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc5|Asic0|Ethernet124|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc5|Asic0|Ethernet128|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc5|Asic0|Ethernet132|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc5|Asic0|Ethernet136|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc5|Asic0|Ethernet140|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc5|Asic0|Ethernet144|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc5|Asic0|Ethernet148|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc5|Asic0|Ethernet152|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc5|Asic0|Ethernet156|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc5|Asic0|Ethernet160|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc5|Asic0|Ethernet164|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc5|Asic0|Ethernet168|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc5|Asic0|Ethernet172|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc5|Asic0|Ethernet176|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc5|Asic0|Ethernet180|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc5|Asic0|Ethernet184|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc5|Asic0|Ethernet188|3-4": { + "profile" : "egress_lossless_profile" + }, + "dut-lc3|Asic0|Ethernet0|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc3|Asic0|Ethernet4|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc3|Asic0|Ethernet8|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc3|Asic0|Ethernet12|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc3|Asic0|Ethernet16|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc3|Asic0|Ethernet20|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc3|Asic0|Ethernet24|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc3|Asic0|Ethernet28|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc3|Asic0|Ethernet32|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc3|Asic0|Ethernet36|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc3|Asic0|Ethernet40|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc3|Asic0|Ethernet44|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc3|Asic0|Ethernet48|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc3|Asic0|Ethernet52|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc3|Asic0|Ethernet56|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc3|Asic0|Ethernet60|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc3|Asic0|Ethernet64|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc3|Asic0|Ethernet68|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc3|Asic0|Ethernet72|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc3|Asic0|Ethernet76|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc3|Asic0|Ethernet80|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc3|Asic0|Ethernet84|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc3|Asic0|Ethernet88|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc3|Asic0|Ethernet92|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc3|Asic0|Ethernet96|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc3|Asic0|Ethernet100|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc3|Asic0|Ethernet104|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc3|Asic0|Ethernet108|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc3|Asic0|Ethernet112|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc3|Asic0|Ethernet116|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc3|Asic0|Ethernet120|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc3|Asic0|Ethernet124|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc3|Asic0|Ethernet128|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc3|Asic0|Ethernet132|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc3|Asic0|Ethernet136|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc3|Asic0|Ethernet140|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc3|Asic0|Ethernet144|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc3|Asic0|Ethernet148|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc3|Asic0|Ethernet152|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc3|Asic0|Ethernet156|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc3|Asic0|Ethernet160|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc3|Asic0|Ethernet164|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc3|Asic0|Ethernet168|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc3|Asic0|Ethernet172|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc3|Asic0|Ethernet176|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc3|Asic0|Ethernet180|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc3|Asic0|Ethernet184|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc3|Asic0|Ethernet188|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc4|Asic0|Ethernet0|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc4|Asic0|Ethernet4|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc4|Asic0|Ethernet8|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc4|Asic0|Ethernet12|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc4|Asic0|Ethernet16|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc4|Asic0|Ethernet20|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc4|Asic0|Ethernet24|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc4|Asic0|Ethernet28|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc4|Asic0|Ethernet32|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc4|Asic0|Ethernet36|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc4|Asic0|Ethernet40|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc4|Asic0|Ethernet44|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc4|Asic0|Ethernet48|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc4|Asic0|Ethernet52|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc4|Asic0|Ethernet56|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc4|Asic0|Ethernet60|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc4|Asic0|Ethernet64|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc4|Asic0|Ethernet68|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc4|Asic0|Ethernet72|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc4|Asic0|Ethernet76|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc4|Asic0|Ethernet80|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc4|Asic0|Ethernet84|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc4|Asic0|Ethernet88|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc4|Asic0|Ethernet92|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc4|Asic0|Ethernet96|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc4|Asic0|Ethernet100|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc4|Asic0|Ethernet104|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc4|Asic0|Ethernet108|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc4|Asic0|Ethernet112|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc4|Asic0|Ethernet116|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc4|Asic0|Ethernet120|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc4|Asic0|Ethernet124|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc4|Asic0|Ethernet128|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc4|Asic0|Ethernet132|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc4|Asic0|Ethernet136|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc4|Asic0|Ethernet140|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc4|Asic0|Ethernet144|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc4|Asic0|Ethernet148|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc4|Asic0|Ethernet152|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc4|Asic0|Ethernet156|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc4|Asic0|Ethernet160|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc4|Asic0|Ethernet164|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc4|Asic0|Ethernet168|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc4|Asic0|Ethernet172|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc4|Asic0|Ethernet176|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc4|Asic0|Ethernet180|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc4|Asic0|Ethernet184|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc4|Asic0|Ethernet188|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc5|Asic0|Ethernet0|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc5|Asic0|Ethernet4|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc5|Asic0|Ethernet8|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc5|Asic0|Ethernet12|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc5|Asic0|Ethernet16|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc5|Asic0|Ethernet20|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc5|Asic0|Ethernet24|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc5|Asic0|Ethernet28|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc5|Asic0|Ethernet32|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc5|Asic0|Ethernet36|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc5|Asic0|Ethernet40|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc5|Asic0|Ethernet44|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc5|Asic0|Ethernet48|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc5|Asic0|Ethernet52|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc5|Asic0|Ethernet56|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc5|Asic0|Ethernet60|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc5|Asic0|Ethernet64|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc5|Asic0|Ethernet68|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc5|Asic0|Ethernet72|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc5|Asic0|Ethernet76|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc5|Asic0|Ethernet80|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc5|Asic0|Ethernet84|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc5|Asic0|Ethernet88|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc5|Asic0|Ethernet92|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc5|Asic0|Ethernet96|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc5|Asic0|Ethernet100|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc5|Asic0|Ethernet104|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc5|Asic0|Ethernet108|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc5|Asic0|Ethernet112|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc5|Asic0|Ethernet116|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc5|Asic0|Ethernet120|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc5|Asic0|Ethernet124|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc5|Asic0|Ethernet128|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc5|Asic0|Ethernet132|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc5|Asic0|Ethernet136|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc5|Asic0|Ethernet140|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc5|Asic0|Ethernet144|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc5|Asic0|Ethernet148|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc5|Asic0|Ethernet152|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc5|Asic0|Ethernet156|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc5|Asic0|Ethernet160|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc5|Asic0|Ethernet164|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc5|Asic0|Ethernet168|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc5|Asic0|Ethernet172|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc5|Asic0|Ethernet176|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc5|Asic0|Ethernet180|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc5|Asic0|Ethernet184|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc5|Asic0|Ethernet188|0-2": { + "profile" : "egress_lossy_profile" + }, + "dut-lc3|Asic0|Ethernet0|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc3|Asic0|Ethernet4|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc3|Asic0|Ethernet8|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc3|Asic0|Ethernet12|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc3|Asic0|Ethernet16|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc3|Asic0|Ethernet20|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc3|Asic0|Ethernet24|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc3|Asic0|Ethernet28|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc3|Asic0|Ethernet32|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc3|Asic0|Ethernet36|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc3|Asic0|Ethernet40|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc3|Asic0|Ethernet44|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc3|Asic0|Ethernet48|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc3|Asic0|Ethernet52|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc3|Asic0|Ethernet56|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc3|Asic0|Ethernet60|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc3|Asic0|Ethernet64|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc3|Asic0|Ethernet68|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc3|Asic0|Ethernet72|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc3|Asic0|Ethernet76|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc3|Asic0|Ethernet80|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc3|Asic0|Ethernet84|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc3|Asic0|Ethernet88|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc3|Asic0|Ethernet92|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc3|Asic0|Ethernet96|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc3|Asic0|Ethernet100|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc3|Asic0|Ethernet104|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc3|Asic0|Ethernet108|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc3|Asic0|Ethernet112|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc3|Asic0|Ethernet116|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc3|Asic0|Ethernet120|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc3|Asic0|Ethernet124|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc3|Asic0|Ethernet128|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc3|Asic0|Ethernet132|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc3|Asic0|Ethernet136|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc3|Asic0|Ethernet140|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc3|Asic0|Ethernet144|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc3|Asic0|Ethernet148|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc3|Asic0|Ethernet152|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc3|Asic0|Ethernet156|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc3|Asic0|Ethernet160|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc3|Asic0|Ethernet164|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc3|Asic0|Ethernet168|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc3|Asic0|Ethernet172|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc3|Asic0|Ethernet176|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc3|Asic0|Ethernet180|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc3|Asic0|Ethernet184|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc3|Asic0|Ethernet188|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc4|Asic0|Ethernet0|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc4|Asic0|Ethernet4|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc4|Asic0|Ethernet8|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc4|Asic0|Ethernet12|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc4|Asic0|Ethernet16|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc4|Asic0|Ethernet20|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc4|Asic0|Ethernet24|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc4|Asic0|Ethernet28|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc4|Asic0|Ethernet32|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc4|Asic0|Ethernet36|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc4|Asic0|Ethernet40|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc4|Asic0|Ethernet44|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc4|Asic0|Ethernet48|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc4|Asic0|Ethernet52|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc4|Asic0|Ethernet56|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc4|Asic0|Ethernet60|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc4|Asic0|Ethernet64|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc4|Asic0|Ethernet68|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc4|Asic0|Ethernet72|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc4|Asic0|Ethernet76|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc4|Asic0|Ethernet80|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc4|Asic0|Ethernet84|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc4|Asic0|Ethernet88|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc4|Asic0|Ethernet92|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc4|Asic0|Ethernet96|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc4|Asic0|Ethernet100|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc4|Asic0|Ethernet104|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc4|Asic0|Ethernet108|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc4|Asic0|Ethernet112|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc4|Asic0|Ethernet116|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc4|Asic0|Ethernet120|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc4|Asic0|Ethernet124|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc4|Asic0|Ethernet128|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc4|Asic0|Ethernet132|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc4|Asic0|Ethernet136|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc4|Asic0|Ethernet140|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc4|Asic0|Ethernet144|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc4|Asic0|Ethernet148|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc4|Asic0|Ethernet152|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc4|Asic0|Ethernet156|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc4|Asic0|Ethernet160|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc4|Asic0|Ethernet164|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc4|Asic0|Ethernet168|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc4|Asic0|Ethernet172|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc4|Asic0|Ethernet176|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc4|Asic0|Ethernet180|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc4|Asic0|Ethernet184|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc4|Asic0|Ethernet188|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc5|Asic0|Ethernet0|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc5|Asic0|Ethernet4|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc5|Asic0|Ethernet8|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc5|Asic0|Ethernet12|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc5|Asic0|Ethernet16|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc5|Asic0|Ethernet20|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc5|Asic0|Ethernet24|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc5|Asic0|Ethernet28|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc5|Asic0|Ethernet32|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc5|Asic0|Ethernet36|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc5|Asic0|Ethernet40|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc5|Asic0|Ethernet44|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc5|Asic0|Ethernet48|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc5|Asic0|Ethernet52|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc5|Asic0|Ethernet56|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc5|Asic0|Ethernet60|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc5|Asic0|Ethernet64|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc5|Asic0|Ethernet68|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc5|Asic0|Ethernet72|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc5|Asic0|Ethernet76|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc5|Asic0|Ethernet80|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc5|Asic0|Ethernet84|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc5|Asic0|Ethernet88|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc5|Asic0|Ethernet92|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc5|Asic0|Ethernet96|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc5|Asic0|Ethernet100|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc5|Asic0|Ethernet104|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc5|Asic0|Ethernet108|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc5|Asic0|Ethernet112|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc5|Asic0|Ethernet116|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc5|Asic0|Ethernet120|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc5|Asic0|Ethernet124|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc5|Asic0|Ethernet128|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc5|Asic0|Ethernet132|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc5|Asic0|Ethernet136|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc5|Asic0|Ethernet140|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc5|Asic0|Ethernet144|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc5|Asic0|Ethernet148|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc5|Asic0|Ethernet152|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc5|Asic0|Ethernet156|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc5|Asic0|Ethernet160|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc5|Asic0|Ethernet164|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc5|Asic0|Ethernet168|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc5|Asic0|Ethernet172|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc5|Asic0|Ethernet176|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc5|Asic0|Ethernet180|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc5|Asic0|Ethernet184|5-6": { + "profile" : "egress_lossy_profile" + }, + "dut-lc5|Asic0|Ethernet188|5-6": { + "profile" : "egress_lossy_profile" + } + } +} diff --git a/src/sonic-config-engine/tests/sample_output/py3/buffer-arista7800r3a-36dm2-c36-lc.json b/src/sonic-config-engine/tests/sample_output/py3/buffer-arista7800r3a-36dm2-c36-lc.json new file mode 100644 index 000000000000..fa6b56ab02d9 --- /dev/null +++ b/src/sonic-config-engine/tests/sample_output/py3/buffer-arista7800r3a-36dm2-c36-lc.json @@ -0,0 +1,1299 @@ + { + "CABLE_LENGTH": { + "AZURE": { + "Ethernet0": "5m", + "Ethernet8": "5m", + "Ethernet16": "5m", + "Ethernet24": "5m", + "Ethernet32": "5m", + "Ethernet40": "5m", + "Ethernet48": "5m", + "Ethernet56": "5m", + "Ethernet64": "5m", + "Ethernet72": "5m", + "Ethernet80": "5m", + "Ethernet88": "5m", + "Ethernet96": "5m", + "Ethernet104": "5m", + "Ethernet112": "5m", + "Ethernet120": "5m", + "Ethernet128": "5m", + "Ethernet136": "5m" + } + }, + + "BUFFER_POOL": { + "ingress_lossless_pool": { + "size": "6441610000", + "type": "both", + "mode": "dynamic", + "xoff": "396096307" + } + }, + "BUFFER_PROFILE": { + "ingress_lossy_profile": { + "pool":"ingress_lossless_pool", + "size":"1280", + "xon_offset": "2560", + "dynamic_th":"0" + }, + "egress_lossless_profile": { + "pool":"ingress_lossless_pool", + "size":"0", + "static_th":"33030144" + }, + "egress_lossy_profile": { + "pool":"ingress_lossless_pool", + "size":"0", + "dynamic_th":"-1" + } + }, + + "BUFFER_PG": { + "Ethernet0|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet8|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet16|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet24|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet32|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet40|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet48|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet56|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet64|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet72|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet80|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet88|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet96|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet104|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet112|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet120|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet128|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet136|0": { + "profile" : "ingress_lossy_profile" + } + }, + + "BUFFER_QUEUE": { + "str2-7804-lc3-1|Asic0|Ethernet0|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet4|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet8|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet12|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet16|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet20|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet24|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet28|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet32|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet36|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet40|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet44|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet48|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet52|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet56|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet60|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet64|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet68|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet72|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet76|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet80|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet84|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet88|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet92|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet96|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet100|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet104|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet108|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet112|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet116|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet120|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet124|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet128|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet132|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet136|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet140|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet144|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet148|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet152|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet156|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet160|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet164|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet168|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet172|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet176|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet180|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet184|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet188|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet0|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet4|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet8|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet12|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet16|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet20|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet24|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet28|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet32|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet36|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet40|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet44|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet48|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet52|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet56|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet60|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet64|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet68|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet72|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet76|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet80|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet84|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet88|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet92|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet96|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet100|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet104|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet108|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet112|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet116|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet120|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet124|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet128|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet132|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet136|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet140|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet144|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet148|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet152|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet156|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet160|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet164|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet168|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet172|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet176|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet180|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet184|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet188|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc5-1|asic0|Ethernet0|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc5-1|asic0|Ethernet8|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc5-1|asic0|Ethernet16|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc5-1|asic0|Ethernet24|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc5-1|asic0|Ethernet32|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc5-1|asic0|Ethernet40|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc5-1|asic0|Ethernet48|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc5-1|asic0|Ethernet56|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc5-1|asic0|Ethernet64|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc5-1|asic0|Ethernet72|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc5-1|asic0|Ethernet80|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc5-1|asic0|Ethernet88|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc5-1|asic0|Ethernet96|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc5-1|asic0|Ethernet104|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc5-1|asic0|Ethernet112|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc5-1|asic0|Ethernet120|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc5-1|asic0|Ethernet128|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc5-1|asic0|Ethernet136|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc5-1|asic1|Ethernet144|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc5-1|asic1|Ethernet152|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc5-1|asic1|Ethernet160|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc5-1|asic1|Ethernet168|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc5-1|asic1|Ethernet176|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc5-1|asic1|Ethernet184|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc5-1|asic1|Ethernet192|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc5-1|asic1|Ethernet200|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc5-1|asic1|Ethernet208|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc5-1|asic1|Ethernet216|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc5-1|asic1|Ethernet224|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc5-1|asic1|Ethernet232|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc5-1|asic1|Ethernet240|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc5-1|asic1|Ethernet248|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc5-1|asic1|Ethernet256|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc5-1|asic1|Ethernet264|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc5-1|asic1|Ethernet272|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc5-1|asic1|Ethernet280|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet0|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet4|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet8|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet12|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet16|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet20|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet24|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet28|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet32|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet36|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet40|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet44|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet48|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet52|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet56|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet60|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet64|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet68|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet72|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet76|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet80|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet84|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet88|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet92|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet96|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet100|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet104|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet108|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet112|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet116|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet120|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet124|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet128|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet132|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet136|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet140|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet144|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet148|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet152|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet156|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet160|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet164|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet168|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet172|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet176|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet180|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet184|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet188|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet0|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet4|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet8|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet12|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet16|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet20|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet24|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet28|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet32|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet36|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet40|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet44|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet48|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet52|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet56|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet60|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet64|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet68|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet72|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet76|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet80|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet84|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet88|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet92|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet96|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet100|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet104|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet108|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet112|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet116|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet120|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet124|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet128|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet132|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet136|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet140|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet144|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet148|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet152|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet156|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet160|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet164|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet168|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet172|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet176|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet180|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet184|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet188|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc5-1|asic0|Ethernet0|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc5-1|asic0|Ethernet8|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc5-1|asic0|Ethernet16|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc5-1|asic0|Ethernet24|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc5-1|asic0|Ethernet32|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc5-1|asic0|Ethernet40|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc5-1|asic0|Ethernet48|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc5-1|asic0|Ethernet56|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc5-1|asic0|Ethernet64|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc5-1|asic0|Ethernet72|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc5-1|asic0|Ethernet80|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc5-1|asic0|Ethernet88|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc5-1|asic0|Ethernet96|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc5-1|asic0|Ethernet104|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc5-1|asic0|Ethernet112|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc5-1|asic0|Ethernet120|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc5-1|asic0|Ethernet128|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc5-1|asic0|Ethernet136|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc5-1|asic1|Ethernet144|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc5-1|asic1|Ethernet152|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc5-1|asic1|Ethernet160|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc5-1|asic1|Ethernet168|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc5-1|asic1|Ethernet176|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc5-1|asic1|Ethernet184|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc5-1|asic1|Ethernet192|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc5-1|asic1|Ethernet200|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc5-1|asic1|Ethernet208|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc5-1|asic1|Ethernet216|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc5-1|asic1|Ethernet224|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc5-1|asic1|Ethernet232|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc5-1|asic1|Ethernet240|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc5-1|asic1|Ethernet248|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc5-1|asic1|Ethernet256|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc5-1|asic1|Ethernet264|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc5-1|asic1|Ethernet272|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc5-1|asic1|Ethernet280|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet0|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet4|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet8|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet12|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet16|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet20|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet24|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet28|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet32|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet36|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet40|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet44|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet48|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet52|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet56|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet60|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet64|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet68|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet72|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet76|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet80|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet84|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet88|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet92|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet96|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet100|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet104|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet108|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet112|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet116|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet120|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet124|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet128|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet132|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet136|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet140|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet144|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet148|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet152|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet156|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet160|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet164|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet168|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet172|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet176|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet180|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet184|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc3-1|Asic0|Ethernet188|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet0|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet4|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet8|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet12|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet16|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet20|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet24|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet28|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet32|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet36|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet40|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet44|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet48|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet52|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet56|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet60|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet64|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet68|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet72|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet76|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet80|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet84|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet88|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet92|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet96|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet100|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet104|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet108|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet112|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet116|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet120|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet124|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet128|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet132|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet136|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet140|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet144|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet148|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet152|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet156|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet160|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet164|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet168|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet172|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet176|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet180|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet184|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc7-1|Asic0|Ethernet188|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc5-1|asic0|Ethernet0|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc5-1|asic0|Ethernet8|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc5-1|asic0|Ethernet16|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc5-1|asic0|Ethernet24|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc5-1|asic0|Ethernet32|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc5-1|asic0|Ethernet40|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc5-1|asic0|Ethernet48|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc5-1|asic0|Ethernet56|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc5-1|asic0|Ethernet64|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc5-1|asic0|Ethernet72|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc5-1|asic0|Ethernet80|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc5-1|asic0|Ethernet88|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc5-1|asic0|Ethernet96|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc5-1|asic0|Ethernet104|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc5-1|asic0|Ethernet112|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc5-1|asic0|Ethernet120|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc5-1|asic0|Ethernet128|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc5-1|asic0|Ethernet136|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc5-1|asic1|Ethernet144|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc5-1|asic1|Ethernet152|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc5-1|asic1|Ethernet160|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc5-1|asic1|Ethernet168|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc5-1|asic1|Ethernet176|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc5-1|asic1|Ethernet184|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc5-1|asic1|Ethernet192|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc5-1|asic1|Ethernet200|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc5-1|asic1|Ethernet208|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc5-1|asic1|Ethernet216|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc5-1|asic1|Ethernet224|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc5-1|asic1|Ethernet232|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc5-1|asic1|Ethernet240|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc5-1|asic1|Ethernet248|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc5-1|asic1|Ethernet256|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc5-1|asic1|Ethernet264|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc5-1|asic1|Ethernet272|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7804-lc5-1|asic1|Ethernet280|5-6": { + "profile" : "egress_lossy_profile" + } + } +} diff --git a/src/sonic-config-engine/tests/sample_output/py3/buffer-arista7800r3a-36dm2-d36-lc.json b/src/sonic-config-engine/tests/sample_output/py3/buffer-arista7800r3a-36dm2-d36-lc.json new file mode 100644 index 000000000000..026f88f033f7 --- /dev/null +++ b/src/sonic-config-engine/tests/sample_output/py3/buffer-arista7800r3a-36dm2-d36-lc.json @@ -0,0 +1,1299 @@ + { + "CABLE_LENGTH": { + "AZURE": { + "Ethernet0": "5m", + "Ethernet8": "5m", + "Ethernet16": "5m", + "Ethernet24": "5m", + "Ethernet32": "5m", + "Ethernet40": "5m", + "Ethernet48": "5m", + "Ethernet56": "5m", + "Ethernet64": "5m", + "Ethernet72": "5m", + "Ethernet80": "5m", + "Ethernet88": "5m", + "Ethernet96": "5m", + "Ethernet104": "5m", + "Ethernet112": "5m", + "Ethernet120": "5m", + "Ethernet128": "5m", + "Ethernet136": "5m" + } + }, + + "BUFFER_POOL": { + "ingress_lossless_pool": { + "size": "6441610000", + "type": "both", + "mode": "dynamic", + "xoff": "1582033305" + } + }, + "BUFFER_PROFILE": { + "ingress_lossy_profile": { + "pool":"ingress_lossless_pool", + "size":"1280", + "xon_offset": "2560", + "dynamic_th":"0" + }, + "egress_lossless_profile": { + "pool":"ingress_lossless_pool", + "size":"0", + "static_th":"33030144" + }, + "egress_lossy_profile": { + "pool":"ingress_lossless_pool", + "size":"0", + "dynamic_th":"-1" + } + }, + + "BUFFER_PG": { + "Ethernet0|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet8|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet16|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet24|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet32|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet40|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet48|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet56|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet64|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet72|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet80|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet88|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet96|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet104|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet112|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet120|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet128|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet136|0": { + "profile" : "ingress_lossy_profile" + } + }, + + "BUFFER_QUEUE": { + "str3-7800-lc8-1|asic0|Ethernet0|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc8-1|asic0|Ethernet8|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc8-1|asic0|Ethernet16|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc8-1|asic0|Ethernet24|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc8-1|asic0|Ethernet32|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc8-1|asic0|Ethernet40|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc8-1|asic0|Ethernet48|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc8-1|asic0|Ethernet56|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc8-1|asic0|Ethernet64|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc8-1|asic0|Ethernet72|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc8-1|asic0|Ethernet80|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc8-1|asic0|Ethernet88|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc8-1|asic0|Ethernet96|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc8-1|asic0|Ethernet104|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc8-1|asic0|Ethernet112|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc8-1|asic0|Ethernet120|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc8-1|asic0|Ethernet128|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc8-1|asic0|Ethernet136|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc8-1|asic1|Ethernet144|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc8-1|asic1|Ethernet152|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc8-1|asic1|Ethernet160|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc8-1|asic1|Ethernet168|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc8-1|asic1|Ethernet176|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc8-1|asic1|Ethernet184|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc8-1|asic1|Ethernet192|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc8-1|asic1|Ethernet200|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc8-1|asic1|Ethernet208|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc8-1|asic1|Ethernet216|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc8-1|asic1|Ethernet224|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc8-1|asic1|Ethernet232|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc8-1|asic1|Ethernet240|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc8-1|asic1|Ethernet248|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc8-1|asic1|Ethernet256|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc8-1|asic1|Ethernet264|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc8-1|asic1|Ethernet272|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc8-1|asic1|Ethernet280|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet0|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet4|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet8|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet12|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet16|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet20|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet24|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet28|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet32|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet36|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet40|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet44|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet48|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet52|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet56|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet60|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet64|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet68|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet72|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet76|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet80|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet84|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet88|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet92|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet96|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet100|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet104|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet108|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet112|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet116|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet120|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet124|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet128|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet132|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet136|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet140|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet144|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet148|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet152|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet156|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet160|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet164|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet168|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet172|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet176|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet180|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet184|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet188|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet0|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet4|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet8|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet12|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet16|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet20|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet24|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet28|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet32|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet36|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet40|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet44|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet48|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet52|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet56|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet60|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet64|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet68|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet72|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet76|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet80|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet84|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet88|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet92|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet96|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet100|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet104|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet108|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet112|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet116|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet120|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet124|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet128|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet132|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet136|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet140|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet144|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet148|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet152|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet156|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet160|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet164|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet168|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet172|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet176|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet180|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet184|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet188|3-4": { + "profile" : "egress_lossless_profile" + }, + "str3-7800-lc8-1|asic0|Ethernet0|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc8-1|asic0|Ethernet8|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc8-1|asic0|Ethernet16|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc8-1|asic0|Ethernet24|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc8-1|asic0|Ethernet32|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc8-1|asic0|Ethernet40|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc8-1|asic0|Ethernet48|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc8-1|asic0|Ethernet56|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc8-1|asic0|Ethernet64|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc8-1|asic0|Ethernet72|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc8-1|asic0|Ethernet80|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc8-1|asic0|Ethernet88|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc8-1|asic0|Ethernet96|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc8-1|asic0|Ethernet104|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc8-1|asic0|Ethernet112|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc8-1|asic0|Ethernet120|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc8-1|asic0|Ethernet128|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc8-1|asic0|Ethernet136|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc8-1|asic1|Ethernet144|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc8-1|asic1|Ethernet152|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc8-1|asic1|Ethernet160|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc8-1|asic1|Ethernet168|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc8-1|asic1|Ethernet176|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc8-1|asic1|Ethernet184|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc8-1|asic1|Ethernet192|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc8-1|asic1|Ethernet200|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc8-1|asic1|Ethernet208|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc8-1|asic1|Ethernet216|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc8-1|asic1|Ethernet224|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc8-1|asic1|Ethernet232|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc8-1|asic1|Ethernet240|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc8-1|asic1|Ethernet248|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc8-1|asic1|Ethernet256|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc8-1|asic1|Ethernet264|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc8-1|asic1|Ethernet272|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc8-1|asic1|Ethernet280|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet0|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet4|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet8|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet12|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet16|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet20|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet24|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet28|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet32|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet36|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet40|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet44|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet48|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet52|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet56|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet60|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet64|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet68|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet72|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet76|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet80|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet84|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet88|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet92|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet96|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet100|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet104|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet108|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet112|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet116|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet120|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet124|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet128|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet132|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet136|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet140|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet144|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet148|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet152|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet156|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet160|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet164|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet168|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet172|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet176|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet180|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet184|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet188|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet0|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet4|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet8|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet12|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet16|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet20|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet24|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet28|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet32|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet36|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet40|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet44|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet48|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet52|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet56|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet60|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet64|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet68|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet72|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet76|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet80|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet84|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet88|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet92|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet96|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet100|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet104|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet108|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet112|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet116|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet120|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet124|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet128|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet132|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet136|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet140|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet144|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet148|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet152|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet156|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet160|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet164|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet168|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet172|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet176|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet180|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet184|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet188|0-2": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc8-1|asic0|Ethernet0|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc8-1|asic0|Ethernet8|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc8-1|asic0|Ethernet16|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc8-1|asic0|Ethernet24|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc8-1|asic0|Ethernet32|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc8-1|asic0|Ethernet40|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc8-1|asic0|Ethernet48|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc8-1|asic0|Ethernet56|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc8-1|asic0|Ethernet64|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc8-1|asic0|Ethernet72|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc8-1|asic0|Ethernet80|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc8-1|asic0|Ethernet88|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc8-1|asic0|Ethernet96|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc8-1|asic0|Ethernet104|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc8-1|asic0|Ethernet112|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc8-1|asic0|Ethernet120|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc8-1|asic0|Ethernet128|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc8-1|asic0|Ethernet136|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc8-1|asic1|Ethernet144|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc8-1|asic1|Ethernet152|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc8-1|asic1|Ethernet160|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc8-1|asic1|Ethernet168|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc8-1|asic1|Ethernet176|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc8-1|asic1|Ethernet184|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc8-1|asic1|Ethernet192|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc8-1|asic1|Ethernet200|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc8-1|asic1|Ethernet208|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc8-1|asic1|Ethernet216|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc8-1|asic1|Ethernet224|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc8-1|asic1|Ethernet232|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc8-1|asic1|Ethernet240|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc8-1|asic1|Ethernet248|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc8-1|asic1|Ethernet256|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc8-1|asic1|Ethernet264|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc8-1|asic1|Ethernet272|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc8-1|asic1|Ethernet280|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet0|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet4|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet8|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet12|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet16|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet20|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet24|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet28|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet32|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet36|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet40|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet44|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet48|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet52|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet56|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet60|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet64|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet68|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet72|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet76|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet80|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet84|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet88|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet92|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet96|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet100|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet104|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet108|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet112|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet116|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet120|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet124|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet128|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet132|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet136|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet140|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet144|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet148|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet152|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet156|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet160|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet164|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet168|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet172|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet176|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet180|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet184|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc1-1|Asic0|Ethernet188|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet0|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet4|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet8|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet12|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet16|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet20|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet24|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet28|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet32|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet36|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet40|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet44|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet48|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet52|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet56|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet60|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet64|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet68|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet72|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet76|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet80|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet84|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet88|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet92|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet96|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet100|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet104|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet108|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet112|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet116|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet120|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet124|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet128|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet132|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet136|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet140|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet144|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet148|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet152|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet156|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet160|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet164|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet168|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet172|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet176|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet180|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet184|5-6": { + "profile" : "egress_lossy_profile" + }, + "str3-7800-lc2-1|Asic0|Ethernet188|5-6": { + "profile" : "egress_lossy_profile" + } + } +} diff --git a/src/sonic-config-engine/tests/sample_output/py3/buffer-nokia-ixr7250e-36x100g.json b/src/sonic-config-engine/tests/sample_output/py3/buffer-nokia-ixr7250e-36x100g.json new file mode 100644 index 000000000000..32bb54925738 --- /dev/null +++ b/src/sonic-config-engine/tests/sample_output/py3/buffer-nokia-ixr7250e-36x100g.json @@ -0,0 +1,1083 @@ + { + "CABLE_LENGTH": { + "AZURE": { + "Ethernet0": "5m", + "Ethernet8": "5m", + "Ethernet16": "5m", + "Ethernet24": "5m", + "Ethernet32": "5m", + "Ethernet40": "5m", + "Ethernet48": "5m", + "Ethernet56": "5m", + "Ethernet64": "5m", + "Ethernet72": "5m", + "Ethernet80": "5m", + "Ethernet88": "5m", + "Ethernet96": "5m", + "Ethernet104": "5m", + "Ethernet112": "5m", + "Ethernet120": "5m", + "Ethernet128": "5m", + "Ethernet136": "5m" + } + }, + + "BUFFER_POOL": { + "ingress_lossless_pool": { + "size": "6441610000", + "type": "both", + "mode": "dynamic", + "xoff": "7785676" + } + }, + "BUFFER_PROFILE": { + "ingress_lossy_profile": { + "pool":"ingress_lossless_pool", + "size":"1280", + "xon_offset": "2560", + "dynamic_th":"0" + }, + "egress_lossless_profile": { + "pool":"ingress_lossless_pool", + "size":"0", + "static_th":"33030144" + }, + "egress_lossy_profile": { + "pool":"ingress_lossless_pool", + "size":"0", + "dynamic_th":"-1" + } + }, + + "BUFFER_PG": { + "Ethernet0|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet8|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet16|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet24|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet32|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet40|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet48|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet56|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet64|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet72|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet80|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet88|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet96|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet104|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet112|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet120|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet128|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet136|0": { + "profile" : "ingress_lossy_profile" + } + }, + + "BUFFER_QUEUE": { + "svcstr-7250-lc1-1|asic0|Ethernet0|3-4": { + "profile" : "egress_lossless_profile" + }, + "svcstr-7250-lc1-1|asic0|Ethernet8|3-4": { + "profile" : "egress_lossless_profile" + }, + "svcstr-7250-lc1-1|asic0|Ethernet16|3-4": { + "profile" : "egress_lossless_profile" + }, + "svcstr-7250-lc1-1|asic0|Ethernet24|3-4": { + "profile" : "egress_lossless_profile" + }, + "svcstr-7250-lc1-1|asic0|Ethernet32|3-4": { + "profile" : "egress_lossless_profile" + }, + "svcstr-7250-lc1-1|asic0|Ethernet40|3-4": { + "profile" : "egress_lossless_profile" + }, + "svcstr-7250-lc1-1|asic0|Ethernet48|3-4": { + "profile" : "egress_lossless_profile" + }, + "svcstr-7250-lc1-1|asic0|Ethernet56|3-4": { + "profile" : "egress_lossless_profile" + }, + "svcstr-7250-lc1-1|asic0|Ethernet64|3-4": { + "profile" : "egress_lossless_profile" + }, + "svcstr-7250-lc1-1|asic0|Ethernet72|3-4": { + "profile" : "egress_lossless_profile" + }, + "svcstr-7250-lc1-1|asic0|Ethernet80|3-4": { + "profile" : "egress_lossless_profile" + }, + "svcstr-7250-lc1-1|asic0|Ethernet88|3-4": { + "profile" : "egress_lossless_profile" + }, + "svcstr-7250-lc1-1|asic0|Ethernet96|3-4": { + "profile" : "egress_lossless_profile" + }, + "svcstr-7250-lc1-1|asic0|Ethernet104|3-4": { + "profile" : "egress_lossless_profile" + }, + "svcstr-7250-lc1-1|asic0|Ethernet112|3-4": { + "profile" : "egress_lossless_profile" + }, + "svcstr-7250-lc1-1|asic0|Ethernet120|3-4": { + "profile" : "egress_lossless_profile" + }, + "svcstr-7250-lc1-1|asic0|Ethernet128|3-4": { + "profile" : "egress_lossless_profile" + }, + "svcstr-7250-lc1-1|asic0|Ethernet136|3-4": { + "profile" : "egress_lossless_profile" + }, + "svcstr-7250-lc1-1|asic1|Ethernet144|3-4": { + "profile" : "egress_lossless_profile" + }, + "svcstr-7250-lc1-1|asic1|Ethernet152|3-4": { + "profile" : "egress_lossless_profile" + }, + "svcstr-7250-lc1-1|asic1|Ethernet160|3-4": { + "profile" : "egress_lossless_profile" + }, + "svcstr-7250-lc1-1|asic1|Ethernet168|3-4": { + "profile" : "egress_lossless_profile" + }, + "svcstr-7250-lc1-1|asic1|Ethernet176|3-4": { + "profile" : "egress_lossless_profile" + }, + "svcstr-7250-lc1-1|asic1|Ethernet184|3-4": { + "profile" : "egress_lossless_profile" + }, + "svcstr-7250-lc1-1|asic1|Ethernet192|3-4": { + "profile" : "egress_lossless_profile" + }, + "svcstr-7250-lc1-1|asic1|Ethernet200|3-4": { + "profile" : "egress_lossless_profile" + }, + "svcstr-7250-lc1-1|asic1|Ethernet208|3-4": { + "profile" : "egress_lossless_profile" + }, + "svcstr-7250-lc1-1|asic1|Ethernet216|3-4": { + "profile" : "egress_lossless_profile" + }, + "svcstr-7250-lc1-1|asic1|Ethernet224|3-4": { + "profile" : "egress_lossless_profile" + }, + "svcstr-7250-lc1-1|asic1|Ethernet232|3-4": { + "profile" : "egress_lossless_profile" + }, + "svcstr-7250-lc1-1|asic1|Ethernet240|3-4": { + "profile" : "egress_lossless_profile" + }, + "svcstr-7250-lc1-1|asic1|Ethernet248|3-4": { + "profile" : "egress_lossless_profile" + }, + "svcstr-7250-lc1-1|asic1|Ethernet256|3-4": { + "profile" : "egress_lossless_profile" + }, + "svcstr-7250-lc1-1|asic1|Ethernet264|3-4": { + "profile" : "egress_lossless_profile" + }, + "svcstr-7250-lc1-1|asic1|Ethernet272|3-4": { + "profile" : "egress_lossless_profile" + }, + "svcstr-7250-lc1-1|asic1|Ethernet280|3-4": { + "profile" : "egress_lossless_profile" + }, + "svcstr-7250-lc2-1|asic0|Ethernet0|3-4": { + "profile" : "egress_lossless_profile" + }, + "svcstr-7250-lc2-1|asic0|Ethernet8|3-4": { + "profile" : "egress_lossless_profile" + }, + "svcstr-7250-lc2-1|asic0|Ethernet16|3-4": { + "profile" : "egress_lossless_profile" + }, + "svcstr-7250-lc2-1|asic0|Ethernet24|3-4": { + "profile" : "egress_lossless_profile" + }, + "svcstr-7250-lc2-1|asic0|Ethernet32|3-4": { + "profile" : "egress_lossless_profile" + }, + "svcstr-7250-lc2-1|asic0|Ethernet40|3-4": { + "profile" : "egress_lossless_profile" + }, + "svcstr-7250-lc2-1|asic0|Ethernet48|3-4": { + "profile" : "egress_lossless_profile" + }, + "svcstr-7250-lc2-1|asic0|Ethernet56|3-4": { + "profile" : "egress_lossless_profile" + }, + "svcstr-7250-lc2-1|asic0|Ethernet64|3-4": { + "profile" : "egress_lossless_profile" + }, + "svcstr-7250-lc2-1|asic0|Ethernet72|3-4": { + "profile" : "egress_lossless_profile" + }, + "svcstr-7250-lc2-1|asic0|Ethernet80|3-4": { + "profile" : "egress_lossless_profile" + }, + "svcstr-7250-lc2-1|asic0|Ethernet88|3-4": { + "profile" : "egress_lossless_profile" + }, + "svcstr-7250-lc2-1|asic0|Ethernet96|3-4": { + "profile" : "egress_lossless_profile" + }, + "svcstr-7250-lc2-1|asic0|Ethernet104|3-4": { + "profile" : "egress_lossless_profile" + }, + "svcstr-7250-lc2-1|asic0|Ethernet112|3-4": { + "profile" : "egress_lossless_profile" + }, + "svcstr-7250-lc2-1|asic0|Ethernet120|3-4": { + "profile" : "egress_lossless_profile" + }, + "svcstr-7250-lc2-1|asic0|Ethernet128|3-4": { + "profile" : "egress_lossless_profile" + }, + "svcstr-7250-lc2-1|asic0|Ethernet136|3-4": { + "profile" : "egress_lossless_profile" + }, + "svcstr-7250-lc2-1|asic1|Ethernet144|3-4": { + "profile" : "egress_lossless_profile" + }, + "svcstr-7250-lc2-1|asic1|Ethernet152|3-4": { + "profile" : "egress_lossless_profile" + }, + "svcstr-7250-lc2-1|asic1|Ethernet160|3-4": { + "profile" : "egress_lossless_profile" + }, + "svcstr-7250-lc2-1|asic1|Ethernet168|3-4": { + "profile" : "egress_lossless_profile" + }, + "svcstr-7250-lc2-1|asic1|Ethernet176|3-4": { + "profile" : "egress_lossless_profile" + }, + "svcstr-7250-lc2-1|asic1|Ethernet184|3-4": { + "profile" : "egress_lossless_profile" + }, + "svcstr-7250-lc2-1|asic1|Ethernet192|3-4": { + "profile" : "egress_lossless_profile" + }, + "svcstr-7250-lc2-1|asic1|Ethernet200|3-4": { + "profile" : "egress_lossless_profile" + }, + "svcstr-7250-lc2-1|asic1|Ethernet208|3-4": { + "profile" : "egress_lossless_profile" + }, + "svcstr-7250-lc2-1|asic1|Ethernet216|3-4": { + "profile" : "egress_lossless_profile" + }, + "svcstr-7250-lc2-1|asic1|Ethernet224|3-4": { + "profile" : "egress_lossless_profile" + }, + "svcstr-7250-lc2-1|asic1|Ethernet232|3-4": { + "profile" : "egress_lossless_profile" + }, + "svcstr-7250-lc2-1|asic1|Ethernet240|3-4": { + "profile" : "egress_lossless_profile" + }, + "svcstr-7250-lc2-1|asic1|Ethernet248|3-4": { + "profile" : "egress_lossless_profile" + }, + "svcstr-7250-lc2-1|asic1|Ethernet256|3-4": { + "profile" : "egress_lossless_profile" + }, + "svcstr-7250-lc2-1|asic1|Ethernet264|3-4": { + "profile" : "egress_lossless_profile" + }, + "svcstr-7250-lc2-1|asic1|Ethernet272|3-4": { + "profile" : "egress_lossless_profile" + }, + "svcstr-7250-lc2-1|asic1|Ethernet280|3-4": { + "profile" : "egress_lossless_profile" + }, + "svcstr-7250-lc3-1|asic0|Ethernet0|3-4": { + "profile" : "egress_lossless_profile" + }, + "svcstr-7250-lc3-1|asic0|Ethernet8|3-4": { + "profile" : "egress_lossless_profile" + }, + "svcstr-7250-lc3-1|asic0|Ethernet16|3-4": { + "profile" : "egress_lossless_profile" + }, + "svcstr-7250-lc3-1|asic0|Ethernet24|3-4": { + "profile" : "egress_lossless_profile" + }, + "svcstr-7250-lc3-1|asic0|Ethernet32|3-4": { + "profile" : "egress_lossless_profile" + }, + "svcstr-7250-lc3-1|asic0|Ethernet40|3-4": { + "profile" : "egress_lossless_profile" + }, + "svcstr-7250-lc3-1|asic0|Ethernet48|3-4": { + "profile" : "egress_lossless_profile" + }, + "svcstr-7250-lc3-1|asic0|Ethernet56|3-4": { + "profile" : "egress_lossless_profile" + }, + "svcstr-7250-lc3-1|asic0|Ethernet64|3-4": { + "profile" : "egress_lossless_profile" + }, + "svcstr-7250-lc3-1|asic0|Ethernet72|3-4": { + "profile" : "egress_lossless_profile" + }, + "svcstr-7250-lc3-1|asic0|Ethernet80|3-4": { + "profile" : "egress_lossless_profile" + }, + "svcstr-7250-lc3-1|asic0|Ethernet88|3-4": { + "profile" : "egress_lossless_profile" + }, + "svcstr-7250-lc3-1|asic0|Ethernet96|3-4": { + "profile" : "egress_lossless_profile" + }, + "svcstr-7250-lc3-1|asic0|Ethernet104|3-4": { + "profile" : "egress_lossless_profile" + }, + "svcstr-7250-lc3-1|asic0|Ethernet112|3-4": { + "profile" : "egress_lossless_profile" + }, + "svcstr-7250-lc3-1|asic0|Ethernet120|3-4": { + "profile" : "egress_lossless_profile" + }, + "svcstr-7250-lc3-1|asic0|Ethernet128|3-4": { + "profile" : "egress_lossless_profile" + }, + "svcstr-7250-lc3-1|asic0|Ethernet136|3-4": { + "profile" : "egress_lossless_profile" + }, + "svcstr-7250-lc3-1|asic1|Ethernet144|3-4": { + "profile" : "egress_lossless_profile" + }, + "svcstr-7250-lc3-1|asic1|Ethernet152|3-4": { + "profile" : "egress_lossless_profile" + }, + "svcstr-7250-lc3-1|asic1|Ethernet160|3-4": { + "profile" : "egress_lossless_profile" + }, + "svcstr-7250-lc3-1|asic1|Ethernet168|3-4": { + "profile" : "egress_lossless_profile" + }, + "svcstr-7250-lc3-1|asic1|Ethernet176|3-4": { + "profile" : "egress_lossless_profile" + }, + "svcstr-7250-lc3-1|asic1|Ethernet184|3-4": { + "profile" : "egress_lossless_profile" + }, + "svcstr-7250-lc3-1|asic1|Ethernet192|3-4": { + "profile" : "egress_lossless_profile" + }, + "svcstr-7250-lc3-1|asic1|Ethernet200|3-4": { + "profile" : "egress_lossless_profile" + }, + "svcstr-7250-lc3-1|asic1|Ethernet208|3-4": { + "profile" : "egress_lossless_profile" + }, + "svcstr-7250-lc3-1|asic1|Ethernet216|3-4": { + "profile" : "egress_lossless_profile" + }, + "svcstr-7250-lc3-1|asic1|Ethernet224|3-4": { + "profile" : "egress_lossless_profile" + }, + "svcstr-7250-lc3-1|asic1|Ethernet232|3-4": { + "profile" : "egress_lossless_profile" + }, + "svcstr-7250-lc3-1|asic1|Ethernet240|3-4": { + "profile" : "egress_lossless_profile" + }, + "svcstr-7250-lc3-1|asic1|Ethernet248|3-4": { + "profile" : "egress_lossless_profile" + }, + "svcstr-7250-lc3-1|asic1|Ethernet256|3-4": { + "profile" : "egress_lossless_profile" + }, + "svcstr-7250-lc3-1|asic1|Ethernet264|3-4": { + "profile" : "egress_lossless_profile" + }, + "svcstr-7250-lc3-1|asic1|Ethernet272|3-4": { + "profile" : "egress_lossless_profile" + }, + "svcstr-7250-lc3-1|asic1|Ethernet280|3-4": { + "profile" : "egress_lossless_profile" + }, + "svcstr-7250-lc1-1|asic0|Ethernet0|0-2": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc1-1|asic0|Ethernet8|0-2": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc1-1|asic0|Ethernet16|0-2": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc1-1|asic0|Ethernet24|0-2": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc1-1|asic0|Ethernet32|0-2": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc1-1|asic0|Ethernet40|0-2": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc1-1|asic0|Ethernet48|0-2": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc1-1|asic0|Ethernet56|0-2": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc1-1|asic0|Ethernet64|0-2": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc1-1|asic0|Ethernet72|0-2": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc1-1|asic0|Ethernet80|0-2": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc1-1|asic0|Ethernet88|0-2": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc1-1|asic0|Ethernet96|0-2": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc1-1|asic0|Ethernet104|0-2": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc1-1|asic0|Ethernet112|0-2": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc1-1|asic0|Ethernet120|0-2": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc1-1|asic0|Ethernet128|0-2": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc1-1|asic0|Ethernet136|0-2": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc1-1|asic1|Ethernet144|0-2": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc1-1|asic1|Ethernet152|0-2": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc1-1|asic1|Ethernet160|0-2": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc1-1|asic1|Ethernet168|0-2": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc1-1|asic1|Ethernet176|0-2": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc1-1|asic1|Ethernet184|0-2": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc1-1|asic1|Ethernet192|0-2": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc1-1|asic1|Ethernet200|0-2": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc1-1|asic1|Ethernet208|0-2": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc1-1|asic1|Ethernet216|0-2": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc1-1|asic1|Ethernet224|0-2": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc1-1|asic1|Ethernet232|0-2": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc1-1|asic1|Ethernet240|0-2": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc1-1|asic1|Ethernet248|0-2": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc1-1|asic1|Ethernet256|0-2": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc1-1|asic1|Ethernet264|0-2": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc1-1|asic1|Ethernet272|0-2": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc1-1|asic1|Ethernet280|0-2": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc2-1|asic0|Ethernet0|0-2": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc2-1|asic0|Ethernet8|0-2": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc2-1|asic0|Ethernet16|0-2": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc2-1|asic0|Ethernet24|0-2": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc2-1|asic0|Ethernet32|0-2": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc2-1|asic0|Ethernet40|0-2": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc2-1|asic0|Ethernet48|0-2": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc2-1|asic0|Ethernet56|0-2": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc2-1|asic0|Ethernet64|0-2": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc2-1|asic0|Ethernet72|0-2": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc2-1|asic0|Ethernet80|0-2": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc2-1|asic0|Ethernet88|0-2": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc2-1|asic0|Ethernet96|0-2": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc2-1|asic0|Ethernet104|0-2": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc2-1|asic0|Ethernet112|0-2": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc2-1|asic0|Ethernet120|0-2": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc2-1|asic0|Ethernet128|0-2": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc2-1|asic0|Ethernet136|0-2": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc2-1|asic1|Ethernet144|0-2": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc2-1|asic1|Ethernet152|0-2": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc2-1|asic1|Ethernet160|0-2": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc2-1|asic1|Ethernet168|0-2": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc2-1|asic1|Ethernet176|0-2": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc2-1|asic1|Ethernet184|0-2": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc2-1|asic1|Ethernet192|0-2": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc2-1|asic1|Ethernet200|0-2": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc2-1|asic1|Ethernet208|0-2": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc2-1|asic1|Ethernet216|0-2": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc2-1|asic1|Ethernet224|0-2": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc2-1|asic1|Ethernet232|0-2": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc2-1|asic1|Ethernet240|0-2": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc2-1|asic1|Ethernet248|0-2": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc2-1|asic1|Ethernet256|0-2": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc2-1|asic1|Ethernet264|0-2": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc2-1|asic1|Ethernet272|0-2": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc2-1|asic1|Ethernet280|0-2": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc3-1|asic0|Ethernet0|0-2": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc3-1|asic0|Ethernet8|0-2": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc3-1|asic0|Ethernet16|0-2": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc3-1|asic0|Ethernet24|0-2": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc3-1|asic0|Ethernet32|0-2": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc3-1|asic0|Ethernet40|0-2": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc3-1|asic0|Ethernet48|0-2": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc3-1|asic0|Ethernet56|0-2": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc3-1|asic0|Ethernet64|0-2": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc3-1|asic0|Ethernet72|0-2": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc3-1|asic0|Ethernet80|0-2": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc3-1|asic0|Ethernet88|0-2": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc3-1|asic0|Ethernet96|0-2": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc3-1|asic0|Ethernet104|0-2": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc3-1|asic0|Ethernet112|0-2": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc3-1|asic0|Ethernet120|0-2": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc3-1|asic0|Ethernet128|0-2": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc3-1|asic0|Ethernet136|0-2": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc3-1|asic1|Ethernet144|0-2": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc3-1|asic1|Ethernet152|0-2": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc3-1|asic1|Ethernet160|0-2": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc3-1|asic1|Ethernet168|0-2": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc3-1|asic1|Ethernet176|0-2": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc3-1|asic1|Ethernet184|0-2": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc3-1|asic1|Ethernet192|0-2": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc3-1|asic1|Ethernet200|0-2": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc3-1|asic1|Ethernet208|0-2": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc3-1|asic1|Ethernet216|0-2": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc3-1|asic1|Ethernet224|0-2": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc3-1|asic1|Ethernet232|0-2": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc3-1|asic1|Ethernet240|0-2": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc3-1|asic1|Ethernet248|0-2": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc3-1|asic1|Ethernet256|0-2": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc3-1|asic1|Ethernet264|0-2": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc3-1|asic1|Ethernet272|0-2": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc3-1|asic1|Ethernet280|0-2": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc1-1|asic0|Ethernet0|5-6": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc1-1|asic0|Ethernet8|5-6": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc1-1|asic0|Ethernet16|5-6": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc1-1|asic0|Ethernet24|5-6": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc1-1|asic0|Ethernet32|5-6": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc1-1|asic0|Ethernet40|5-6": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc1-1|asic0|Ethernet48|5-6": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc1-1|asic0|Ethernet56|5-6": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc1-1|asic0|Ethernet64|5-6": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc1-1|asic0|Ethernet72|5-6": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc1-1|asic0|Ethernet80|5-6": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc1-1|asic0|Ethernet88|5-6": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc1-1|asic0|Ethernet96|5-6": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc1-1|asic0|Ethernet104|5-6": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc1-1|asic0|Ethernet112|5-6": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc1-1|asic0|Ethernet120|5-6": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc1-1|asic0|Ethernet128|5-6": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc1-1|asic0|Ethernet136|5-6": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc1-1|asic1|Ethernet144|5-6": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc1-1|asic1|Ethernet152|5-6": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc1-1|asic1|Ethernet160|5-6": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc1-1|asic1|Ethernet168|5-6": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc1-1|asic1|Ethernet176|5-6": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc1-1|asic1|Ethernet184|5-6": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc1-1|asic1|Ethernet192|5-6": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc1-1|asic1|Ethernet200|5-6": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc1-1|asic1|Ethernet208|5-6": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc1-1|asic1|Ethernet216|5-6": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc1-1|asic1|Ethernet224|5-6": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc1-1|asic1|Ethernet232|5-6": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc1-1|asic1|Ethernet240|5-6": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc1-1|asic1|Ethernet248|5-6": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc1-1|asic1|Ethernet256|5-6": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc1-1|asic1|Ethernet264|5-6": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc1-1|asic1|Ethernet272|5-6": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc1-1|asic1|Ethernet280|5-6": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc2-1|asic0|Ethernet0|5-6": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc2-1|asic0|Ethernet8|5-6": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc2-1|asic0|Ethernet16|5-6": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc2-1|asic0|Ethernet24|5-6": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc2-1|asic0|Ethernet32|5-6": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc2-1|asic0|Ethernet40|5-6": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc2-1|asic0|Ethernet48|5-6": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc2-1|asic0|Ethernet56|5-6": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc2-1|asic0|Ethernet64|5-6": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc2-1|asic0|Ethernet72|5-6": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc2-1|asic0|Ethernet80|5-6": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc2-1|asic0|Ethernet88|5-6": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc2-1|asic0|Ethernet96|5-6": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc2-1|asic0|Ethernet104|5-6": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc2-1|asic0|Ethernet112|5-6": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc2-1|asic0|Ethernet120|5-6": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc2-1|asic0|Ethernet128|5-6": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc2-1|asic0|Ethernet136|5-6": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc2-1|asic1|Ethernet144|5-6": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc2-1|asic1|Ethernet152|5-6": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc2-1|asic1|Ethernet160|5-6": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc2-1|asic1|Ethernet168|5-6": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc2-1|asic1|Ethernet176|5-6": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc2-1|asic1|Ethernet184|5-6": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc2-1|asic1|Ethernet192|5-6": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc2-1|asic1|Ethernet200|5-6": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc2-1|asic1|Ethernet208|5-6": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc2-1|asic1|Ethernet216|5-6": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc2-1|asic1|Ethernet224|5-6": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc2-1|asic1|Ethernet232|5-6": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc2-1|asic1|Ethernet240|5-6": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc2-1|asic1|Ethernet248|5-6": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc2-1|asic1|Ethernet256|5-6": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc2-1|asic1|Ethernet264|5-6": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc2-1|asic1|Ethernet272|5-6": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc2-1|asic1|Ethernet280|5-6": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc3-1|asic0|Ethernet0|5-6": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc3-1|asic0|Ethernet8|5-6": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc3-1|asic0|Ethernet16|5-6": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc3-1|asic0|Ethernet24|5-6": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc3-1|asic0|Ethernet32|5-6": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc3-1|asic0|Ethernet40|5-6": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc3-1|asic0|Ethernet48|5-6": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc3-1|asic0|Ethernet56|5-6": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc3-1|asic0|Ethernet64|5-6": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc3-1|asic0|Ethernet72|5-6": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc3-1|asic0|Ethernet80|5-6": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc3-1|asic0|Ethernet88|5-6": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc3-1|asic0|Ethernet96|5-6": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc3-1|asic0|Ethernet104|5-6": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc3-1|asic0|Ethernet112|5-6": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc3-1|asic0|Ethernet120|5-6": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc3-1|asic0|Ethernet128|5-6": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc3-1|asic0|Ethernet136|5-6": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc3-1|asic1|Ethernet144|5-6": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc3-1|asic1|Ethernet152|5-6": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc3-1|asic1|Ethernet160|5-6": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc3-1|asic1|Ethernet168|5-6": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc3-1|asic1|Ethernet176|5-6": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc3-1|asic1|Ethernet184|5-6": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc3-1|asic1|Ethernet192|5-6": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc3-1|asic1|Ethernet200|5-6": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc3-1|asic1|Ethernet208|5-6": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc3-1|asic1|Ethernet216|5-6": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc3-1|asic1|Ethernet224|5-6": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc3-1|asic1|Ethernet232|5-6": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc3-1|asic1|Ethernet240|5-6": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc3-1|asic1|Ethernet248|5-6": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc3-1|asic1|Ethernet256|5-6": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc3-1|asic1|Ethernet264|5-6": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc3-1|asic1|Ethernet272|5-6": { + "profile" : "egress_lossy_profile" + }, + "svcstr-7250-lc3-1|asic1|Ethernet280|5-6": { + "profile" : "egress_lossy_profile" + } + } +} diff --git a/src/sonic-config-engine/tests/sample_output/py3/buffer-nokia-ixr7250e-36x400g.json b/src/sonic-config-engine/tests/sample_output/py3/buffer-nokia-ixr7250e-36x400g.json new file mode 100644 index 000000000000..ef1882e0666e --- /dev/null +++ b/src/sonic-config-engine/tests/sample_output/py3/buffer-nokia-ixr7250e-36x400g.json @@ -0,0 +1,759 @@ + { + "CABLE_LENGTH": { + "AZURE": { + "Ethernet0": "5m", + "Ethernet8": "5m", + "Ethernet16": "5m", + "Ethernet24": "5m", + "Ethernet32": "5m", + "Ethernet40": "5m", + "Ethernet48": "5m", + "Ethernet56": "5m", + "Ethernet64": "5m", + "Ethernet72": "5m", + "Ethernet80": "5m", + "Ethernet88": "5m", + "Ethernet96": "5m", + "Ethernet104": "5m", + "Ethernet112": "5m", + "Ethernet120": "5m", + "Ethernet128": "5m", + "Ethernet136": "5m" + } + }, + + "BUFFER_POOL": { + "ingress_lossless_pool": { + "size": "6441610000", + "type": "both", + "mode": "dynamic", + "xoff": "1582033305" + } + }, + "BUFFER_PROFILE": { + "ingress_lossy_profile": { + "pool":"ingress_lossless_pool", + "size":"1280", + "xon_offset": "2560", + "dynamic_th":"0" + }, + "egress_lossless_profile": { + "pool":"ingress_lossless_pool", + "size":"0", + "static_th":"33030144" + }, + "egress_lossy_profile": { + "pool":"ingress_lossless_pool", + "size":"0", + "dynamic_th":"-1" + } + }, + + "BUFFER_PG": { + "Ethernet32|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet40|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet128|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet0|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet8|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet16|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet24|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet48|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet56|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet64|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet72|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet80|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet88|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet96|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet104|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet112|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet120|0": { + "profile" : "ingress_lossy_profile" + }, + "Ethernet136|0": { + "profile" : "ingress_lossy_profile" + } + }, + + "BUFFER_QUEUE": { + "str2-7250-lc1-1|asic0|Ethernet0|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7250-lc1-1|asic0|Ethernet8|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7250-lc1-1|asic0|Ethernet16|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7250-lc1-1|asic0|Ethernet24|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7250-lc1-1|asic0|Ethernet32|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7250-lc1-1|asic0|Ethernet40|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7250-lc1-1|asic0|Ethernet48|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7250-lc1-1|asic0|Ethernet56|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7250-lc1-1|asic0|Ethernet64|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7250-lc1-1|asic0|Ethernet72|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7250-lc1-1|asic0|Ethernet80|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7250-lc1-1|asic0|Ethernet88|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7250-lc1-1|asic0|Ethernet96|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7250-lc1-1|asic0|Ethernet104|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7250-lc1-1|asic0|Ethernet112|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7250-lc1-1|asic0|Ethernet120|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7250-lc1-1|asic0|Ethernet128|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7250-lc1-1|asic0|Ethernet136|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7250-lc1-1|asic1|Ethernet144|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7250-lc1-1|asic1|Ethernet152|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7250-lc1-1|asic1|Ethernet160|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7250-lc1-1|asic1|Ethernet168|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7250-lc1-1|asic1|Ethernet176|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7250-lc1-1|asic1|Ethernet184|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7250-lc1-1|asic1|Ethernet192|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7250-lc1-1|asic1|Ethernet200|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7250-lc1-1|asic1|Ethernet208|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7250-lc1-1|asic1|Ethernet216|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7250-lc1-1|asic1|Ethernet224|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7250-lc1-1|asic1|Ethernet232|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7250-lc1-1|asic1|Ethernet240|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7250-lc1-1|asic1|Ethernet248|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7250-lc1-1|asic1|Ethernet256|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7250-lc1-1|asic1|Ethernet264|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7250-lc1-1|asic1|Ethernet272|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7250-lc1-1|asic1|Ethernet280|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7250-lc2-1|asic0|Ethernet0|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7250-lc2-1|asic0|Ethernet8|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7250-lc2-1|asic0|Ethernet16|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7250-lc2-1|asic0|Ethernet24|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7250-lc2-1|asic0|Ethernet32|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7250-lc2-1|asic0|Ethernet40|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7250-lc2-1|asic0|Ethernet48|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7250-lc2-1|asic0|Ethernet56|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7250-lc2-1|asic0|Ethernet64|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7250-lc2-1|asic0|Ethernet72|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7250-lc2-1|asic0|Ethernet80|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7250-lc2-1|asic0|Ethernet88|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7250-lc2-1|asic0|Ethernet96|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7250-lc2-1|asic0|Ethernet104|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7250-lc2-1|asic0|Ethernet112|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7250-lc2-1|asic0|Ethernet120|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7250-lc2-1|asic0|Ethernet128|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7250-lc2-1|asic0|Ethernet136|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7250-lc2-1|asic1|Ethernet144|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7250-lc2-1|asic1|Ethernet152|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7250-lc2-1|asic1|Ethernet160|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7250-lc2-1|asic1|Ethernet168|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7250-lc2-1|asic1|Ethernet176|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7250-lc2-1|asic1|Ethernet184|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7250-lc2-1|asic1|Ethernet192|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7250-lc2-1|asic1|Ethernet200|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7250-lc2-1|asic1|Ethernet208|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7250-lc2-1|asic1|Ethernet216|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7250-lc2-1|asic1|Ethernet224|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7250-lc2-1|asic1|Ethernet232|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7250-lc2-1|asic1|Ethernet240|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7250-lc2-1|asic1|Ethernet248|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7250-lc2-1|asic1|Ethernet256|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7250-lc2-1|asic1|Ethernet264|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7250-lc2-1|asic1|Ethernet272|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7250-lc2-1|asic1|Ethernet280|3-4": { + "profile" : "egress_lossless_profile" + }, + "str2-7250-lc1-1|asic0|Ethernet0|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc1-1|asic0|Ethernet8|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc1-1|asic0|Ethernet16|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc1-1|asic0|Ethernet24|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc1-1|asic0|Ethernet32|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc1-1|asic0|Ethernet40|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc1-1|asic0|Ethernet48|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc1-1|asic0|Ethernet56|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc1-1|asic0|Ethernet64|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc1-1|asic0|Ethernet72|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc1-1|asic0|Ethernet80|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc1-1|asic0|Ethernet88|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc1-1|asic0|Ethernet96|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc1-1|asic0|Ethernet104|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc1-1|asic0|Ethernet112|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc1-1|asic0|Ethernet120|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc1-1|asic0|Ethernet128|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc1-1|asic0|Ethernet136|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc1-1|asic1|Ethernet144|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc1-1|asic1|Ethernet152|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc1-1|asic1|Ethernet160|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc1-1|asic1|Ethernet168|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc1-1|asic1|Ethernet176|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc1-1|asic1|Ethernet184|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc1-1|asic1|Ethernet192|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc1-1|asic1|Ethernet200|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc1-1|asic1|Ethernet208|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc1-1|asic1|Ethernet216|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc1-1|asic1|Ethernet224|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc1-1|asic1|Ethernet232|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc1-1|asic1|Ethernet240|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc1-1|asic1|Ethernet248|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc1-1|asic1|Ethernet256|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc1-1|asic1|Ethernet264|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc1-1|asic1|Ethernet272|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc1-1|asic1|Ethernet280|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc2-1|asic0|Ethernet0|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc2-1|asic0|Ethernet8|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc2-1|asic0|Ethernet16|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc2-1|asic0|Ethernet24|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc2-1|asic0|Ethernet32|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc2-1|asic0|Ethernet40|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc2-1|asic0|Ethernet48|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc2-1|asic0|Ethernet56|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc2-1|asic0|Ethernet64|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc2-1|asic0|Ethernet72|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc2-1|asic0|Ethernet80|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc2-1|asic0|Ethernet88|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc2-1|asic0|Ethernet96|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc2-1|asic0|Ethernet104|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc2-1|asic0|Ethernet112|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc2-1|asic0|Ethernet120|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc2-1|asic0|Ethernet128|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc2-1|asic0|Ethernet136|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc2-1|asic1|Ethernet144|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc2-1|asic1|Ethernet152|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc2-1|asic1|Ethernet160|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc2-1|asic1|Ethernet168|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc2-1|asic1|Ethernet176|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc2-1|asic1|Ethernet184|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc2-1|asic1|Ethernet192|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc2-1|asic1|Ethernet200|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc2-1|asic1|Ethernet208|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc2-1|asic1|Ethernet216|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc2-1|asic1|Ethernet224|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc2-1|asic1|Ethernet232|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc2-1|asic1|Ethernet240|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc2-1|asic1|Ethernet248|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc2-1|asic1|Ethernet256|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc2-1|asic1|Ethernet264|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc2-1|asic1|Ethernet272|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc2-1|asic1|Ethernet280|0-2": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc1-1|asic0|Ethernet0|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc1-1|asic0|Ethernet8|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc1-1|asic0|Ethernet16|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc1-1|asic0|Ethernet24|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc1-1|asic0|Ethernet32|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc1-1|asic0|Ethernet40|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc1-1|asic0|Ethernet48|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc1-1|asic0|Ethernet56|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc1-1|asic0|Ethernet64|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc1-1|asic0|Ethernet72|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc1-1|asic0|Ethernet80|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc1-1|asic0|Ethernet88|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc1-1|asic0|Ethernet96|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc1-1|asic0|Ethernet104|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc1-1|asic0|Ethernet112|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc1-1|asic0|Ethernet120|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc1-1|asic0|Ethernet128|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc1-1|asic0|Ethernet136|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc1-1|asic1|Ethernet144|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc1-1|asic1|Ethernet152|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc1-1|asic1|Ethernet160|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc1-1|asic1|Ethernet168|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc1-1|asic1|Ethernet176|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc1-1|asic1|Ethernet184|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc1-1|asic1|Ethernet192|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc1-1|asic1|Ethernet200|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc1-1|asic1|Ethernet208|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc1-1|asic1|Ethernet216|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc1-1|asic1|Ethernet224|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc1-1|asic1|Ethernet232|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc1-1|asic1|Ethernet240|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc1-1|asic1|Ethernet248|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc1-1|asic1|Ethernet256|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc1-1|asic1|Ethernet264|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc1-1|asic1|Ethernet272|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc1-1|asic1|Ethernet280|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc2-1|asic0|Ethernet0|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc2-1|asic0|Ethernet8|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc2-1|asic0|Ethernet16|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc2-1|asic0|Ethernet24|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc2-1|asic0|Ethernet32|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc2-1|asic0|Ethernet40|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc2-1|asic0|Ethernet48|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc2-1|asic0|Ethernet56|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc2-1|asic0|Ethernet64|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc2-1|asic0|Ethernet72|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc2-1|asic0|Ethernet80|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc2-1|asic0|Ethernet88|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc2-1|asic0|Ethernet96|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc2-1|asic0|Ethernet104|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc2-1|asic0|Ethernet112|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc2-1|asic0|Ethernet120|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc2-1|asic0|Ethernet128|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc2-1|asic0|Ethernet136|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc2-1|asic1|Ethernet144|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc2-1|asic1|Ethernet152|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc2-1|asic1|Ethernet160|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc2-1|asic1|Ethernet168|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc2-1|asic1|Ethernet176|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc2-1|asic1|Ethernet184|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc2-1|asic1|Ethernet192|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc2-1|asic1|Ethernet200|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc2-1|asic1|Ethernet208|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc2-1|asic1|Ethernet216|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc2-1|asic1|Ethernet224|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc2-1|asic1|Ethernet232|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc2-1|asic1|Ethernet240|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc2-1|asic1|Ethernet248|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc2-1|asic1|Ethernet256|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc2-1|asic1|Ethernet264|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc2-1|asic1|Ethernet272|5-6": { + "profile" : "egress_lossy_profile" + }, + "str2-7250-lc2-1|asic1|Ethernet280|5-6": { + "profile" : "egress_lossy_profile" + } + } +} diff --git a/src/sonic-config-engine/tests/sample_output/py3/qos-arista7800r3-48cqm2-lc.json b/src/sonic-config-engine/tests/sample_output/py3/qos-arista7800r3-48cqm2-lc.json new file mode 100644 index 000000000000..bd8f5a22a9f5 --- /dev/null +++ b/src/sonic-config-engine/tests/sample_output/py3/qos-arista7800r3-48cqm2-lc.json @@ -0,0 +1,1535 @@ +{ + "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": { + "global": { + "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", + "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" : "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.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-arista7800r3a-36dm2-c36-lc.json b/src/sonic-config-engine/tests/sample_output/py3/qos-arista7800r3a-36dm2-c36-lc.json new file mode 100644 index 000000000000..f1dff3a0bd7c --- /dev/null +++ b/src/sonic-config-engine/tests/sample_output/py3/qos-arista7800r3a-36dm2-c36-lc.json @@ -0,0 +1,698 @@ +{ + "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": { + "global": { + "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", + "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" + }, + "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" + }, + "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" + }, + "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" + }, + "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" + }, + "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" + }, + "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" + }, + "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" + }, + "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" + }, + "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" + }, + "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" + }, + "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" + }, + "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" + }, + "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" + }, + "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" + }, + "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" + }, + "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" + } + }, + "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.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet8|3": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet16|3": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet24|3": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet32|3": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet40|3": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet48|3": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet56|3": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet64|3": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet72|3": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet80|3": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet88|3": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet96|3": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet104|3": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet112|3": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet120|3": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet128|3": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet136|3": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet0|4": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet8|4": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet16|4": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet24|4": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet32|4": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet40|4": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet48|4": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet56|4": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet64|4": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet72|4": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet80|4": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet88|4": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet96|4": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet104|4": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet112|4": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet120|4": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet128|4": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet136|4": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet0|0": { + "scheduler": "scheduler.0" + }, + "Ethernet8|0": { + "scheduler": "scheduler.0" + }, + "Ethernet16|0": { + "scheduler": "scheduler.0" + }, + "Ethernet24|0": { + "scheduler": "scheduler.0" + }, + "Ethernet32|0": { + "scheduler": "scheduler.0" + }, + "Ethernet40|0": { + "scheduler": "scheduler.0" + }, + "Ethernet48|0": { + "scheduler": "scheduler.0" + }, + "Ethernet56|0": { + "scheduler": "scheduler.0" + }, + "Ethernet64|0": { + "scheduler": "scheduler.0" + }, + "Ethernet72|0": { + "scheduler": "scheduler.0" + }, + "Ethernet80|0": { + "scheduler": "scheduler.0" + }, + "Ethernet88|0": { + "scheduler": "scheduler.0" + }, + "Ethernet96|0": { + "scheduler": "scheduler.0" + }, + "Ethernet104|0": { + "scheduler": "scheduler.0" + }, + "Ethernet112|0": { + "scheduler": "scheduler.0" + }, + "Ethernet120|0": { + "scheduler": "scheduler.0" + }, + "Ethernet128|0": { + "scheduler": "scheduler.0" + }, + "Ethernet136|0": { + "scheduler": "scheduler.0" + }, + "Ethernet0|1": { + "scheduler": "scheduler.0" + }, + "Ethernet8|1": { + "scheduler": "scheduler.0" + }, + "Ethernet16|1": { + "scheduler": "scheduler.0" + }, + "Ethernet24|1": { + "scheduler": "scheduler.0" + }, + "Ethernet32|1": { + "scheduler": "scheduler.0" + }, + "Ethernet40|1": { + "scheduler": "scheduler.0" + }, + "Ethernet48|1": { + "scheduler": "scheduler.0" + }, + "Ethernet56|1": { + "scheduler": "scheduler.0" + }, + "Ethernet64|1": { + "scheduler": "scheduler.0" + }, + "Ethernet72|1": { + "scheduler": "scheduler.0" + }, + "Ethernet80|1": { + "scheduler": "scheduler.0" + }, + "Ethernet88|1": { + "scheduler": "scheduler.0" + }, + "Ethernet96|1": { + "scheduler": "scheduler.0" + }, + "Ethernet104|1": { + "scheduler": "scheduler.0" + }, + "Ethernet112|1": { + "scheduler": "scheduler.0" + }, + "Ethernet120|1": { + "scheduler": "scheduler.0" + }, + "Ethernet128|1": { + "scheduler": "scheduler.0" + }, + "Ethernet136|1": { + "scheduler": "scheduler.0" + }, + "Ethernet0|2": { + "scheduler": "scheduler.0" + }, + "Ethernet8|2": { + "scheduler": "scheduler.0" + }, + "Ethernet16|2": { + "scheduler": "scheduler.0" + }, + "Ethernet24|2": { + "scheduler": "scheduler.0" + }, + "Ethernet32|2": { + "scheduler": "scheduler.0" + }, + "Ethernet40|2": { + "scheduler": "scheduler.0" + }, + "Ethernet48|2": { + "scheduler": "scheduler.0" + }, + "Ethernet56|2": { + "scheduler": "scheduler.0" + }, + "Ethernet64|2": { + "scheduler": "scheduler.0" + }, + "Ethernet72|2": { + "scheduler": "scheduler.0" + }, + "Ethernet80|2": { + "scheduler": "scheduler.0" + }, + "Ethernet88|2": { + "scheduler": "scheduler.0" + }, + "Ethernet96|2": { + "scheduler": "scheduler.0" + }, + "Ethernet104|2": { + "scheduler": "scheduler.0" + }, + "Ethernet112|2": { + "scheduler": "scheduler.0" + }, + "Ethernet120|2": { + "scheduler": "scheduler.0" + }, + "Ethernet128|2": { + "scheduler": "scheduler.0" + }, + "Ethernet136|2": { + "scheduler": "scheduler.0" + }, + "Ethernet0|5": { + "scheduler": "scheduler.0" + }, + "Ethernet8|5": { + "scheduler": "scheduler.0" + }, + "Ethernet16|5": { + "scheduler": "scheduler.0" + }, + "Ethernet24|5": { + "scheduler": "scheduler.0" + }, + "Ethernet32|5": { + "scheduler": "scheduler.0" + }, + "Ethernet40|5": { + "scheduler": "scheduler.0" + }, + "Ethernet48|5": { + "scheduler": "scheduler.0" + }, + "Ethernet56|5": { + "scheduler": "scheduler.0" + }, + "Ethernet64|5": { + "scheduler": "scheduler.0" + }, + "Ethernet72|5": { + "scheduler": "scheduler.0" + }, + "Ethernet80|5": { + "scheduler": "scheduler.0" + }, + "Ethernet88|5": { + "scheduler": "scheduler.0" + }, + "Ethernet96|5": { + "scheduler": "scheduler.0" + }, + "Ethernet104|5": { + "scheduler": "scheduler.0" + }, + "Ethernet112|5": { + "scheduler": "scheduler.0" + }, + "Ethernet120|5": { + "scheduler": "scheduler.0" + }, + "Ethernet128|5": { + "scheduler": "scheduler.0" + }, + "Ethernet136|5": { + "scheduler": "scheduler.0" + }, + "Ethernet0|6": { + "scheduler": "scheduler.0" + }, + "Ethernet8|6": { + "scheduler": "scheduler.0" + }, + "Ethernet16|6": { + "scheduler": "scheduler.0" + }, + "Ethernet24|6": { + "scheduler": "scheduler.0" + }, + "Ethernet32|6": { + "scheduler": "scheduler.0" + }, + "Ethernet40|6": { + "scheduler": "scheduler.0" + }, + "Ethernet48|6": { + "scheduler": "scheduler.0" + }, + "Ethernet56|6": { + "scheduler": "scheduler.0" + }, + "Ethernet64|6": { + "scheduler": "scheduler.0" + }, + "Ethernet72|6": { + "scheduler": "scheduler.0" + }, + "Ethernet80|6": { + "scheduler": "scheduler.0" + }, + "Ethernet88|6": { + "scheduler": "scheduler.0" + }, + "Ethernet96|6": { + "scheduler": "scheduler.0" + }, + "Ethernet104|6": { + "scheduler": "scheduler.0" + }, + "Ethernet112|6": { + "scheduler": "scheduler.0" + }, + "Ethernet120|6": { + "scheduler": "scheduler.0" + }, + "Ethernet128|6": { + "scheduler": "scheduler.0" + }, + "Ethernet136|6": { + "scheduler": "scheduler.0" + } + } +} diff --git a/src/sonic-config-engine/tests/sample_output/py3/qos-arista7800r3a-36dm2-d36-lc.json b/src/sonic-config-engine/tests/sample_output/py3/qos-arista7800r3a-36dm2-d36-lc.json new file mode 100644 index 000000000000..f1dff3a0bd7c --- /dev/null +++ b/src/sonic-config-engine/tests/sample_output/py3/qos-arista7800r3a-36dm2-d36-lc.json @@ -0,0 +1,698 @@ +{ + "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": { + "global": { + "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", + "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" + }, + "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" + }, + "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" + }, + "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" + }, + "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" + }, + "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" + }, + "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" + }, + "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" + }, + "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" + }, + "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" + }, + "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" + }, + "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" + }, + "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" + }, + "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" + }, + "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" + }, + "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" + }, + "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" + } + }, + "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.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet8|3": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet16|3": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet24|3": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet32|3": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet40|3": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet48|3": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet56|3": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet64|3": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet72|3": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet80|3": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet88|3": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet96|3": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet104|3": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet112|3": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet120|3": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet128|3": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet136|3": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet0|4": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet8|4": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet16|4": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet24|4": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet32|4": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet40|4": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet48|4": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet56|4": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet64|4": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet72|4": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet80|4": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet88|4": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet96|4": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet104|4": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet112|4": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet120|4": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet128|4": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet136|4": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet0|0": { + "scheduler": "scheduler.0" + }, + "Ethernet8|0": { + "scheduler": "scheduler.0" + }, + "Ethernet16|0": { + "scheduler": "scheduler.0" + }, + "Ethernet24|0": { + "scheduler": "scheduler.0" + }, + "Ethernet32|0": { + "scheduler": "scheduler.0" + }, + "Ethernet40|0": { + "scheduler": "scheduler.0" + }, + "Ethernet48|0": { + "scheduler": "scheduler.0" + }, + "Ethernet56|0": { + "scheduler": "scheduler.0" + }, + "Ethernet64|0": { + "scheduler": "scheduler.0" + }, + "Ethernet72|0": { + "scheduler": "scheduler.0" + }, + "Ethernet80|0": { + "scheduler": "scheduler.0" + }, + "Ethernet88|0": { + "scheduler": "scheduler.0" + }, + "Ethernet96|0": { + "scheduler": "scheduler.0" + }, + "Ethernet104|0": { + "scheduler": "scheduler.0" + }, + "Ethernet112|0": { + "scheduler": "scheduler.0" + }, + "Ethernet120|0": { + "scheduler": "scheduler.0" + }, + "Ethernet128|0": { + "scheduler": "scheduler.0" + }, + "Ethernet136|0": { + "scheduler": "scheduler.0" + }, + "Ethernet0|1": { + "scheduler": "scheduler.0" + }, + "Ethernet8|1": { + "scheduler": "scheduler.0" + }, + "Ethernet16|1": { + "scheduler": "scheduler.0" + }, + "Ethernet24|1": { + "scheduler": "scheduler.0" + }, + "Ethernet32|1": { + "scheduler": "scheduler.0" + }, + "Ethernet40|1": { + "scheduler": "scheduler.0" + }, + "Ethernet48|1": { + "scheduler": "scheduler.0" + }, + "Ethernet56|1": { + "scheduler": "scheduler.0" + }, + "Ethernet64|1": { + "scheduler": "scheduler.0" + }, + "Ethernet72|1": { + "scheduler": "scheduler.0" + }, + "Ethernet80|1": { + "scheduler": "scheduler.0" + }, + "Ethernet88|1": { + "scheduler": "scheduler.0" + }, + "Ethernet96|1": { + "scheduler": "scheduler.0" + }, + "Ethernet104|1": { + "scheduler": "scheduler.0" + }, + "Ethernet112|1": { + "scheduler": "scheduler.0" + }, + "Ethernet120|1": { + "scheduler": "scheduler.0" + }, + "Ethernet128|1": { + "scheduler": "scheduler.0" + }, + "Ethernet136|1": { + "scheduler": "scheduler.0" + }, + "Ethernet0|2": { + "scheduler": "scheduler.0" + }, + "Ethernet8|2": { + "scheduler": "scheduler.0" + }, + "Ethernet16|2": { + "scheduler": "scheduler.0" + }, + "Ethernet24|2": { + "scheduler": "scheduler.0" + }, + "Ethernet32|2": { + "scheduler": "scheduler.0" + }, + "Ethernet40|2": { + "scheduler": "scheduler.0" + }, + "Ethernet48|2": { + "scheduler": "scheduler.0" + }, + "Ethernet56|2": { + "scheduler": "scheduler.0" + }, + "Ethernet64|2": { + "scheduler": "scheduler.0" + }, + "Ethernet72|2": { + "scheduler": "scheduler.0" + }, + "Ethernet80|2": { + "scheduler": "scheduler.0" + }, + "Ethernet88|2": { + "scheduler": "scheduler.0" + }, + "Ethernet96|2": { + "scheduler": "scheduler.0" + }, + "Ethernet104|2": { + "scheduler": "scheduler.0" + }, + "Ethernet112|2": { + "scheduler": "scheduler.0" + }, + "Ethernet120|2": { + "scheduler": "scheduler.0" + }, + "Ethernet128|2": { + "scheduler": "scheduler.0" + }, + "Ethernet136|2": { + "scheduler": "scheduler.0" + }, + "Ethernet0|5": { + "scheduler": "scheduler.0" + }, + "Ethernet8|5": { + "scheduler": "scheduler.0" + }, + "Ethernet16|5": { + "scheduler": "scheduler.0" + }, + "Ethernet24|5": { + "scheduler": "scheduler.0" + }, + "Ethernet32|5": { + "scheduler": "scheduler.0" + }, + "Ethernet40|5": { + "scheduler": "scheduler.0" + }, + "Ethernet48|5": { + "scheduler": "scheduler.0" + }, + "Ethernet56|5": { + "scheduler": "scheduler.0" + }, + "Ethernet64|5": { + "scheduler": "scheduler.0" + }, + "Ethernet72|5": { + "scheduler": "scheduler.0" + }, + "Ethernet80|5": { + "scheduler": "scheduler.0" + }, + "Ethernet88|5": { + "scheduler": "scheduler.0" + }, + "Ethernet96|5": { + "scheduler": "scheduler.0" + }, + "Ethernet104|5": { + "scheduler": "scheduler.0" + }, + "Ethernet112|5": { + "scheduler": "scheduler.0" + }, + "Ethernet120|5": { + "scheduler": "scheduler.0" + }, + "Ethernet128|5": { + "scheduler": "scheduler.0" + }, + "Ethernet136|5": { + "scheduler": "scheduler.0" + }, + "Ethernet0|6": { + "scheduler": "scheduler.0" + }, + "Ethernet8|6": { + "scheduler": "scheduler.0" + }, + "Ethernet16|6": { + "scheduler": "scheduler.0" + }, + "Ethernet24|6": { + "scheduler": "scheduler.0" + }, + "Ethernet32|6": { + "scheduler": "scheduler.0" + }, + "Ethernet40|6": { + "scheduler": "scheduler.0" + }, + "Ethernet48|6": { + "scheduler": "scheduler.0" + }, + "Ethernet56|6": { + "scheduler": "scheduler.0" + }, + "Ethernet64|6": { + "scheduler": "scheduler.0" + }, + "Ethernet72|6": { + "scheduler": "scheduler.0" + }, + "Ethernet80|6": { + "scheduler": "scheduler.0" + }, + "Ethernet88|6": { + "scheduler": "scheduler.0" + }, + "Ethernet96|6": { + "scheduler": "scheduler.0" + }, + "Ethernet104|6": { + "scheduler": "scheduler.0" + }, + "Ethernet112|6": { + "scheduler": "scheduler.0" + }, + "Ethernet120|6": { + "scheduler": "scheduler.0" + }, + "Ethernet128|6": { + "scheduler": "scheduler.0" + }, + "Ethernet136|6": { + "scheduler": "scheduler.0" + } + } +} diff --git a/src/sonic-config-engine/tests/sample_output/py3/qos-nokia-ixr7250e-36x100g.json b/src/sonic-config-engine/tests/sample_output/py3/qos-nokia-ixr7250e-36x100g.json new file mode 100644 index 000000000000..f1dff3a0bd7c --- /dev/null +++ b/src/sonic-config-engine/tests/sample_output/py3/qos-nokia-ixr7250e-36x100g.json @@ -0,0 +1,698 @@ +{ + "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": { + "global": { + "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", + "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" + }, + "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" + }, + "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" + }, + "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" + }, + "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" + }, + "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" + }, + "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" + }, + "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" + }, + "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" + }, + "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" + }, + "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" + }, + "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" + }, + "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" + }, + "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" + }, + "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" + }, + "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" + }, + "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" + } + }, + "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.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet8|3": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet16|3": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet24|3": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet32|3": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet40|3": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet48|3": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet56|3": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet64|3": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet72|3": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet80|3": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet88|3": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet96|3": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet104|3": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet112|3": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet120|3": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet128|3": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet136|3": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet0|4": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet8|4": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet16|4": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet24|4": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet32|4": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet40|4": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet48|4": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet56|4": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet64|4": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet72|4": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet80|4": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet88|4": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet96|4": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet104|4": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet112|4": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet120|4": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet128|4": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet136|4": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet0|0": { + "scheduler": "scheduler.0" + }, + "Ethernet8|0": { + "scheduler": "scheduler.0" + }, + "Ethernet16|0": { + "scheduler": "scheduler.0" + }, + "Ethernet24|0": { + "scheduler": "scheduler.0" + }, + "Ethernet32|0": { + "scheduler": "scheduler.0" + }, + "Ethernet40|0": { + "scheduler": "scheduler.0" + }, + "Ethernet48|0": { + "scheduler": "scheduler.0" + }, + "Ethernet56|0": { + "scheduler": "scheduler.0" + }, + "Ethernet64|0": { + "scheduler": "scheduler.0" + }, + "Ethernet72|0": { + "scheduler": "scheduler.0" + }, + "Ethernet80|0": { + "scheduler": "scheduler.0" + }, + "Ethernet88|0": { + "scheduler": "scheduler.0" + }, + "Ethernet96|0": { + "scheduler": "scheduler.0" + }, + "Ethernet104|0": { + "scheduler": "scheduler.0" + }, + "Ethernet112|0": { + "scheduler": "scheduler.0" + }, + "Ethernet120|0": { + "scheduler": "scheduler.0" + }, + "Ethernet128|0": { + "scheduler": "scheduler.0" + }, + "Ethernet136|0": { + "scheduler": "scheduler.0" + }, + "Ethernet0|1": { + "scheduler": "scheduler.0" + }, + "Ethernet8|1": { + "scheduler": "scheduler.0" + }, + "Ethernet16|1": { + "scheduler": "scheduler.0" + }, + "Ethernet24|1": { + "scheduler": "scheduler.0" + }, + "Ethernet32|1": { + "scheduler": "scheduler.0" + }, + "Ethernet40|1": { + "scheduler": "scheduler.0" + }, + "Ethernet48|1": { + "scheduler": "scheduler.0" + }, + "Ethernet56|1": { + "scheduler": "scheduler.0" + }, + "Ethernet64|1": { + "scheduler": "scheduler.0" + }, + "Ethernet72|1": { + "scheduler": "scheduler.0" + }, + "Ethernet80|1": { + "scheduler": "scheduler.0" + }, + "Ethernet88|1": { + "scheduler": "scheduler.0" + }, + "Ethernet96|1": { + "scheduler": "scheduler.0" + }, + "Ethernet104|1": { + "scheduler": "scheduler.0" + }, + "Ethernet112|1": { + "scheduler": "scheduler.0" + }, + "Ethernet120|1": { + "scheduler": "scheduler.0" + }, + "Ethernet128|1": { + "scheduler": "scheduler.0" + }, + "Ethernet136|1": { + "scheduler": "scheduler.0" + }, + "Ethernet0|2": { + "scheduler": "scheduler.0" + }, + "Ethernet8|2": { + "scheduler": "scheduler.0" + }, + "Ethernet16|2": { + "scheduler": "scheduler.0" + }, + "Ethernet24|2": { + "scheduler": "scheduler.0" + }, + "Ethernet32|2": { + "scheduler": "scheduler.0" + }, + "Ethernet40|2": { + "scheduler": "scheduler.0" + }, + "Ethernet48|2": { + "scheduler": "scheduler.0" + }, + "Ethernet56|2": { + "scheduler": "scheduler.0" + }, + "Ethernet64|2": { + "scheduler": "scheduler.0" + }, + "Ethernet72|2": { + "scheduler": "scheduler.0" + }, + "Ethernet80|2": { + "scheduler": "scheduler.0" + }, + "Ethernet88|2": { + "scheduler": "scheduler.0" + }, + "Ethernet96|2": { + "scheduler": "scheduler.0" + }, + "Ethernet104|2": { + "scheduler": "scheduler.0" + }, + "Ethernet112|2": { + "scheduler": "scheduler.0" + }, + "Ethernet120|2": { + "scheduler": "scheduler.0" + }, + "Ethernet128|2": { + "scheduler": "scheduler.0" + }, + "Ethernet136|2": { + "scheduler": "scheduler.0" + }, + "Ethernet0|5": { + "scheduler": "scheduler.0" + }, + "Ethernet8|5": { + "scheduler": "scheduler.0" + }, + "Ethernet16|5": { + "scheduler": "scheduler.0" + }, + "Ethernet24|5": { + "scheduler": "scheduler.0" + }, + "Ethernet32|5": { + "scheduler": "scheduler.0" + }, + "Ethernet40|5": { + "scheduler": "scheduler.0" + }, + "Ethernet48|5": { + "scheduler": "scheduler.0" + }, + "Ethernet56|5": { + "scheduler": "scheduler.0" + }, + "Ethernet64|5": { + "scheduler": "scheduler.0" + }, + "Ethernet72|5": { + "scheduler": "scheduler.0" + }, + "Ethernet80|5": { + "scheduler": "scheduler.0" + }, + "Ethernet88|5": { + "scheduler": "scheduler.0" + }, + "Ethernet96|5": { + "scheduler": "scheduler.0" + }, + "Ethernet104|5": { + "scheduler": "scheduler.0" + }, + "Ethernet112|5": { + "scheduler": "scheduler.0" + }, + "Ethernet120|5": { + "scheduler": "scheduler.0" + }, + "Ethernet128|5": { + "scheduler": "scheduler.0" + }, + "Ethernet136|5": { + "scheduler": "scheduler.0" + }, + "Ethernet0|6": { + "scheduler": "scheduler.0" + }, + "Ethernet8|6": { + "scheduler": "scheduler.0" + }, + "Ethernet16|6": { + "scheduler": "scheduler.0" + }, + "Ethernet24|6": { + "scheduler": "scheduler.0" + }, + "Ethernet32|6": { + "scheduler": "scheduler.0" + }, + "Ethernet40|6": { + "scheduler": "scheduler.0" + }, + "Ethernet48|6": { + "scheduler": "scheduler.0" + }, + "Ethernet56|6": { + "scheduler": "scheduler.0" + }, + "Ethernet64|6": { + "scheduler": "scheduler.0" + }, + "Ethernet72|6": { + "scheduler": "scheduler.0" + }, + "Ethernet80|6": { + "scheduler": "scheduler.0" + }, + "Ethernet88|6": { + "scheduler": "scheduler.0" + }, + "Ethernet96|6": { + "scheduler": "scheduler.0" + }, + "Ethernet104|6": { + "scheduler": "scheduler.0" + }, + "Ethernet112|6": { + "scheduler": "scheduler.0" + }, + "Ethernet120|6": { + "scheduler": "scheduler.0" + }, + "Ethernet128|6": { + "scheduler": "scheduler.0" + }, + "Ethernet136|6": { + "scheduler": "scheduler.0" + } + } +} diff --git a/src/sonic-config-engine/tests/sample_output/py3/qos-nokia-ixr7250e-36x400g.json b/src/sonic-config-engine/tests/sample_output/py3/qos-nokia-ixr7250e-36x400g.json new file mode 100644 index 000000000000..f1dff3a0bd7c --- /dev/null +++ b/src/sonic-config-engine/tests/sample_output/py3/qos-nokia-ixr7250e-36x400g.json @@ -0,0 +1,698 @@ +{ + "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": { + "global": { + "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", + "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" + }, + "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" + }, + "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" + }, + "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" + }, + "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" + }, + "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" + }, + "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" + }, + "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" + }, + "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" + }, + "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" + }, + "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" + }, + "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" + }, + "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" + }, + "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" + }, + "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" + }, + "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" + }, + "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" + } + }, + "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.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet8|3": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet16|3": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet24|3": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet32|3": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet40|3": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet48|3": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet56|3": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet64|3": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet72|3": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet80|3": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet88|3": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet96|3": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet104|3": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet112|3": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet120|3": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet128|3": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet136|3": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet0|4": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet8|4": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet16|4": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet24|4": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet32|4": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet40|4": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet48|4": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet56|4": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet64|4": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet72|4": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet80|4": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet88|4": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet96|4": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet104|4": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet112|4": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet120|4": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet128|4": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet136|4": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet0|0": { + "scheduler": "scheduler.0" + }, + "Ethernet8|0": { + "scheduler": "scheduler.0" + }, + "Ethernet16|0": { + "scheduler": "scheduler.0" + }, + "Ethernet24|0": { + "scheduler": "scheduler.0" + }, + "Ethernet32|0": { + "scheduler": "scheduler.0" + }, + "Ethernet40|0": { + "scheduler": "scheduler.0" + }, + "Ethernet48|0": { + "scheduler": "scheduler.0" + }, + "Ethernet56|0": { + "scheduler": "scheduler.0" + }, + "Ethernet64|0": { + "scheduler": "scheduler.0" + }, + "Ethernet72|0": { + "scheduler": "scheduler.0" + }, + "Ethernet80|0": { + "scheduler": "scheduler.0" + }, + "Ethernet88|0": { + "scheduler": "scheduler.0" + }, + "Ethernet96|0": { + "scheduler": "scheduler.0" + }, + "Ethernet104|0": { + "scheduler": "scheduler.0" + }, + "Ethernet112|0": { + "scheduler": "scheduler.0" + }, + "Ethernet120|0": { + "scheduler": "scheduler.0" + }, + "Ethernet128|0": { + "scheduler": "scheduler.0" + }, + "Ethernet136|0": { + "scheduler": "scheduler.0" + }, + "Ethernet0|1": { + "scheduler": "scheduler.0" + }, + "Ethernet8|1": { + "scheduler": "scheduler.0" + }, + "Ethernet16|1": { + "scheduler": "scheduler.0" + }, + "Ethernet24|1": { + "scheduler": "scheduler.0" + }, + "Ethernet32|1": { + "scheduler": "scheduler.0" + }, + "Ethernet40|1": { + "scheduler": "scheduler.0" + }, + "Ethernet48|1": { + "scheduler": "scheduler.0" + }, + "Ethernet56|1": { + "scheduler": "scheduler.0" + }, + "Ethernet64|1": { + "scheduler": "scheduler.0" + }, + "Ethernet72|1": { + "scheduler": "scheduler.0" + }, + "Ethernet80|1": { + "scheduler": "scheduler.0" + }, + "Ethernet88|1": { + "scheduler": "scheduler.0" + }, + "Ethernet96|1": { + "scheduler": "scheduler.0" + }, + "Ethernet104|1": { + "scheduler": "scheduler.0" + }, + "Ethernet112|1": { + "scheduler": "scheduler.0" + }, + "Ethernet120|1": { + "scheduler": "scheduler.0" + }, + "Ethernet128|1": { + "scheduler": "scheduler.0" + }, + "Ethernet136|1": { + "scheduler": "scheduler.0" + }, + "Ethernet0|2": { + "scheduler": "scheduler.0" + }, + "Ethernet8|2": { + "scheduler": "scheduler.0" + }, + "Ethernet16|2": { + "scheduler": "scheduler.0" + }, + "Ethernet24|2": { + "scheduler": "scheduler.0" + }, + "Ethernet32|2": { + "scheduler": "scheduler.0" + }, + "Ethernet40|2": { + "scheduler": "scheduler.0" + }, + "Ethernet48|2": { + "scheduler": "scheduler.0" + }, + "Ethernet56|2": { + "scheduler": "scheduler.0" + }, + "Ethernet64|2": { + "scheduler": "scheduler.0" + }, + "Ethernet72|2": { + "scheduler": "scheduler.0" + }, + "Ethernet80|2": { + "scheduler": "scheduler.0" + }, + "Ethernet88|2": { + "scheduler": "scheduler.0" + }, + "Ethernet96|2": { + "scheduler": "scheduler.0" + }, + "Ethernet104|2": { + "scheduler": "scheduler.0" + }, + "Ethernet112|2": { + "scheduler": "scheduler.0" + }, + "Ethernet120|2": { + "scheduler": "scheduler.0" + }, + "Ethernet128|2": { + "scheduler": "scheduler.0" + }, + "Ethernet136|2": { + "scheduler": "scheduler.0" + }, + "Ethernet0|5": { + "scheduler": "scheduler.0" + }, + "Ethernet8|5": { + "scheduler": "scheduler.0" + }, + "Ethernet16|5": { + "scheduler": "scheduler.0" + }, + "Ethernet24|5": { + "scheduler": "scheduler.0" + }, + "Ethernet32|5": { + "scheduler": "scheduler.0" + }, + "Ethernet40|5": { + "scheduler": "scheduler.0" + }, + "Ethernet48|5": { + "scheduler": "scheduler.0" + }, + "Ethernet56|5": { + "scheduler": "scheduler.0" + }, + "Ethernet64|5": { + "scheduler": "scheduler.0" + }, + "Ethernet72|5": { + "scheduler": "scheduler.0" + }, + "Ethernet80|5": { + "scheduler": "scheduler.0" + }, + "Ethernet88|5": { + "scheduler": "scheduler.0" + }, + "Ethernet96|5": { + "scheduler": "scheduler.0" + }, + "Ethernet104|5": { + "scheduler": "scheduler.0" + }, + "Ethernet112|5": { + "scheduler": "scheduler.0" + }, + "Ethernet120|5": { + "scheduler": "scheduler.0" + }, + "Ethernet128|5": { + "scheduler": "scheduler.0" + }, + "Ethernet136|5": { + "scheduler": "scheduler.0" + }, + "Ethernet0|6": { + "scheduler": "scheduler.0" + }, + "Ethernet8|6": { + "scheduler": "scheduler.0" + }, + "Ethernet16|6": { + "scheduler": "scheduler.0" + }, + "Ethernet24|6": { + "scheduler": "scheduler.0" + }, + "Ethernet32|6": { + "scheduler": "scheduler.0" + }, + "Ethernet40|6": { + "scheduler": "scheduler.0" + }, + "Ethernet48|6": { + "scheduler": "scheduler.0" + }, + "Ethernet56|6": { + "scheduler": "scheduler.0" + }, + "Ethernet64|6": { + "scheduler": "scheduler.0" + }, + "Ethernet72|6": { + "scheduler": "scheduler.0" + }, + "Ethernet80|6": { + "scheduler": "scheduler.0" + }, + "Ethernet88|6": { + "scheduler": "scheduler.0" + }, + "Ethernet96|6": { + "scheduler": "scheduler.0" + }, + "Ethernet104|6": { + "scheduler": "scheduler.0" + }, + "Ethernet112|6": { + "scheduler": "scheduler.0" + }, + "Ethernet120|6": { + "scheduler": "scheduler.0" + }, + "Ethernet128|6": { + "scheduler": "scheduler.0" + }, + "Ethernet136|6": { + "scheduler": "scheduler.0" + } + } +} diff --git a/src/sonic-config-engine/tests/test_j2files.py b/src/sonic-config-engine/tests/test_j2files.py index 09aa5315f808..1567db6cc90c 100644 --- a/src/sonic-config-engine/tests/test_j2files.py +++ b/src/sonic-config-engine/tests/test_j2files.py @@ -23,12 +23,17 @@ def setUp(self): self.dell6100_t0_minigraph = os.path.join(self.test_dir, 'sample-dell-6100-t0-minigraph.xml') self.arista7050_t0_minigraph = os.path.join(self.test_dir, 'sample-arista-7050-t0-minigraph.xml') self.arista7800r3_48cq2_lc_t2_minigraph = os.path.join(self.test_dir, 'sample-arista-7800r3-48cq2-lc-t2-minigraph.xml') + self.arista7800r3_48cqm2_lc_t2_minigraph = os.path.join(self.test_dir, 'sample-arista-7800r3-48cqm2-lc-t2-minigraph.xml') + self.arista7800r3a_36dm2_c36_lc_t2_minigraph = os.path.join(self.test_dir, 'sample-arista-7800r3a-36dm2-c36-lc-t2-minigraph.xml') + self.arista7800r3a_36dm2_d36_lc_t2_minigraph = os.path.join(self.test_dir, 'sample-arista-7800r3a-36dm2-d36-lc-t2-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.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') + self.nokia_ixr7250e_36x100g_t2_minigraph = os.path.join(self.test_dir, 'sample-nokia-ixr7250e-36x100g-t2-minigraph.xml') + self.nokia_ixr7250e_36x400g_t2_minigraph = os.path.join(self.test_dir, 'sample-nokia-ixr7250e-36x400g-t2-minigraph.xml') os.environ["CFGGEN_UNIT_TESTING"] = "2" def run_script(self, argument): @@ -243,35 +248,64 @@ def test_l2switch_template_dualtor(self): def test_qos_arista7050_render_template(self): 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 do_test_qos_and_buffer_arista7800r3_48cq2_lc_render_template(self, platform, hwsku): - arista_dir_path = os.path.join(self.test_dir, '..', '..', '..', 'device', 'arista', platform, hwsku) - qos_file = os.path.join(arista_dir_path, 'qos.json.j2') - buffer_file = os.path.join(arista_dir_path, 'buffers.json.j2') - port_config_ini_file = os.path.join(arista_dir_path, 'port_config.ini') + def do_test_qos_and_buffer_lc_render_template(self, platform, vendor, hwsku, minigraph, qos_sample_output, buffer_sample_output, multi_asic): + dir_path = os.path.join(self.test_dir, '..', '..', '..', 'device', vendor, platform, hwsku) - # copy qos_config.j2 and buffer_config.j2 to the Arista 7800r3_48cq2_lc directory to have all templates in one directory + if multi_asic == 1: + # for asic0 + dir_path = os.path.join(dir_path, '0') + + qos_file = os.path.join(dir_path, 'qos.json.j2') + buffer_file = os.path.join(dir_path, 'buffers.json.j2') + port_config_ini_file = os.path.join(dir_path, 'port_config.ini') + + # copy qos_config.j2 and buffer_config.j2 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) + shutil.copy2(qos_config_file, dir_path) buffer_config_file = os.path.join(self.test_dir, '..', '..', '..', 'files', 'build_templates', 'buffers_config.j2') - shutil.copy2(buffer_config_file, arista_dir_path) + shutil.copy2(buffer_config_file, dir_path) - for template_file, cfg_file, sample_output_file in [(qos_file, 'qos_config.j2', 'qos-arista7800r3-48cq2-lc.json'), - (buffer_file, 'buffers_config.j2', 'buffer-arista7800r3-48cq2-lc.json') ]: - argument = '-m ' + self.arista7800r3_48cq2_lc_t2_minigraph + ' -p ' + port_config_ini_file + ' -t ' + template_file + ' > ' + self.output_file + for template_file, cfg_file, sample_output_file in [(qos_file, 'qos_config.j2', qos_sample_output), + (buffer_file, 'buffers_config.j2', buffer_sample_output) ]: + argument = '-m ' + minigraph + ' -p ' + port_config_ini_file + ' -t ' + template_file + ' > ' + self.output_file self.run_script(argument) # cleanup - cfg_file_new = os.path.join(arista_dir_path, cfg_file) + cfg_file_new = os.path.join(dir_path, cfg_file) os.remove(cfg_file_new) sample_output_file = os.path.join(self.test_dir, 'sample_output', utils.PYvX_DIR, sample_output_file) assert utils.cmp(sample_output_file, self.output_file), self.run_diff(sample_output_file, self.output_file) def test_qos_and_buffer_arista7800r3_48cq2_lc_render_template(self): - self.do_test_qos_and_buffer_arista7800r3_48cq2_lc_render_template('x86_64-arista_7800r3_48cq2_lc', 'Arista-7800R3-48CQ2-C48') + self.do_test_qos_and_buffer_lc_render_template('x86_64-arista_7800r3_48cq2_lc', 'arista', 'Arista-7800R3-48CQ2-C48',\ + self.arista7800r3_48cq2_lc_t2_minigraph, 'qos-arista7800r3-48cq2-lc.json',\ + 'buffer-arista7800r3-48cq2-lc.json', 0) def test_qos_and_buffer_arista7800r3_48cqm2_lc_render_template(self): - self.do_test_qos_and_buffer_arista7800r3_48cq2_lc_render_template('x86_64-arista_7800r3_48cqm2_lc', 'Arista-7800R3-48CQM2-C48') + self.do_test_qos_and_buffer_lc_render_template('x86_64-arista_7800r3_48cqm2_lc', 'arista', 'Arista-7800R3-48CQM2-C48',\ + self.arista7800r3_48cqm2_lc_t2_minigraph, 'qos-arista7800r3-48cqm2-lc.json',\ + 'buffer-arista7800r3-48cqm2-lc.json', 0) + + def test_qos_and_buffer_arista7800r3a_36dm2_c36_render_template(self): + self.do_test_qos_and_buffer_lc_render_template('x86_64-arista_7800r3a_36dm2_lc', 'arista', 'Arista-7800R3A-36DM2-C36',\ + self.arista7800r3a_36dm2_c36_lc_t2_minigraph, 'qos-arista7800r3a-36dm2-c36-lc.json',\ + 'buffer-arista7800r3a-36dm2-c36-lc.json', 1) + + def test_qos_and_buffer_arista7800r3a_36dm2_d36_render_template(self): + self.do_test_qos_and_buffer_lc_render_template('x86_64-arista_7800r3a_36dm2_lc', 'arista', 'Arista-7800R3A-36DM2-D36',\ + self.arista7800r3a_36dm2_d36_lc_t2_minigraph, 'qos-arista7800r3a-36dm2-d36-lc.json',\ + 'buffer-arista7800r3a-36dm2-d36-lc.json', 1) + + def test_qos_and_buffer_nokia_ixr7250e_36x100g_render_template(self): + self.do_test_qos_and_buffer_lc_render_template('x86_64-nokia_ixr7250e_36x400g-r0', 'nokia', 'Nokia-IXR7250E-36x100G',\ + self.nokia_ixr7250e_36x100g_t2_minigraph, 'qos-nokia-ixr7250e-36x100g.json',\ + 'buffer-nokia-ixr7250e-36x100g.json', 1) + + def test_qos_and_buffer_nokia_ixr7250e_36x400g_render_template(self): + self.do_test_qos_and_buffer_lc_render_template('x86_64-nokia_ixr7250e_36x400g-r0', 'nokia', 'Nokia-IXR7250E-36x400G',\ + self.nokia_ixr7250e_36x400g_t2_minigraph, 'qos-nokia-ixr7250e-36x400g.json',\ + 'buffer-nokia-ixr7250e-36x400g.json', 1) 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') From 33359b4751fa0d8ec8ecaf88d013969528c0e75d Mon Sep 17 00:00:00 2001 From: mssonicbld <79238446+mssonicbld@users.noreply.github.com> Date: Sat, 3 Jun 2023 07:39:14 +0800 Subject: [PATCH 134/193] [submodule] Update submodule sonic-swss to the latest HEAD automatically (#15237) src/sonic-swss * 4d9fb93 - (HEAD -> 202205, origin/202205) [orchagent][neighorch] traffic convergence acceleration for staticroutebfd (#2769) (6 days ago) [Baorong Liu] * 43c88a3 - Fix pipeline issue caused by urllib3 v2 (6 days ago) [Liu Shilong] --- src/sonic-swss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/sonic-swss b/src/sonic-swss index eb79dae9d5a5..4d9fb93c00e6 160000 --- a/src/sonic-swss +++ b/src/sonic-swss @@ -1 +1 @@ -Subproject commit eb79dae9d5a51200a52617e355ab0624d19b75ab +Subproject commit 4d9fb93c00e6e2d8ec590928da78f90931c6a85d From 695505c0c8c58e831849b502beb42f67d8aae53d Mon Sep 17 00:00:00 2001 From: Liu Shilong Date: Sat, 3 Jun 2023 07:40:50 +0800 Subject: [PATCH 135/193] [action] Only add 'automerge' label on master version upgrade PR. (#15112) (#15279) Why I did it Don't auto update package version for release branch. Work item tracking Microsoft ADO (number only): 22335854 How I did it How to verify it --- .github/workflows/label.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/label.yml b/.github/workflows/label.yml index 5f8c0279b7e1..12c0389be162 100644 --- a/.github/workflows/label.yml +++ b/.github/workflows/label.yml @@ -12,9 +12,7 @@ on: - opened - reopened branches: - - '202012' - - '202[1-9][0-9][0-9]' - - '20[3-9][0-9][0-9][0-9]' + - master paths: - 'files/build/versions/**' From 7a3fc7a56f227906e12ff8edd901424b9e2d227f Mon Sep 17 00:00:00 2001 From: mssonicbld <79238446+mssonicbld@users.noreply.github.com> Date: Sat, 3 Jun 2023 07:43:20 +0800 Subject: [PATCH 136/193] [submodule] Update submodule sonic-utilities to the latest HEAD automatically (#15238) src/sonic-utilities * cd08aa69 - (HEAD -> 202205, origin/202205) [show][muxcable] add some new commands health, reset-cause, queue_info support for muxcable (#2853) (2 days ago) [vdahiya12] * 4b96bd7e - Update pcieutil error message on loading common pcie module (#2786) (6 days ago) [cytsao1] * 77b725ca - Fix the show interface counters throwing exception on device with no external interfaces (#2851) (6 days ago) [abdosi] --- src/sonic-utilities | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/sonic-utilities b/src/sonic-utilities index ff26d900830d..cd08aa697956 160000 --- a/src/sonic-utilities +++ b/src/sonic-utilities @@ -1 +1 @@ -Subproject commit ff26d900830dfae207e136f1c703d9808fc5eb40 +Subproject commit cd08aa6979564f43851b5a35d855667b96f02901 From b0abe7149a764620c8fee9c200b3c12db281ea36 Mon Sep 17 00:00:00 2001 From: mssonicbld <79238446+mssonicbld@users.noreply.github.com> Date: Sat, 3 Jun 2023 09:30:12 +0800 Subject: [PATCH 137/193] Fix for fast/cold-boot: call db_migrator only after old config is loaded (#14933) (#15316) --- 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 6879aeb703f7..ab13a03ca35a 100644 --- a/files/build_templates/docker_image_ctl.j2 +++ b/files/build_templates/docker_image_ctl.j2 @@ -246,10 +246,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 0f5a248b05f8..28a3a4373a42 100755 --- a/files/image_config/config-setup/config-setup +++ b/files/image_config/config-setup/config-setup @@ -304,6 +304,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() @@ -326,16 +336,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 fdf3aace6e23831c8353d509685a1fb14ffcf59b Mon Sep 17 00:00:00 2001 From: mssonicbld <79238446+mssonicbld@users.noreply.github.com> Date: Sun, 4 Jun 2023 02:31:02 +0800 Subject: [PATCH 138/193] [submodule] Update submodule sonic-platform-daemons to the latest HEAD automatically (#15318) src/sonic-platform-daemons * 616f13f - (HEAD -> 202205, origin/202205) [ycabled] fix bug for `show mux status` delayed response (#364) (6 hours ago) [vdahiya12] --- 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 2466680e93cd..616f13f464b9 160000 --- a/src/sonic-platform-daemons +++ b/src/sonic-platform-daemons @@ -1 +1 @@ -Subproject commit 2466680e93cde3eaf91f2224974876e16fa7a4d2 +Subproject commit 616f13f464b949a904e7665a494a7f840f57efef From 49700d3f83a4bd1c5248c64ba7f438b08246f011 Mon Sep 17 00:00:00 2001 From: mssonicbld <79238446+mssonicbld@users.noreply.github.com> Date: Sun, 4 Jun 2023 02:31:39 +0800 Subject: [PATCH 139/193] [submodule] Update submodule sonic-swss to the latest HEAD automatically (#15319) src/sonic-swss * c781521 - (HEAD -> 202205, origin/202205) [swss][orchagent] fix srt-bfd ut (#2803) (6 hours ago) [Baorong Liu] --- src/sonic-swss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/sonic-swss b/src/sonic-swss index 4d9fb93c00e6..c78152153b3d 160000 --- a/src/sonic-swss +++ b/src/sonic-swss @@ -1 +1 @@ -Subproject commit 4d9fb93c00e6e2d8ec590928da78f90931c6a85d +Subproject commit c78152153b3da6536947f2ea1c1348d08c404d46 From eb2e3422981f9e18140a1c050713d721b5991e28 Mon Sep 17 00:00:00 2001 From: mssonicbld <79238446+mssonicbld@users.noreply.github.com> Date: Sun, 4 Jun 2023 02:32:23 +0800 Subject: [PATCH 140/193] [submodule] Update submodule sonic-utilities to the latest HEAD automatically (#15320) src/sonic-utilities * ec472146 - (HEAD -> 202205, origin/202205) fix show interface neighbor expected empty issue (#2465) (3 minutes ago) [jcaiMR] * d1f4413c - [vlan][dhcp_relay] Clear dhcpv6 relay counter while deleting vlan (#2852) (6 hours ago) [Yaqiang Zhu] * 051f28ce - [db-migrator] Fix hwsku match for 6100 and add errors when hwsku is None (#2821) (7 hours ago) [Vaibhav Hemant Dixit] --- src/sonic-utilities | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/sonic-utilities b/src/sonic-utilities index cd08aa697956..ec472146325d 160000 --- a/src/sonic-utilities +++ b/src/sonic-utilities @@ -1 +1 @@ -Subproject commit cd08aa6979564f43851b5a35d855667b96f02901 +Subproject commit ec472146325d7b5b922be0bbb205f0dc81f9c3f6 From f1542a9827ab69d607253e110619fccaa551d3ab Mon Sep 17 00:00:00 2001 From: mssonicbld <79238446+mssonicbld@users.noreply.github.com> Date: Sun, 4 Jun 2023 02:33:05 +0800 Subject: [PATCH 141/193] [submodule] Update submodule linkmgrd to the latest HEAD automatically (#15324) src/linkmgrd * c0f7c50 - (HEAD -> 202205, origin/202205) Increase verbosity for mux config and default route handlers (#193) (14 minutes ago) [Longxiang Lyu] * 2040a5e - Ignore mux probe unknown for health calculation (#188) (14 minutes ago) [Longxiang Lyu] --- src/linkmgrd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/linkmgrd b/src/linkmgrd index 700939c51b6a..c0f7c506b361 160000 --- a/src/linkmgrd +++ b/src/linkmgrd @@ -1 +1 @@ -Subproject commit 700939c51b6ac909f41f77e15a61fcbcf343b4dc +Subproject commit c0f7c506b36168d13b6c250444394e9b2f748e9d From ba39275292c720ffb9806e7c1aae2547e061841f Mon Sep 17 00:00:00 2001 From: mssonicbld <79238446+mssonicbld@users.noreply.github.com> Date: Tue, 6 Jun 2023 03:04:18 +0800 Subject: [PATCH 142/193] [submodule] Update submodule sonic-platform-daemons to the latest HEAD automatically (#15344) src/sonic-platform-daemons * 1537d6a - (HEAD -> 202205, origin/202205) [dualtor] Fix command `show mux status` (#371) (2 minutes ago) [Longxiang Lyu] --- 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 616f13f464b9..1537d6adfc16 160000 --- a/src/sonic-platform-daemons +++ b/src/sonic-platform-daemons @@ -1 +1 @@ -Subproject commit 616f13f464b949a904e7665a494a7f840f57efef +Subproject commit 1537d6adfc1684a7214cce7732d5764d5b5d9189 From 4d91f68e1faf088251c7f83ea6aaed8f70947765 Mon Sep 17 00:00:00 2001 From: mssonicbld <79238446+mssonicbld@users.noreply.github.com> Date: Tue, 6 Jun 2023 04:39:53 +0800 Subject: [PATCH 143/193] [submodule] Update submodule sonic-platform-daemons to the latest HEAD automatically (#15347) src/sonic-platform-daemons * a90bff5 - (HEAD -> 202205, origin/202205) [ycabled] correct the wrong function call for 'config hwmode state' (#372) (5 minutes ago) [vdahiya12] --- 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 1537d6adfc16..a90bff5b3c28 160000 --- a/src/sonic-platform-daemons +++ b/src/sonic-platform-daemons @@ -1 +1 @@ -Subproject commit 1537d6adfc1684a7214cce7732d5764d5b5d9189 +Subproject commit a90bff5b3c28d71198d32b9bd3f1ffa6f0d1b54a From fbe5fe736e65fa0559b31fb9b197a035b7df1bfe Mon Sep 17 00:00:00 2001 From: mssonicbld <79238446+mssonicbld@users.noreply.github.com> Date: Wed, 7 Jun 2023 06:40:37 +0800 Subject: [PATCH 144/193] [ci/build]: Upgrade SONiC package versions (#15326) --- .../build-sonic-slave-bullseye/versions-py3 | 2 +- .../build-sonic-slave-buster/versions-py3 | 2 +- files/build/versions/default/versions-git | 10 +++---- files/build/versions/default/versions-mirror | 20 +++++++------- .../versions-deb-bullseye | 2 +- .../versions-deb-bullseye-armhf | 1 - .../dockers/docker-base-bullseye/versions-py3 | 2 +- .../dockers/docker-base-buster/versions-py3 | 2 +- .../versions-py3 | 2 +- .../docker-config-engine-buster/versions-py3 | 4 +-- .../dockers/docker-ptf/versions-deb-buster | 24 ++++++++--------- .../versions-deb-bullseye | 2 ++ .../dockers/docker-sonic-vs/versions-py3 | 2 +- .../versions-deb-bullseye | 2 ++ .../versions-deb-bullseye | 2 ++ .../versions-deb-bullseye | 4 +-- .../versions-deb-bullseye | 5 ++-- .../dockers/sonic-slave-bullseye/versions-py3 | 4 +-- .../sonic-slave-buster/versions-deb-buster | 26 +++++++++---------- .../dockers/sonic-slave-buster/versions-py3 | 6 ++--- .../versions/host-image/versions-deb-bullseye | 14 +++++----- .../host-image/versions-deb-bullseye-arm64 | 5 ---- .../host-image/versions-deb-bullseye-armhf | 6 +++-- files/build/versions/host-image/versions-py3 | 6 ++--- 24 files changed, 79 insertions(+), 76 deletions(-) delete mode 100644 files/build/versions/dockers/docker-base-bullseye/versions-deb-bullseye-armhf diff --git a/files/build/versions/build/build-sonic-slave-bullseye/versions-py3 b/files/build/versions/build/build-sonic-slave-bullseye/versions-py3 index 9044c9691996..e82ac8dfeef6 100644 --- a/files/build/versions/build/build-sonic-slave-bullseye/versions-py3 +++ b/files/build/versions/build/build-sonic-slave-bullseye/versions-py3 @@ -2,7 +2,7 @@ blessed==1.20.0 charset-normalizer==3.1.0 click-log==0.4.0 colorful==0.5.5 -docker==6.1.2 +docker==6.1.3 docker-image-py==0.1.12 enlighten==1.11.2 filelock==3.12.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 4f2dcc7bd232..8a228e0703fe 100644 --- a/files/build/versions/build/build-sonic-slave-buster/versions-py3 +++ b/files/build/versions/build/build-sonic-slave-buster/versions-py3 @@ -4,7 +4,7 @@ click==7.0 click-log==0.4.0 colorful==0.5.5 dbus-python==1.3.2 -docker==6.1.2 +docker==6.1.3 docker-image-py==0.1.12 enlighten==1.11.2 filelock==3.12.0 diff --git a/files/build/versions/default/versions-git b/files/build/versions/default/versions-git index 82d0ed83d6ae..2f7ee2bbc712 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==04afb4b256a1aab562b0fcfaf7cd9ffe4ec42c1b +https://chromium.googlesource.com/chromium/tools/depot_tools.git==df2f11113c23d65c1fd7824b7ab3c55f7cfb9604 https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f https://github.com/CESNET/libyang.git==ea94c8b9f513f8a6ddc6ce1540fa41eaf4c8922a https://github.com/daveolson53/audisp-tacplus.git==559c9f22edd4f2dea0ecedffb3ad9502b12a75b6 https://github.com/daveolson53/libnss-tacplus.git==19008ab68d9d504aa58eb34d5f564755a1613b8b https://github.com/dyninc/OpenBFDD.git==e35f43ad8d2b3f084e96a84c392528a90d05a287 -https://github.com/flashrom/flashrom.git==385b3374e37fe1919177978a32fe2f48f2217817 -https://github.com/FreeRADIUS/freeradius-server.git==182e6fe91d4c5a66f720506c7349afefef9a64ec +https://github.com/flashrom/flashrom.git==c7812231bd5c69956ef8d97315e8e2f306d1c550 +https://github.com/FreeRADIUS/freeradius-server.git==fe2ea7b89312774ce007a2fdc0da27fd41f29a89 https://github.com/FreeRADIUS/pam_radius.git==8d373539bb9f13b0abfe8bcae0095a930a00fad0 https://github.com/jeroennijhof/pam_tacplus.git==4284d9016e64def2bb81d5f50f96dc3b59bfdc39 https://github.com/jpirko/libteam.git==61e27812c1074a865d7e1a778c0ce442837c28d7 @@ -14,11 +14,11 @@ https://github.com/Marvell-switching/mrvl-prestera.git==9dbae444204a2c27b33be698 https://github.com/Mellanox/libpsample.git==62bb27d9a49424e45191eee81df7ce0d8c74e774 https://github.com/opencomputeproject/SAI.git==fdaf928679dfa53ae21690f963b9b1f80032f2bf https://github.com/p4lang/scapy-vxlan.git==85ffe83da156568ee47a0750f638227e6e1d7479 -https://github.com/sflow/host-sflow==d61d7b3b52a1791d8b2782a32a7bdc391529ad31 +https://github.com/sflow/host-sflow==b9b61bc037aed4d3d0fac6b0b4d88bc78b7b485d https://github.com/sflow/sflowtool==4ce1223bb4c2cd0cbb1dd688dc0914561fcbb6c4 https://github.com/thom311/libnl==cbafad9ddf24caef5230fef715d34f0539603be0 https://salsa.debian.org/debian/libteam.git==48142125234a665ad5367b724af36a58fb484d3d -https://salsa.debian.org/kernel-team/ethtool/==97421dce8db53650dc08280f94bdd92cb4642cca +https://salsa.debian.org/kernel-team/ethtool/==532e36ef02837c78df47f8d561aa04b5cfed438f https://salsa.debian.org/kernel-team/initramfs-tools.git==193dfbb7929e518976f89f6c8dd9201982e56f80 https://salsa.debian.org/sk-guest/monit.git==c9da7ebb1f35dfba17b50b5969a6e75e29cbec0d https://salsa.debian.org/ssh-team/openssh.git==4cb9ac54235e8f90a590a976e1404480fb521930 \ No newline at end of file diff --git a/files/build/versions/default/versions-mirror b/files/build/versions/default/versions-mirror index 80ed3b7297bd..a1c3ae07e191 100644 --- a/files/build/versions/default/versions-mirror +++ b/files/build/versions/default/versions-mirror @@ -1,15 +1,15 @@ deb.nodesource.com_node%5f14.x_dists_bullseye==2023-02-17T00:35:28Z deb.nodesource.com_node%5f14.x_dists_buster==2023-02-17T00:35:28Z -debian==20230528T000207Z -debian-security==20230528T000210Z +debian==20230604T000128Z +debian-security==20230604T000129Z download.docker.com_linux_debian_dists_bullseye==2023-05-26T07:49:37Z download.docker.com_linux_debian_dists_buster==2023-05-26T07:49:38Z packages.microsoft.com_repos_sonic-dev_dists_jessie==2022-10-31T19:34:29Z -packages.trafficmanager.net_snapshot_debian-security_20230528T000210Z_dists_bullseye-security==2023-05-27T22:52:33Z -packages.trafficmanager.net_snapshot_debian-security_20230528T000210Z_dists_buster_updates==2023-05-27T22:52:33Z -packages.trafficmanager.net_snapshot_debian_20230528T000207Z_dists_bullseye==2023-04-29T09:31:02Z -packages.trafficmanager.net_snapshot_debian_20230528T000207Z_dists_bullseye-backports==2023-05-27T20:25:46Z -packages.trafficmanager.net_snapshot_debian_20230528T000207Z_dists_bullseye-updates==2023-05-27T20:25:46Z -packages.trafficmanager.net_snapshot_debian_20230528T000207Z_dists_buster==2022-09-10T11:30:54Z -packages.trafficmanager.net_snapshot_debian_20230528T000207Z_dists_buster-backports==2023-05-27T20:25:46Z -packages.trafficmanager.net_snapshot_debian_20230528T000207Z_dists_buster-updates==2023-05-27T20:25:45Z \ No newline at end of file +packages.trafficmanager.net_snapshot_debian-security_20230604T000129Z_dists_bullseye-security==2023-06-03T16:23:43Z +packages.trafficmanager.net_snapshot_debian-security_20230604T000129Z_dists_buster_updates==2023-06-03T16:23:43Z +packages.trafficmanager.net_snapshot_debian_20230604T000128Z_dists_bullseye==2023-04-29T09:31:02Z +packages.trafficmanager.net_snapshot_debian_20230604T000128Z_dists_bullseye-backports==2023-06-03T20:10:57Z +packages.trafficmanager.net_snapshot_debian_20230604T000128Z_dists_bullseye-updates==2023-06-03T20:10:57Z +packages.trafficmanager.net_snapshot_debian_20230604T000128Z_dists_buster==2022-09-10T11:30:54Z +packages.trafficmanager.net_snapshot_debian_20230604T000128Z_dists_buster-backports==2023-06-03T20:10:57Z +packages.trafficmanager.net_snapshot_debian_20230604T000128Z_dists_buster-updates==2023-06-03T20:10:57Z \ No newline at end of file diff --git a/files/build/versions/dockers/docker-base-bullseye/versions-deb-bullseye b/files/build/versions/dockers/docker-base-bullseye/versions-deb-bullseye index 26a7ad7d7b23..dafee34b3d80 100644 --- a/files/build/versions/dockers/docker-base-bullseye/versions-deb-bullseye +++ b/files/build/versions/dockers/docker-base-bullseye/versions-deb-bullseye @@ -56,7 +56,7 @@ lua-bitop==1.0.2-5 lua-cjson==2.1.0+dfsg-2.1 media-types==4.0.0 net-tools==1.60+git20181103.0eebece-1 -openssl==1.1.1n-0+deb11u4+fips +openssl==1.1.1n-0+deb11u5 perl==5.32.1-4+deb11u2 perl-modules-5.32==5.32.1-4+deb11u2 procps==2:3.3.17-5 diff --git a/files/build/versions/dockers/docker-base-bullseye/versions-deb-bullseye-armhf b/files/build/versions/dockers/docker-base-bullseye/versions-deb-bullseye-armhf deleted file mode 100644 index ecfd4bb3bb3d..000000000000 --- a/files/build/versions/dockers/docker-base-bullseye/versions-deb-bullseye-armhf +++ /dev/null @@ -1 +0,0 @@ -openssl==1.1.1n-0+deb11u4 \ No newline at end of file diff --git a/files/build/versions/dockers/docker-base-bullseye/versions-py3 b/files/build/versions/dockers/docker-base-bullseye/versions-py3 index cf6bd999d21e..8eb185d8452b 100644 --- a/files/build/versions/dockers/docker-base-bullseye/versions-py3 +++ b/files/build/versions/dockers/docker-base-bullseye/versions-py3 @@ -1,6 +1,6 @@ j2cli==0.3.10 jinja2==3.1.2 -markupsafe==2.1.2 +markupsafe==2.1.3 supervisor==4.2.1 supervisord-dependent-startup==1.4.0 toposort==1.10 \ 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 cf6bd999d21e..8eb185d8452b 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.2 +markupsafe==2.1.3 supervisor==4.2.1 supervisord-dependent-startup==1.4.0 toposort==1.10 \ No newline at end of file diff --git a/files/build/versions/dockers/docker-config-engine-bullseye/versions-py3 b/files/build/versions/dockers/docker-config-engine-bullseye/versions-py3 index ab9ffb3c8234..5cb30170522c 100644 --- a/files/build/versions/dockers/docker-config-engine-bullseye/versions-py3 +++ b/files/build/versions/dockers/docker-config-engine-bullseye/versions-py3 @@ -11,6 +11,6 @@ pyangbind==0.8.1 pyyaml==5.4.1 redis==4.5.5 redis-dump-load==1.1 -regex==2023.5.5 +regex==2023.6.3 six==1.16.0 xmltodict==0.12.0 \ 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 384ba72b8f2b..4d96d6bbc389 100644 --- a/files/build/versions/dockers/docker-config-engine-buster/versions-py3 +++ b/files/build/versions/dockers/docker-config-engine-buster/versions-py3 @@ -12,8 +12,8 @@ pyangbind==0.8.1 pyyaml==5.4.1 redis==4.5.5 redis-dump-load==1.1 -regex==2023.5.5 +regex==2023.6.3 six==1.16.0 -typing_extensions==4.6.2 +typing_extensions==4.6.3 xmltodict==0.12.0 zipp==3.15.0 \ No newline at end of file diff --git a/files/build/versions/dockers/docker-ptf/versions-deb-buster b/files/build/versions/dockers/docker-ptf/versions-deb-buster index 68d2faf33e7f..d70e17e82d2c 100644 --- a/files/build/versions/dockers/docker-ptf/versions-deb-buster +++ b/files/build/versions/dockers/docker-ptf/versions-deb-buster @@ -89,9 +89,9 @@ libcc1-0==8.3.0-6 libcdt5==2.40.1-6+deb10u1 libcgraph6==2.40.1-6+deb10u1 libcryptsetup12==2:2.1.0-5+deb10u2 -libcups2==2.2.10-6+deb10u6 +libcups2==2.2.10-6+deb10u7 libcupsfilters1==1.21.6-5+deb10u1 -libcupsimage2==2.2.10-6+deb10u6 +libcupsimage2==2.2.10-6+deb10u7 libcurl3-gnutls==7.64.0-4+deb10u6 libcurl4==7.64.0-4+deb10u6 libdaemon0==0.14-7 @@ -192,7 +192,7 @@ libjsoncpp1==1.7.4-3 libk5crypto3==1.17-3+deb10u5 libkeyutils1==1.6-6 libkmod2==26-1 -libkpathsea6==2018.20181218.49446-1+deb10u1 +libkpathsea6==2018.20181218.49446-1+deb10u2 libkrb5-3==1.17-3+deb10u5 libkrb5support0==1.17-3+deb10u5 libksba8==1.3.5-2+deb10u2 @@ -254,7 +254,7 @@ libpopt0==1.16-12 libpotrace0==1.15-1 libprocps7==2:3.3.15-2 libpsl5==0.20.2-2 -libptexenc1==2018.20181218.49446-1+deb10u1 +libptexenc1==2018.20181218.49446-1+deb10u2 libpython-dev==2.7.16-1 libpython-stdlib==2.7.16-1 libpython2-dev==2.7.16-1 @@ -288,7 +288,7 @@ libssh2-1==1.8.0-2.1 libssl-dev==1.1.1n-0+deb10u4 libssl1.1==1.1.1n-0+deb10u4 libstdc++-8-dev==8.3.0-6 -libsynctex2==2018.20181218.49446-1+deb10u1 +libsynctex2==2018.20181218.49446-1+deb10u2 libsystemd0==241-7~deb10u9 libtacacs+1==4.0.4.27a-3 libtasn1-6==4.13-3+deb10u1 @@ -297,9 +297,9 @@ libteam-utils==1.28-1 libteam5==1.28-1 libteamdctl0==1.28-1 libteckit0==2.5.8+ds2-5 -libtexlua52==2018.20181218.49446-1+deb10u1 -libtexlua53==2018.20181218.49446-1+deb10u1 -libtexluajit2==2018.20181218.49446-1+deb10u1 +libtexlua52==2018.20181218.49446-1+deb10u2 +libtexlua53==2018.20181218.49446-1+deb10u2 +libtexluajit2==2018.20181218.49446-1+deb10u2 libtext-iconv-perl==1.7-5+b7 libthai-data==0.1.28-2 libthai0==0.1.28-2 @@ -317,9 +317,9 @@ libunbound8==1.9.0-2+deb10u3 liburi-perl==1.76-1 libutempter0==1.1.6-3 libuv1==1.24.1-1+deb10u1 -libwebp6==0.6.1-2+deb10u1 -libwebpdemux2==0.6.1-2+deb10u1 -libwebpmux3==0.6.1-2+deb10u1 +libwebp6==0.6.1-2+deb10u2 +libwebpdemux2==0.6.1-2+deb10u2 +libwebpmux3==0.6.1-2+deb10u2 libwoff1==1.0.2-1 libwrap0==7.6.q-28 libwww-perl==6.36-2 @@ -478,7 +478,7 @@ tcpdump==4.9.3-1~deb10u2 telnet==0.17-41.2 tex-common==6.11 texlive-base==2018.20190227-2 -texlive-binaries==2018.20181218.49446-1+deb10u1 +texlive-binaries==2018.20181218.49446-1+deb10u2 texlive-latex-base==2018.20190227-2 tk8.6-blt2.5==2.5.3+dfsg-4 tmux==2.8-3+deb10u1 diff --git a/files/build/versions/dockers/docker-saiserverv2-mlnx/versions-deb-bullseye b/files/build/versions/dockers/docker-saiserverv2-mlnx/versions-deb-bullseye index cc17560d7004..2a52cbf165d1 100644 --- a/files/build/versions/dockers/docker-saiserverv2-mlnx/versions-deb-bullseye +++ b/files/build/versions/dockers/docker-saiserverv2-mlnx/versions-deb-bullseye @@ -80,6 +80,8 @@ librhash0==1.4.1-2 libsaithrift-dev==0.9.4 libsource-highlight-common==3.1.9-3 libsource-highlight4v5==3.1.9-3+b1 +libssl-dev==1.1.1n-0+deb11u5 +libssl1.1==1.1.1n-0+deb11u5 libstdc++-10-dev==10.2.1-6 libthrift0==0.14.1 libtirpc-dev==1.3.1-1+deb11u1 diff --git a/files/build/versions/dockers/docker-sonic-vs/versions-py3 b/files/build/versions/dockers/docker-sonic-vs/versions-py3 index 0976cbbf7058..b56b3fd779f3 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 @@ click==7.0 click-log==0.4.0 colorful==0.5.5 dbus-python==1.3.2 -docker==6.1.2 +docker==6.1.3 docker-image-py==0.1.12 enlighten==1.11.2 filelock==3.12.0 diff --git a/files/build/versions/dockers/docker-syncd-brcm-dnx-rpc/versions-deb-bullseye b/files/build/versions/dockers/docker-syncd-brcm-dnx-rpc/versions-deb-bullseye index 4ff318b3f620..237f8719ee88 100644 --- a/files/build/versions/dockers/docker-syncd-brcm-dnx-rpc/versions-deb-bullseye +++ b/files/build/versions/dockers/docker-syncd-brcm-dnx-rpc/versions-deb-bullseye @@ -48,6 +48,8 @@ libqt5dbus5==5.15.2+dfsg-9 libqt5network5==5.15.2+dfsg-9 libquadmath0==10.2.1-6 librhash0==1.4.1-2 +libssl-dev==1.1.1n-0+deb11u5 +libssl1.1==1.1.1n-0+deb11u5 libstdc++-10-dev==10.2.1-6 libthrift-0.11.0==0.11.0-4 libtirpc-dev==1.3.1-1+deb11u1 diff --git a/files/build/versions/dockers/docker-syncd-brcm-rpc/versions-deb-bullseye b/files/build/versions/dockers/docker-syncd-brcm-rpc/versions-deb-bullseye index 4ff318b3f620..237f8719ee88 100644 --- a/files/build/versions/dockers/docker-syncd-brcm-rpc/versions-deb-bullseye +++ b/files/build/versions/dockers/docker-syncd-brcm-rpc/versions-deb-bullseye @@ -48,6 +48,8 @@ libqt5dbus5==5.15.2+dfsg-9 libqt5network5==5.15.2+dfsg-9 libquadmath0==10.2.1-6 librhash0==1.4.1-2 +libssl-dev==1.1.1n-0+deb11u5 +libssl1.1==1.1.1n-0+deb11u5 libstdc++-10-dev==10.2.1-6 libthrift-0.11.0==0.11.0-4 libtirpc-dev==1.3.1-1+deb11u1 diff --git a/files/build/versions/dockers/docker-syncd-mlnx-rpc/versions-deb-bullseye b/files/build/versions/dockers/docker-syncd-mlnx-rpc/versions-deb-bullseye index 1d4acf267d25..c2d64f8780c8 100644 --- a/files/build/versions/dockers/docker-syncd-mlnx-rpc/versions-deb-bullseye +++ b/files/build/versions/dockers/docker-syncd-mlnx-rpc/versions-deb-bullseye @@ -42,8 +42,8 @@ libqt5dbus5==5.15.2+dfsg-9 libqt5network5==5.15.2+dfsg-9 libquadmath0==10.2.1-6 librhash0==1.4.1-2 -libssl-dev==1.1.1n-0+deb11u3 -libssl1.1==1.1.1n-0+deb11u3 +libssl-dev==1.1.1n-0+deb11u5 +libssl1.1==1.1.1n-0+deb11u5 libstdc++-10-dev==10.2.1-6 libthrift-0.11.0==0.11.0-4 libtsan0==10.2.1-6 diff --git a/files/build/versions/dockers/sonic-slave-bullseye/versions-deb-bullseye b/files/build/versions/dockers/sonic-slave-bullseye/versions-deb-bullseye index e2a237125102..e288388b0e0e 100644 --- a/files/build/versions/dockers/sonic-slave-bullseye/versions-deb-bullseye +++ b/files/build/versions/dockers/sonic-slave-bullseye/versions-deb-bullseye @@ -1104,7 +1104,8 @@ libsratom-0-0==0.6.8-1 libsrt1.4-gnutls==1.4.2-1.3 libssh-gcrypt-4==0.9.7-0+deb11u1 libssh2-1==1.9.0-2 -libssl-dev==1.1.1n-0+deb11u4 +libssl-dev==1.1.1n-0+deb11u5 +libssl1.1==1.1.1n-0+deb11u5 libstdc++-10-dev==10.2.1-6 libstemmer0d==2.1.0-1 libstrictures-perl==2.000006-1 @@ -1425,7 +1426,7 @@ opensp==1.5.2-13+b2 openssh-client==1:8.4p1-5+deb11u1 openssh-server==1:8.4p1-5+deb11u1 openssh-sftp-server==1:8.4p1-5+deb11u1 -openssl==1.1.1n-0+deb11u4 +openssl==1.1.1n-0+deb11u5 ovmf==2020.11-2+deb11u1 packagekit==1.2.2-2 packagekit-tools==1.2.2-2 diff --git a/files/build/versions/dockers/sonic-slave-bullseye/versions-py3 b/files/build/versions/dockers/sonic-slave-bullseye/versions-py3 index 2b2caa108c44..08d419b1c5cb 100644 --- a/files/build/versions/dockers/sonic-slave-bullseye/versions-py3 +++ b/files/build/versions/dockers/sonic-slave-bullseye/versions-py3 @@ -6,7 +6,7 @@ automat==20.2.0 babel==2.8.0 bcrypt==3.1.7 beautifulsoup4==4.9.3 -bitarray==2.7.3 +bitarray==2.7.4 certifi==2020.6.20 chardet==4.0.0 click==7.1.2 @@ -86,7 +86,7 @@ pytz==2021.1 pyxdg==0.27 pyyaml==5.4.1 redis==4.5.5 -regex==2023.5.5 +regex==2023.6.3 requests==2.25.1 roman==2.0.0 service-identity==18.1.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 8b6af4d730c9..e4cac0f64a26 100644 --- a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster +++ b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster @@ -413,9 +413,9 @@ libcryptsetup12==2:2.1.0-5+deb10u2 libcrystalhd3==1:0.0~git20110715.fdd2f19-13 libcunit1==2.1-3-dfsg-2+b12 libcunit1-dev==2.1-3-dfsg-2+b12 -libcups2==2.2.10-6+deb10u6 +libcups2==2.2.10-6+deb10u7 libcupsfilters1==1.21.6-5+deb10u1 -libcupsimage2==2.2.10-6+deb10u6 +libcupsimage2==2.2.10-6+deb10u7 libcurl3-gnutls==7.64.0-4+deb10u6 libcurl4==7.64.0-4+deb10u6 libcurl4-openssl-dev==7.64.0-4+deb10u6 @@ -721,7 +721,7 @@ libkadm5srv-mit11==1.17-3+deb10u5 libkdb5-9==1.17-3+deb10u5 libkeyutils1==1.6-6 libkmod2==26-1 -libkpathsea6==2018.20181218.49446-1+deb10u1 +libkpathsea6==2018.20181218.49446-1+deb10u2 libkrb5-3==1.17-3+deb10u5 libkrb5-dev==1.17-3+deb10u5 libkrb5support0==1.17-3+deb10u5 @@ -957,7 +957,7 @@ 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+deb10u1 +libptexenc1==2018.20181218.49446-1+deb10u2 libpthread-stubs0-dev==0.4-1 libpulse0==12.2-4+deb10u1 libpython-all-dev==2.7.16-1 @@ -1087,7 +1087,7 @@ libspeex1==1.2~rc1.2-1+b2 libspice-server1==0.14.0-1.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 +libssh-gcrypt-4==0.8.7-1+deb10u2 libssh2-1==1.8.0-2.1 libssl-dev==1.1.1n-0+deb10u4 libssl1.1==1.1.1n-0+deb10u4 @@ -1110,7 +1110,7 @@ libsurefire-java==2.22.1-1 libswitch-perl==2.17-2 libswresample3==7:4.1.10-0+deb10u1 libswscale5==7:4.1.10-0+deb10u1 -libsynctex2==2018.20181218.49446-1+deb10u1 +libsynctex2==2018.20181218.49446-1+deb10u2 libsys-hostname-long-perl==1.5-1 libsystemd-dev==241-7~deb10u9 libtag1v5==1.11.1+dfsg.1-0.3+deb10u1 @@ -1125,9 +1125,9 @@ libtemplate-perl==2.27-1+b1 libterm-readkey-perl==2.38-1 libtest-fatal-perl==0.014-1 libtest-refcount-perl==0.08-3 -libtexlua52==2018.20181218.49446-1+deb10u1 -libtexlua53==2018.20181218.49446-1+deb10u1 -libtexluajit2==2018.20181218.49446-1+deb10u1 +libtexlua52==2018.20181218.49446-1+deb10u2 +libtexlua53==2018.20181218.49446-1+deb10u2 +libtexluajit2==2018.20181218.49446-1+deb10u2 libtext-charwidth-perl==0.04-7.1+b1 libtext-glob-perl==0.10-1 libtext-iconv-perl==1.7-5+b7 @@ -1204,9 +1204,9 @@ 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 +libwebp6==0.6.1-2+deb10u2 +libwebpdemux2==0.6.1-2+deb10u2 +libwebpmux3==0.6.1-2+deb10u2 libwebsocket-api-java==1.1-1+deb10u1 libwmf0.2-7==0.2.8.4-14 libwoff1==1.0.2-1 @@ -1717,7 +1717,7 @@ 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+deb10u1 +texlive-binaries==2018.20181218.49446-1+deb10u2 texlive-fonts-recommended==2018.20190227-2 texlive-formats-extra==2018.20190227-2 texlive-generic-recommended==2018.20190227-2 diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-py3 b/files/build/versions/dockers/sonic-slave-buster/versions-py3 index abee70bdd448..baece2729901 100644 --- a/files/build/versions/dockers/sonic-slave-buster/versions-py3 +++ b/files/build/versions/dockers/sonic-slave-buster/versions-py3 @@ -4,7 +4,7 @@ async-timeout==4.0.2 atomicwrites==1.1.5 attrs==18.2.0 babel==2.6.0 -bitarray==2.7.3 +bitarray==2.7.4 certifi==2018.8.24 chardet==3.0.4 cov-core==1.15.0 @@ -64,14 +64,14 @@ pytz==2019.1 pyxdg==0.25 pyyaml==5.4.1 redis==4.5.5 -regex==2023.5.5 +regex==2023.6.3 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 -typing_extensions==4.6.2 +typing_extensions==4.6.3 unattended-upgrades==0.1 unidiff==0.5.4 urllib3==1.24.1 diff --git a/files/build/versions/host-image/versions-deb-bullseye b/files/build/versions/host-image/versions-deb-bullseye index 83be5264d5bd..13df298ca2f3 100644 --- a/files/build/versions/host-image/versions-deb-bullseye +++ b/files/build/versions/host-image/versions-deb-bullseye @@ -72,7 +72,7 @@ grub2-common==2.06-3~deb11u5 haveged==1.9.14-1 hdparm==9.60+ds-1 hping3==3.a2.ds2-10 -hw-management==1.mlnx.7.0020.4104 +hw-management==1.mlnx.7.0020.4301 i2c-tools==4.2-1+b1 ifmetric==0.3-5 ifupdown2==3.0.0-1 @@ -266,7 +266,7 @@ libsm6==2:1.2.3-1 libsqlite3-0==3.34.1-3 libssh2-1==1.9.0-2 libssl-dev==1.1.1n-0+deb11u4+fips -libssl1.1==1.1.1n-0+deb11u4+fips +libssl1.1==1.1.1n-0+deb11u5 libstdc++-10-dev==10.2.1-6 libswsscommon==1.0.0 libsysfs2==2.1.0+repack-7 @@ -326,13 +326,13 @@ ndisc6==1.0.4-2 net-tools==1.60+git20181103.0eebece-1 netbase==6.3 netfilter-persistent==1.0.15 -ntp==1:4.2.8p15+dfsg-1 +ntp==1:4.2.8p15+dfsg-1+deb10u2 ntpstat==0.0.0.1-2+b1 opennsl-modules==7.1.0.0 -openssh-client==1:8.4p1-5+deb11u1 -openssh-server==1:8.4p1-5+deb11u1 -openssh-sftp-server==1:8.4p1-5+deb11u1 -openssl==1.1.1n-0+deb11u4 +openssh-client==1:8.4p1-5+deb11u1+fips +openssh-server==1:8.4p1-5+deb11u1+fips +openssh-sftp-server==1:8.4p1-5+deb11u1+fips +openssl==1.1.1n-0+deb11u5 patch==2.7.6-7 pci.ids==0.0~2021.02.08-1 pciutils==1:3.7.0-5 diff --git a/files/build/versions/host-image/versions-deb-bullseye-arm64 b/files/build/versions/host-image/versions-deb-bullseye-arm64 index 236923f2aa22..f689d9d3d249 100644 --- a/files/build/versions/host-image/versions-deb-bullseye-arm64 +++ b/files/build/versions/host-image/versions-deb-bullseye-arm64 @@ -8,11 +8,6 @@ libxml2-dev==2.9.10+dfsg-6.7+deb11u4 libxslt1-dev==1.1.34-4+deb11u1 libxslt1.1==1.1.34-4+deb11u1 linux-image-5.10.0-18-2-arm64-unsigned==5.10.140-1 -ntp==1:4.2.8p15+dfsg-1+deb10u2 ntpstat==0.0.0.1-2 -openssh-client==1:8.4p1-5+deb11u1+fips -openssh-server==1:8.4p1-5+deb11u1+fips -openssh-sftp-server==1:8.4p1-5+deb11u1+fips -openssl==1.1.1n-0+deb11u4+fips picocom==3.1-2 tsingma-bsp==1.0 \ No newline at end of file diff --git a/files/build/versions/host-image/versions-deb-bullseye-armhf b/files/build/versions/host-image/versions-deb-bullseye-armhf index 1f446a146439..d4761480f25a 100644 --- a/files/build/versions/host-image/versions-deb-bullseye-armhf +++ b/files/build/versions/host-image/versions-deb-bullseye-armhf @@ -3,13 +3,15 @@ ebtables==2.0.11-4 icu-devtools==67.1-7 libicu-dev==67.1-7 libicu67==67.1-7 -libssl-dev==1.1.1n-0+deb11u4 +libssl-dev==1.1.1n-0+deb11u5 libxml2==2.9.10+dfsg-6.7+deb11u4 libxml2-dev==2.9.10+dfsg-6.7+deb11u4 libxslt1-dev==1.1.34-4+deb11u1 libxslt1.1==1.1.34-4+deb11u1 linux-image-5.10.0-18-2-armmp==5.10.140-1 mrvlprestera==1.0 -ntp==1:4.2.8p15+dfsg-1+deb10u2 ntpstat==0.0.0.1-2 +openssh-client==1:8.4p1-5+deb11u1 +openssh-server==1:8.4p1-5+deb11u1 +openssh-sftp-server==1:8.4p1-5+deb11u1 picocom==3.1-2 \ 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 f55b17dec953..b65586646fb0 100644 --- a/files/build/versions/host-image/versions-py3 +++ b/files/build/versions/host-image/versions-py3 @@ -10,7 +10,7 @@ charset-normalizer==3.1.0 click==7.0 click-log==0.4.0 colorful==0.5.5 -cryptography==40.0.2 +cryptography==41.0.1 dbus-python==1.2.16 docker==6.1.1 docker-image-py==0.1.12 @@ -31,7 +31,7 @@ jsonschema==2.6.0 lazy-object-proxy==1.9.0 lxml==4.9.1 m2crypto==0.38.0 -markupsafe==2.1.2 +markupsafe==2.1.3 natsort==6.2.1 netaddr==0.8.0 netifaces==0.11.0 @@ -56,7 +56,7 @@ python-apt==2.2.1 python-dateutil==2.8.2 pyyaml==5.4.1 redis==4.5.5 -regex==2023.5.5 +regex==2023.6.3 requests==2.31.0 scapy==2.4.4 semantic-version==2.10.0 From 77f28938237b9244a287ce5d9cf1e57863937298 Mon Sep 17 00:00:00 2001 From: mssonicbld <79238446+mssonicbld@users.noreply.github.com> Date: Wed, 7 Jun 2023 10:03:22 +0800 Subject: [PATCH 145/193] [submodule] Update submodule sonic-platform-daemons to the latest HEAD automatically (#15366) src/sonic-platform-daemons * 18815c7 - (HEAD -> 202205, origin/202205) Revert "[ycabled] refactor code for onboarding async client changes;refactor (#355)" (3 minutes ago) [Ying Xie] * 5324554 - Revert "add async notification support in active-active topo; refactor code for ycable tasks for change events (#327)" (3 minutes ago) [Ying Xie] * cbbe2b5 - Revert "[ycabled] fix bug for `show mux status` delayed response (#364)" (3 minutes ago) [Ying Xie] * 9746709 - Revert "[dualtor] Fix command `show mux status` (#371)" (3 minutes ago) [Ying Xie] * 551ab3c - Revert "[ycabled] correct the wrong function call for 'config hwmode state' (#372)" (3 minutes ago) [Ying Xie] --- 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 a90bff5b3c28..18815c72e605 160000 --- a/src/sonic-platform-daemons +++ b/src/sonic-platform-daemons @@ -1 +1 @@ -Subproject commit a90bff5b3c28d71198d32b9bd3f1ffa6f0d1b54a +Subproject commit 18815c72e60519bf5e7dc16b46a5e15c44be1455 From dfee3f369b6b6749c9237dad2c0ace1eb0dabeb1 Mon Sep 17 00:00:00 2001 From: mssonicbld <79238446+mssonicbld@users.noreply.github.com> Date: Wed, 7 Jun 2023 23:02:29 +0800 Subject: [PATCH 146/193] [submodule] Update submodule sonic-utilities to the latest HEAD automatically (#15367) src/sonic-utilities * 75ca81e4 - (HEAD -> 202205, origin/202205) [202205][config]Support multi-asic Golden Config override with fix (#2825) (#2862) (13 hours ago) [jingwenxie] --- src/sonic-utilities | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/sonic-utilities b/src/sonic-utilities index ec472146325d..75ca81e47c60 160000 --- a/src/sonic-utilities +++ b/src/sonic-utilities @@ -1 +1 @@ -Subproject commit ec472146325d7b5b922be0bbb205f0dc81f9c3f6 +Subproject commit 75ca81e47c60220af0dd3d00c0922507d68cce06 From dc6b6bb8f3169526a6a1d18df9f8bcbd78ae526f Mon Sep 17 00:00:00 2001 From: mssonicbld <79238446+mssonicbld@users.noreply.github.com> Date: Wed, 7 Jun 2023 23:03:18 +0800 Subject: [PATCH 147/193] [submodule] Update submodule sonic-telemetry to the latest HEAD automatically (#15373) src/sonic-telemetry * 5a83c07 - (HEAD -> 202205, origin/202205) Merge pull request #109 from zbud-msft/backport-202205 (86 minutes ago) [Ying Xie] * 0f75a64 - [202012] Workaround gomonkey for armhf (#88) (3 weeks ago) [Zain Budhwani] * 1b0dc75 - Fix Makefile error (3 weeks ago) [Zain Budhwani] * 72e4540 - Add diff cov (#85) (3 weeks ago) [Zain Budhwani] * 11aace5 - Add get-update to azp yml (#79) (3 weeks ago) [Zain Budhwani] * 3eaaccc - Add net core and code coverage results (#77) (3 weeks ago) [Zain Budhwani] * 3cf3883 - Enable unit test (3 weeks ago) [ganglyu] * 2a0928f - Change dir name in pipeline (#75) (4 weeks ago) [Zain Budhwani] * baa845a - Update yml (4 weeks ago) [Zain Budhwani] * c533d52 - Fix format (4 weeks ago) [ganglyu] --- src/sonic-telemetry | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/sonic-telemetry b/src/sonic-telemetry index 727aefd3de0f..5a83c07211db 160000 --- a/src/sonic-telemetry +++ b/src/sonic-telemetry @@ -1 +1 @@ -Subproject commit 727aefd3de0fb04feb020e10cbfd6788d0b93bf1 +Subproject commit 5a83c07211db6de5c82ab45ca6cc89f1857b5b20 From bd323a854cd902cd251efec76e5ed5685c52743e Mon Sep 17 00:00:00 2001 From: mssonicbld <79238446+mssonicbld@users.noreply.github.com> Date: Thu, 8 Jun 2023 00:50:07 +0800 Subject: [PATCH 148/193] [submodule] Update submodule sonic-platform-common to the latest HEAD automatically (#15372) src/sonic-platform-common * 4969f70 - (HEAD -> 202205, origin/202205) Skip CDB and VDM for flat memory modules (#281) (2 minutes ago) [Prince George] --- 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 f1f1dd357686..4969f70897fc 160000 --- a/src/sonic-platform-common +++ b/src/sonic-platform-common @@ -1 +1 @@ -Subproject commit f1f1dd35768665cc07e1f8059578d98d466f0cde +Subproject commit 4969f70897fc45d1e30ca6315508e03bf1805beb From ffd062afae33e308b75345697bc45e12cce50d5c Mon Sep 17 00:00:00 2001 From: mssonicbld <79238446+mssonicbld@users.noreply.github.com> Date: Thu, 8 Jun 2023 03:40:23 +0800 Subject: [PATCH 149/193] updated internal route policy for chassis-packet (#15349) (#15378) --- .../bgpd/templates/internal/instance.conf.j2 | 6 ++--- .../instance.conf/chassis_packet_v4.conf | 15 ++++++++++++ .../instance.conf/chassis_packet_v4.json | 23 +++++++++++++++++++ .../instance.conf/chassis_packet_v6.conf | 15 ++++++++++++ .../instance.conf/chassis_packet_v6.json | 23 +++++++++++++++++++ .../instance.conf/result_back_v4.conf | 1 - .../instance.conf/result_back_v6.conf | 1 - 7 files changed, 78 insertions(+), 6 deletions(-) create mode 100644 src/sonic-bgpcfgd/tests/data/internal/instance.conf/chassis_packet_v4.conf create mode 100644 src/sonic-bgpcfgd/tests/data/internal/instance.conf/chassis_packet_v4.json create mode 100644 src/sonic-bgpcfgd/tests/data/internal/instance.conf/chassis_packet_v6.conf create mode 100644 src/sonic-bgpcfgd/tests/data/internal/instance.conf/chassis_packet_v6.json 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 44c70f49bd67..06eabb5fc7cc 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 @@ -10,18 +10,16 @@ address-family ipv4 neighbor {{ neighbor_addr }} peer-group INTERNAL_PEER_V4 ! -{% if CONFIG_DB__DEVICE_METADATA['localhost']['sub_role'] == 'BackEnd' %} +{% if CONFIG_DB__DEVICE_METADATA['localhost']['sub_role'] == 'BackEnd' or CONFIG_DB__DEVICE_METADATA['localhost']['switch_type'] == 'chassis-packet' %} neighbor {{ neighbor_addr }} next-hop-self force - neighbor {{ neighbor_addr }} route-map FROM_BGP_INTERNAL_PEER_V4 in {% endif %} ! {% elif neighbor_addr | ipv6 %} address-family ipv6 neighbor {{ neighbor_addr }} peer-group INTERNAL_PEER_V6 ! -{% if CONFIG_DB__DEVICE_METADATA['localhost']['sub_role'] == 'BackEnd' %} +{% if CONFIG_DB__DEVICE_METADATA['localhost']['sub_role'] == 'BackEnd' or CONFIG_DB__DEVICE_METADATA['localhost']['switch_type'] == 'chassis-packet' %} neighbor {{ neighbor_addr }} next-hop-self force - neighbor {{ neighbor_addr }} route-map FROM_BGP_INTERNAL_PEER_V6 in {% endif %} {% endif %} ! diff --git a/src/sonic-bgpcfgd/tests/data/internal/instance.conf/chassis_packet_v4.conf b/src/sonic-bgpcfgd/tests/data/internal/instance.conf/chassis_packet_v4.conf new file mode 100644 index 000000000000..f848ebd457d4 --- /dev/null +++ b/src/sonic-bgpcfgd/tests/data/internal/instance.conf/chassis_packet_v4.conf @@ -0,0 +1,15 @@ +! +! template: bgpd/templates/internal/instance.conf.j2 +! + 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 + neighbor 10.10.10.10 activate + exit-address-family +! +! end of template: bgpd/templates/internal/instance.conf.j2 +! diff --git a/src/sonic-bgpcfgd/tests/data/internal/instance.conf/chassis_packet_v4.json b/src/sonic-bgpcfgd/tests/data/internal/instance.conf/chassis_packet_v4.json new file mode 100644 index 000000000000..41f4aab4f8af --- /dev/null +++ b/src/sonic-bgpcfgd/tests/data/internal/instance.conf/chassis_packet_v4.json @@ -0,0 +1,23 @@ +{ + "CONFIG_DB__DEVICE_METADATA": { + "localhost": { + "sub_role": "FrontEnd", + "type": "SpineRouter", + "switch_type": "chassis-packet" + } + }, + "neighbor_addr": "10.10.10.10", + "bgp_session": { + "asn": "555", + "name": "remote_peer", + "keepalive": "5", + "holdtime": "30", + "admin_status": "down", + "ASIC": "something" + }, + "constants": { + "deployment_id_asn_map": { + "5": "51111" + } + } +} diff --git a/src/sonic-bgpcfgd/tests/data/internal/instance.conf/chassis_packet_v6.conf b/src/sonic-bgpcfgd/tests/data/internal/instance.conf/chassis_packet_v6.conf new file mode 100644 index 000000000000..09c021b9195b --- /dev/null +++ b/src/sonic-bgpcfgd/tests/data/internal/instance.conf/chassis_packet_v6.conf @@ -0,0 +1,15 @@ +! +! template: bgpd/templates/internal/instance.conf.j2 +! + 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 + neighbor fc::10 activate + exit-address-family +! +! end of template: bgpd/templates/internal/instance.conf.j2 +! diff --git a/src/sonic-bgpcfgd/tests/data/internal/instance.conf/chassis_packet_v6.json b/src/sonic-bgpcfgd/tests/data/internal/instance.conf/chassis_packet_v6.json new file mode 100644 index 000000000000..eb25b37c3206 --- /dev/null +++ b/src/sonic-bgpcfgd/tests/data/internal/instance.conf/chassis_packet_v6.json @@ -0,0 +1,23 @@ +{ + "CONFIG_DB__DEVICE_METADATA": { + "localhost": { + "sub_role": "FrontEnd", + "type": "SpineRouter", + "switch_type": "chassis-packet" + } + }, + "neighbor_addr": "fc::10", + "bgp_session": { + "asn": "555", + "name": "remote_peer", + "keepalive": "5", + "holdtime": "30", + "admin_status": "down", + "ASIC": "something" + }, + "constants": { + "deployment_id_asn_map": { + "5": "51111" + } + } +} 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 43fdc12921bc..90e0e1315831 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 @@ -8,7 +8,6 @@ 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 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 811f7b808478..75f8fd0d136f 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 @@ -8,7 +8,6 @@ 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 activate exit-address-family From af47583c798e2c9095ea289ddd5a36fa2dbaf4cd Mon Sep 17 00:00:00 2001 From: mssonicbld <79238446+mssonicbld@users.noreply.github.com> Date: Thu, 8 Jun 2023 05:34:02 +0800 Subject: [PATCH 150/193] Added change to add 'peerType' as element in NEIGH_STATE_TABLE. (#15265) (#15381) --- src/sonic-bgpcfgd/bgpmon/bgpmon.py | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/src/sonic-bgpcfgd/bgpmon/bgpmon.py b/src/sonic-bgpcfgd/bgpmon/bgpmon.py index 2b50bd6cf58d..d6c2277684bd 100755 --- a/src/sonic-bgpcfgd/bgpmon/bgpmon.py +++ b/src/sonic-bgpcfgd/bgpmon/bgpmon.py @@ -6,7 +6,8 @@ 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 + assisting is for the CiscoBgp4MIB (Neighbor state only). Also for chassis use-case + it identify if the given BGP neighbors as i-BGP vs e-BGP. If there are other BGP related items that needs to be updated in a periodic manner in the future, then more can be added into this process. @@ -69,7 +70,9 @@ def update_new_peer_states(self, peer_dict): peer_l = peer_dict["peers"].keys() self.new_peer_l.update(peer_l) for peer in peer_l: - self.new_peer_state[peer] = peer_dict["peers"][peer]["state"] + self.new_peer_state[peer] = (peer_dict["peers"][peer]["state"], + peer_dict["peers"][peer]["remoteAs"], + peer_dict["peers"][peer]["localAs"]) # Get a new snapshot of BGP neighbors and store them in the "new" location def get_all_neigh_states(self): @@ -119,17 +122,19 @@ def update_neigh_states(self): key = "NEIGH_STATE_TABLE|%s" % peer if peer in self.peer_l: # only update the entry if state changed - if self.peer_state[peer] != self.new_peer_state[peer]: + if self.peer_state[peer] != self.new_peer_state[peer][0]: # state changed. Update state DB for this entry - state = self.new_peer_state[peer] - data[key] = {'state':state} + state = self.new_peer_state[peer][0] + peerType = "i-BGP" if self.new_peer_state[peer][1] == self.new_peer_state[peer][2] else "e-BGP" + data[key] = {'state':state, 'peerType':peerType} self.peer_state[peer] = state # 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 - state = self.new_peer_state[peer] - data[key] = {'state':state} + state = self.new_peer_state[peer][0] + peerType = "i-BGP" if self.new_peer_state[peer][1] == self.new_peer_state[peer][2] else "e-BGP" + data[key] = {'state':state, 'peerType':peerType} self.peer_state[peer] = state if len(data) > PIPE_BATCH_MAX_COUNT: self.flush_pipe(data) From 2e15db02f24600b79c0fbc067674ed6b817c340e Mon Sep 17 00:00:00 2001 From: Arvindsrinivasan Lakshmi Narasimhan <55814491+arlakshm@users.noreply.github.com> Date: Thu, 8 Jun 2023 11:08:48 -0700 Subject: [PATCH 151/193] set the default value for the port fec to RS on J2 based LC (#15346) Why I did it Work item tracking Microsoft ADO (24182162): How I did it update the config.bcm to set the default fec RS 100G Linecard How to verify it Tests on chassis --- .../jr2-a7280cr3-32d4-40x100G.config.bcm | 49 +++++++++++++++++++ 1 file changed, 49 insertions(+) diff --git a/device/arista/x86_64-arista_7800r3_48cq2_lc/Arista-7800R3-48CQ2-C48/jr2-a7280cr3-32d4-40x100G.config.bcm b/device/arista/x86_64-arista_7800r3_48cq2_lc/Arista-7800R3-48CQ2-C48/jr2-a7280cr3-32d4-40x100G.config.bcm index e9ffad64773c..38b9778c1b46 100644 --- a/device/arista/x86_64-arista_7800r3_48cq2_lc/Arista-7800R3-48CQ2-C48/jr2-a7280cr3-32d4-40x100G.config.bcm +++ b/device/arista/x86_64-arista_7800r3_48cq2_lc/Arista-7800R3-48CQ2-C48/jr2-a7280cr3-32d4-40x100G.config.bcm @@ -748,6 +748,55 @@ dtm_flow_nof_remote_cores_region_58.BCM8869X=2 dtm_flow_nof_remote_cores_region_59.BCM8869X=2 dtm_flow_nof_remote_cores_region_60.BCM8869X=2 +port_fec_1.BCM8869X=3 +port_fec_2.BCM8869X=3 +port_fec_3.BCM8869X=3 +port_fec_4.BCM8869X=3 +port_fec_5.BCM8869X=3 +port_fec_6.BCM8869X=3 +port_fec_7.BCM8869X=3 +port_fec_8.BCM8869X=3 +port_fec_9.BCM8869X=3 +port_fec_10.BCM8869X=3 +port_fec_11.BCM8869X=3 +port_fec_12.BCM8869X=3 +port_fec_13.BCM8869X=3 +port_fec_14.BCM8869X=3 +port_fec_15.BCM8869X=3 +port_fec_16.BCM8869X=3 +port_fec_17.BCM8869X=3 +port_fec_18.BCM8869X=3 +port_fec_19.BCM8869X=3 +port_fec_20.BCM8869X=3 +port_fec_21.BCM8869X=3 +port_fec_22.BCM8869X=3 +port_fec_23.BCM8869X=3 +port_fec_24.BCM8869X=3 +port_fec_25.BCM8869X=3 +port_fec_26.BCM8869X=3 +port_fec_27.BCM8869X=3 +port_fec_28.BCM8869X=3 +port_fec_29.BCM8869X=3 +port_fec_30.BCM8869X=3 +port_fec_31.BCM8869X=3 +port_fec_32.BCM8869X=3 +port_fec_33.BCM8869X=3 +port_fec_34.BCM8869X=3 +port_fec_35.BCM8869X=3 +port_fec_36.BCM8869X=3 +port_fec_37.BCM8869X=3 +port_fec_38.BCM8869X=3 +port_fec_39.BCM8869X=3 +port_fec_40.BCM8869X=3 +port_fec_41.BCM8869X=3 +port_fec_42.BCM8869X=3 +port_fec_43.BCM8869X=3 +port_fec_44.BCM8869X=3 +port_fec_45.BCM8869X=3 +port_fec_46.BCM8869X=3 +port_fec_47.BCM8869X=3 +port_fec_48.BCM8869X=3 + mdb_profile.BCM8869X=l3-xl outlif_logical_to_physical_phase_map_1=S1 From e9c6e0500d413ad0b1522276de14280757f81a5e Mon Sep 17 00:00:00 2001 From: mssonicbld <79238446+mssonicbld@users.noreply.github.com> Date: Tue, 13 Jun 2023 04:22:51 +0800 Subject: [PATCH 152/193] [submodule] Update submodule sonic-swss to the latest HEAD automatically (#15387) src/sonic-swss * 2aec547 - (HEAD -> 202205, origin/202205) [pfcwd] Enhance DLR_INIT based recovery and DLR_PACKET_ACTION for broadcom platforms (#2807) (4 days ago) [Neetha John] * fa4acd3 - Fix to substract the macsec sectag size from port MTU during InitializePort (#2789) (5 days ago) [judyjoseph] --- src/sonic-swss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/sonic-swss b/src/sonic-swss index c78152153b3d..2aec5479d093 160000 --- a/src/sonic-swss +++ b/src/sonic-swss @@ -1 +1 @@ -Subproject commit c78152153b3da6536947f2ea1c1348d08c404d46 +Subproject commit 2aec5479d093080d14c97de99a49e0fee1e08a10 From 43920be7afa718f357ec817671a85c6f0a2ce81f Mon Sep 17 00:00:00 2001 From: mssonicbld <79238446+mssonicbld@users.noreply.github.com> Date: Tue, 13 Jun 2023 04:24:43 +0800 Subject: [PATCH 153/193] [submodule] Update submodule sonic-platform-daemons to the latest HEAD automatically (#15386) src/sonic-platform-daemons * 59d9556 - (HEAD -> 202205, origin/202205) Add serial field to chassis module table (#363) (4 days ago) [amulyan7] --- 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 18815c72e605..59d9556b68b3 160000 --- a/src/sonic-platform-daemons +++ b/src/sonic-platform-daemons @@ -1 +1 @@ -Subproject commit 18815c72e60519bf5e7dc16b46a5e15c44be1455 +Subproject commit 59d9556b68b3da3a2c27e454960dc80b6f7cb495 From 5168dc63468ea3ee5589da59326bbfd79bd7c6b9 Mon Sep 17 00:00:00 2001 From: mssonicbld <79238446+mssonicbld@users.noreply.github.com> Date: Tue, 13 Jun 2023 04:25:11 +0800 Subject: [PATCH 154/193] [submodule] Update submodule sonic-utilities to the latest HEAD automatically (#15388) src/sonic-utilities * 0b878087 - (HEAD -> 202205, origin/202205) Add display support for serial field in show chassis modules status CLI (#2858) (4 days ago) [amulyan7] --- src/sonic-utilities | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/sonic-utilities b/src/sonic-utilities index 75ca81e47c60..0b878087fb6f 160000 --- a/src/sonic-utilities +++ b/src/sonic-utilities @@ -1 +1 @@ -Subproject commit 75ca81e47c60220af0dd3d00c0922507d68cce06 +Subproject commit 0b878087fb6f3cc770ea97f1c9370cd1a7bbbbee From 0560c23d452239a136234173f9babaa6ee643bee Mon Sep 17 00:00:00 2001 From: mssonicbld <79238446+mssonicbld@users.noreply.github.com> Date: Tue, 13 Jun 2023 04:25:52 +0800 Subject: [PATCH 155/193] [submodule] Update submodule sonic-telemetry to the latest HEAD automatically (#15421) src/sonic-telemetry * 19ca64a - (HEAD -> 202205, origin/202205) Merge pull request #116 from zbud-msft/fix_azp_202205 (2 days ago) [Ying Xie] * 810ee03 - Update .netcore pkg (3 days ago) [zbud-msft] * 5bfcb7d - Fix azp file (3 days ago) [zbud-msft] --- src/sonic-telemetry | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/sonic-telemetry b/src/sonic-telemetry index 5a83c07211db..19ca64a66863 160000 --- a/src/sonic-telemetry +++ b/src/sonic-telemetry @@ -1 +1 @@ -Subproject commit 5a83c07211db6de5c82ab45ca6cc89f1857b5b20 +Subproject commit 19ca64a66863f9b01346b90c589a0bd64bcc992e From 88820b14f2dc4eddd19c069aa18d36e979aac569 Mon Sep 17 00:00:00 2001 From: Samuel Angebault Date: Mon, 12 Jun 2023 13:26:46 -0700 Subject: [PATCH 156/193] [202205][Arista] Update platform library submodules (#15406) fix pcied leak on chassis fix fan status led setting on fixed systems misc fixes --- 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 818cebb5c93d..cca827843c05 160000 --- a/platform/barefoot/sonic-platform-modules-arista +++ b/platform/barefoot/sonic-platform-modules-arista @@ -1 +1 @@ -Subproject commit 818cebb5c93d88e8b4d504e18a5f1198ca974153 +Subproject commit cca827843c0528347b996aedd5790558c5d6a656 diff --git a/platform/broadcom/sonic-platform-modules-arista b/platform/broadcom/sonic-platform-modules-arista index 818cebb5c93d..cca827843c05 160000 --- a/platform/broadcom/sonic-platform-modules-arista +++ b/platform/broadcom/sonic-platform-modules-arista @@ -1 +1 @@ -Subproject commit 818cebb5c93d88e8b4d504e18a5f1198ca974153 +Subproject commit cca827843c0528347b996aedd5790558c5d6a656 From 47e7c4bdabf19c8dc5a1f8e750142147056fcc49 Mon Sep 17 00:00:00 2001 From: James An <94036556+jamesan47@users.noreply.github.com> Date: Mon, 12 Jun 2023 13:27:24 -0700 Subject: [PATCH 157/193] Update cisco-8000.ini (#15408) Why I did it Release Notes for Cisco 8102-64H-O: T0 / DualTor - Pre-GA How I did it Update platform version to 202205.2.2.4 --- 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 08ced69bd2c2..8089ddd8016a 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=202205.2.2.3 +ref=202205.2.2.4 From 462298070ec247061754bb94237d55ca7d92a33e Mon Sep 17 00:00:00 2001 From: mssonicbld <79238446+mssonicbld@users.noreply.github.com> Date: Wed, 14 Jun 2023 09:34:36 +0800 Subject: [PATCH 158/193] [submodule] Update submodule sonic-platform-daemons to the latest HEAD automatically (#15443) src/sonic-platform-daemons * 1d04977 - (HEAD -> 202205, origin/202205) [xcvrd] Reduce vendor_key to vendor_name for media_settings lookup (#366) (7 hours ago) [Aman Singhal] --- 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 59d9556b68b3..1d04977a61e6 160000 --- a/src/sonic-platform-daemons +++ b/src/sonic-platform-daemons @@ -1 +1 @@ -Subproject commit 59d9556b68b3da3a2c27e454960dc80b6f7cb495 +Subproject commit 1d04977a61e6551899c171142521bf7537632d56 From 9e16a7a452cd5d467080324dd2997687c794c65d Mon Sep 17 00:00:00 2001 From: Saikrishna Arcot Date: Wed, 14 Jun 2023 16:28:57 -0700 Subject: [PATCH 159/193] Re-add 127.0.0.1/8 when bringing down the interfaces (#15080) (#15462) * Re-add 127.0.0.1/8 when bringing down the interfaces With #5353, 127.0.0.1/16 was added to the lo interface, and then 127.0.0.1/8 was removed. However, when bringing down the lo interface, like during a config reload, 127.0.0.1/16 gets removed, but 127.0.0.1/8 isn't added back to the interface. This means that there's a period of time where 127.0.0.1 is not available at all, and services that need to connect to 127.0.01 (such as for redis DB) will fail. To fix this, when going down, add 127.0.0.1/8. Add this address before the existing configuration gets removed, so that 127.0.0.1 is available at all times. Note that running `ifdown lo` doesn't actually bring down the loopback interface; the interface always stays "physically" up. Signed-off-by: Saikrishna Arcot --- files/image_config/interfaces/interfaces.j2 | 1 + src/sonic-config-engine/tests/sample_output/py2/interfaces | 1 + src/sonic-config-engine/tests/sample_output/py2/mvrf_interfaces | 1 + src/sonic-config-engine/tests/sample_output/py3/interfaces | 1 + src/sonic-config-engine/tests/sample_output/py3/mvrf_interfaces | 1 + 5 files changed, 5 insertions(+) diff --git a/files/image_config/interfaces/interfaces.j2 b/files/image_config/interfaces/interfaces.j2 index 1e554e4ed716..773cb749e6fc 100644 --- a/files/image_config/interfaces/interfaces.j2 +++ b/files/image_config/interfaces/interfaces.j2 @@ -26,6 +26,7 @@ iface lo inet loopback netmask 255.255.0.0 scope host post-up ip addr del 127.0.0.1/8 dev lo + down ip addr add 127.0.0.1/8 dev lo {% endblock loopback %} {% block mgmt_interface %} diff --git a/src/sonic-config-engine/tests/sample_output/py2/interfaces b/src/sonic-config-engine/tests/sample_output/py2/interfaces index 360ecf7b13de..a47c89258e34 100644 --- a/src/sonic-config-engine/tests/sample_output/py2/interfaces +++ b/src/sonic-config-engine/tests/sample_output/py2/interfaces @@ -10,6 +10,7 @@ iface lo inet loopback netmask 255.255.0.0 scope host post-up ip addr del 127.0.0.1/8 dev lo + down ip addr add 127.0.0.1/8 dev lo # The management network interface auto eth0 diff --git a/src/sonic-config-engine/tests/sample_output/py2/mvrf_interfaces b/src/sonic-config-engine/tests/sample_output/py2/mvrf_interfaces index 6143d7ba8c4b..5777bce1837c 100644 --- a/src/sonic-config-engine/tests/sample_output/py2/mvrf_interfaces +++ b/src/sonic-config-engine/tests/sample_output/py2/mvrf_interfaces @@ -19,6 +19,7 @@ iface lo inet loopback netmask 255.255.0.0 scope host post-up ip addr del 127.0.0.1/8 dev lo + down ip addr add 127.0.0.1/8 dev lo # The management network interface auto eth0 diff --git a/src/sonic-config-engine/tests/sample_output/py3/interfaces b/src/sonic-config-engine/tests/sample_output/py3/interfaces index 360ecf7b13de..a47c89258e34 100644 --- a/src/sonic-config-engine/tests/sample_output/py3/interfaces +++ b/src/sonic-config-engine/tests/sample_output/py3/interfaces @@ -10,6 +10,7 @@ iface lo inet loopback netmask 255.255.0.0 scope host post-up ip addr del 127.0.0.1/8 dev lo + down ip addr add 127.0.0.1/8 dev lo # The management network interface auto eth0 diff --git a/src/sonic-config-engine/tests/sample_output/py3/mvrf_interfaces b/src/sonic-config-engine/tests/sample_output/py3/mvrf_interfaces index 6143d7ba8c4b..5777bce1837c 100644 --- a/src/sonic-config-engine/tests/sample_output/py3/mvrf_interfaces +++ b/src/sonic-config-engine/tests/sample_output/py3/mvrf_interfaces @@ -19,6 +19,7 @@ iface lo inet loopback netmask 255.255.0.0 scope host post-up ip addr del 127.0.0.1/8 dev lo + down ip addr add 127.0.0.1/8 dev lo # The management network interface auto eth0 From 40ef03e70beb32784b04e24eca6546291b616597 Mon Sep 17 00:00:00 2001 From: Liping Xu <108326363+lipxu@users.noreply.github.com> Date: Sat, 10 Jun 2023 14:19:44 +0800 Subject: [PATCH 160/193] allow docker_inram to kernel cmd list (#15374) Why I did it After docker_inram is enabled, the docker folder's default max size is 1.5G. It's not big enough for some tests which need to install additional docker images or install extra packages. Work item tracking Microsoft ADO 24199761: How I did it add docker_inram into cmdline_allowlist How to verify it sudo sh -c 'echo "docker_inram_size=3000M" >> kernel-cmdline-append' sudo reboot and check the docker folder size --- files/Aboot/boot0.j2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/files/Aboot/boot0.j2 b/files/Aboot/boot0.j2 index b89acde3265e..b00ff199e13c 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 hwaddr_ma1 sonic_fips" +cmdline_allowlist="crashkernel hwaddr_ma1 sonic_fips docker_inram" # for backward compatibility with the sonic_upgrade= behavior install="${install:-${sonic_upgrade:-}}" From a1ee45d7d6b48f179c26726e23bcd632eaeeb39f Mon Sep 17 00:00:00 2001 From: James An <94036556+jamesan47@users.noreply.github.com> Date: Thu, 15 Jun 2023 10:27:03 -0700 Subject: [PATCH 161/193] Update cisco-8000.ini (#15465) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Why I did it Release Notes for Cisco 8101-32FH-O: • Fixed a FEC lane related error message • Implemented 'show platform npu mac-state -i ' CLI for NPU MAC information and save-state dump. • Fixed a Mac Port SerDes credit mismatch error message • Configurable drop counter support for SAI_DEBUG_COUNTER_ATTR_TYPE (MIGSMSFT-197) • Removed eth1-midplane creation rule that is not needed for this platform. • Fix to move control packets from queue 0 to queue 7 How I did it Update platform version to 202205.2.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 8089ddd8016a..19ddab92411a 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=202205.2.2.4 +ref=202205.2.2.5 From 77d42df16037ce62b19c693e2ce6c8b030772bba Mon Sep 17 00:00:00 2001 From: mssonicbld <79238446+mssonicbld@users.noreply.github.com> Date: Fri, 16 Jun 2023 01:27:40 +0800 Subject: [PATCH 162/193] [submodule] Update submodule sonic-utilities to the latest HEAD automatically (#15455) src/sonic-utilities * 24d0d1cb - (HEAD -> 202205, origin/202205) Update portstat (#2877) (26 hours ago) [wenyiz2021] --- src/sonic-utilities | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/sonic-utilities b/src/sonic-utilities index 0b878087fb6f..24d0d1cbd1a0 160000 --- a/src/sonic-utilities +++ b/src/sonic-utilities @@ -1 +1 @@ -Subproject commit 0b878087fb6f3cc770ea97f1c9370cd1a7bbbbee +Subproject commit 24d0d1cbd1a000ecf240464eb52c27296ace16ba From 7ce21a6db5871cae38578250949c69897c15b5eb Mon Sep 17 00:00:00 2001 From: mssonicbld <79238446+mssonicbld@users.noreply.github.com> Date: Fri, 16 Jun 2023 03:41:30 +0800 Subject: [PATCH 163/193] [healthd] Use unix_socket_path instead of loopback ip (#14843) (#15480) --- .../health_checker/hardware_checker.py | 2 +- .../health_checker/service_checker.py | 2 +- src/system-health/health_checker/sysmonitor.py | 16 ++++++++-------- src/system-health/scripts/healthd | 2 +- src/system-health/tests/mock_connector.py | 2 +- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/system-health/health_checker/hardware_checker.py b/src/system-health/health_checker/hardware_checker.py index 575564de8733..2bc9b5d9d108 100644 --- a/src/system-health/health_checker/hardware_checker.py +++ b/src/system-health/health_checker/hardware_checker.py @@ -15,7 +15,7 @@ class HardwareChecker(HealthChecker): def __init__(self): HealthChecker.__init__(self) - self._db = SonicV2Connector(host="127.0.0.1") + self._db = SonicV2Connector(use_unix_socket_path=True) self._db.connect(self._db.STATE_DB) def get_category(self): diff --git a/src/system-health/health_checker/service_checker.py b/src/system-health/health_checker/service_checker.py index 8de86e245bd2..0c6bba50b2ca 100644 --- a/src/system-health/health_checker/service_checker.py +++ b/src/system-health/health_checker/service_checker.py @@ -265,7 +265,7 @@ def check_services(self, config): config (config.Config): Health checker configuration. """ if not self.config_db: - self.config_db = swsscommon.ConfigDBConnector() + self.config_db = swsscommon.ConfigDBConnector(use_unix_socket_path=True) 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) diff --git a/src/system-health/health_checker/sysmonitor.py b/src/system-health/health_checker/sysmonitor.py index 1357693c108a..8979327eaf91 100755 --- a/src/system-health/health_checker/sysmonitor.py +++ b/src/system-health/health_checker/sysmonitor.py @@ -31,7 +31,7 @@ def __init__(self,myQ): self.task_queue = myQ def subscribe_statedb(self): - state_db = swsscommon.DBConnector("STATE_DB", REDIS_TIMEOUT_MS, True) + state_db = swsscommon.DBConnector("STATE_DB", REDIS_TIMEOUT_MS, False) sel = swsscommon.Select() cst = swsscommon.SubscriberStateTable(state_db, "FEATURE") sel.addSelectable(cst) @@ -122,7 +122,7 @@ def __init__(self): def post_system_status(self, state): try: if not self.state_db: - self.state_db = swsscommon.SonicV2Connector(host='127.0.0.1') + self.state_db = swsscommon.SonicV2Connector(use_unix_socket_path=True) self.state_db.connect(self.state_db.STATE_DB) self.state_db.set(self.state_db.STATE_DB, "SYSTEM_READY|SYSTEM_STATE", "Status", state) @@ -135,7 +135,7 @@ def post_system_status(self, state): def get_all_service_list(self): if not self.config_db: - self.config_db = swsscommon.ConfigDBConnector() + self.config_db = swsscommon.ConfigDBConnector(use_unix_socket_path=True) self.config_db.connect() dir_list = [] @@ -197,10 +197,10 @@ def get_service_from_feature_table(self, dir_list): #else, just return Up def get_app_ready_status(self, service): if not self.state_db: - self.state_db = swsscommon.SonicV2Connector(host='127.0.0.1') + self.state_db = swsscommon.SonicV2Connector(use_unix_socket_path=True) self.state_db.connect(self.state_db.STATE_DB) if not self.config_db: - self.config_db = swsscommon.ConfigDBConnector() + self.config_db = swsscommon.ConfigDBConnector(use_unix_socket_path=True) self.config_db.connect() fail_reason = "" @@ -248,7 +248,7 @@ def run_systemctl_show(self, service): #Sets the service status to state db def post_unit_status(self, srv_name, srv_status, app_status, fail_reason, update_time): if not self.state_db: - self.state_db = swsscommon.SonicV2Connector(host='127.0.0.1') + self.state_db = swsscommon.SonicV2Connector(use_unix_socket_path=True) self.state_db.connect(self.state_db.STATE_DB) key = 'ALL_SERVICE_STATUS|{}'.format(srv_name) @@ -378,7 +378,7 @@ def update_system_status(self): def check_unit_status(self, event): #global dnsrvs_name if not self.state_db: - self.state_db = swsscommon.SonicV2Connector(host='127.0.0.1') + self.state_db = swsscommon.SonicV2Connector(use_unix_socket_path=True) self.state_db.connect(self.state_db.STATE_DB) astate = "DOWN" @@ -419,7 +419,7 @@ def check_unit_status(self, event): def system_service(self): if not self.state_db: - self.state_db = swsscommon.SonicV2Connector(host='127.0.0.1') + self.state_db = swsscommon.SonicV2Connector(use_unix_socket_path=True) self.state_db.connect(self.state_db.STATE_DB) mpmgr = multiprocessing.Manager() diff --git a/src/system-health/scripts/healthd b/src/system-health/scripts/healthd index cb404de29ee1..28bffeb7129b 100644 --- a/src/system-health/scripts/healthd +++ b/src/system-health/scripts/healthd @@ -31,7 +31,7 @@ class HealthDaemon(DaemonBase): Constructor of HealthDaemon. """ DaemonBase.__init__(self, SYSLOG_IDENTIFIER) - self._db = SonicV2Connector(host="127.0.0.1") + self._db = SonicV2Connector(use_unix_socket_path=True) self._db.connect(self._db.STATE_DB) self.stop_event = threading.Event() diff --git a/src/system-health/tests/mock_connector.py b/src/system-health/tests/mock_connector.py index d602c8eaf165..76ed01d2b9b8 100644 --- a/src/system-health/tests/mock_connector.py +++ b/src/system-health/tests/mock_connector.py @@ -2,7 +2,7 @@ class MockConnector(object): STATE_DB = None data = {} - def __init__(self, host): + def __init__(self, use_unix_socket_path): pass def connect(self, db_id): From 913f466cbb1c294c0d2e1f584da1107f4d161c76 Mon Sep 17 00:00:00 2001 From: mssonicbld <79238446+mssonicbld@users.noreply.github.com> Date: Fri, 16 Jun 2023 03:48:52 +0800 Subject: [PATCH 164/193] [ci] Add OVERRIDE_BUILD_OPTIONS in image build template. (#15309) (#15481) --- .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 1311ab0608c9..0b480638cd9c 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 c4fcd31fa6ad886e86912963e05f147fa38c6bfb Mon Sep 17 00:00:00 2001 From: mssonicbld <79238446+mssonicbld@users.noreply.github.com> Date: Fri, 16 Jun 2023 03:52:17 +0800 Subject: [PATCH 165/193] enable ethernet backplane port support in port config for packet mode T2 devices (#14533) (#15479) --- files/build_templates/buffers_config.j2 | 7 +++++++ files/build_templates/qos_config.j2 | 8 ++++++++ 2 files changed, 15 insertions(+) diff --git a/files/build_templates/buffers_config.j2 b/files/build_templates/buffers_config.j2 index d6063312e0e8..b442f4d8bd67 100644 --- a/files/build_templates/buffers_config.j2 +++ b/files/build_templates/buffers_config.j2 @@ -112,6 +112,7 @@ def {%- endmacro %} {%- set PORT_ALL = [] %} +{%- set PORT_BP = [] %} {%- set SYSTEM_PORT_ALL = [] %} {%- if voq_chassis %} @@ -136,6 +137,9 @@ def {%- if PORT_ALL.append(port) %}{%- endif %} {%- endif %} {%- endfor %} + {%- if defs.generate_bp_port_list is defined %} + {%- if defs.generate_bp_port_list(PORT,PORT_BP) %} {% endif %} + {%- endif %} {%- endif %} {%- set PORT_ACTIVE = [] %} @@ -146,6 +150,9 @@ def {%- for port in DEVICE_NEIGHBOR.keys() %} {%- if PORT_ACTIVE.append(port) %}{%- endif %} {%- endfor %} + {%- for port in PORT_BP %} + {%- 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 %} diff --git a/files/build_templates/qos_config.j2 b/files/build_templates/qos_config.j2 index 4695b51459cc..f9900714d829 100644 --- a/files/build_templates/qos_config.j2 +++ b/files/build_templates/qos_config.j2 @@ -1,9 +1,14 @@ {%- set PORT_ALL = [] %} +{%- set PORT_BP = [] %} {%- for port in PORT %} {%- if not port.startswith('Ethernet-Rec') and not port.startswith('Ethernet-IB') %} {%- if PORT_ALL.append(port) %}{% endif %} {%- endif %} {%- endfor %} +{%- if generate_bp_port_list is defined %} + {%- if generate_bp_port_list(PORT,PORT_BP) %} {% endif %} +{%- endif %} + {%- if PORT_ALL | sort_by_port_index %}{% endif %} {%- set port_names_list_all = [] %} @@ -20,6 +25,9 @@ {%- for port in DEVICE_NEIGHBOR.keys() %} {%- if PORT_ACTIVE.append(port) %}{%- endif %} {%- endfor %} + {%- for port in PORT_BP %} + {%- if PORT_ACTIVE.append(port) %}{%- endif %} + {%- endfor %} {%- endif %} {%- if PORT_ACTIVE | sort_by_port_index %}{% endif %} From 821c883ef4175e3385227787c6940e8abb489267 Mon Sep 17 00:00:00 2001 From: mssonicbld <79238446+mssonicbld@users.noreply.github.com> Date: Fri, 16 Jun 2023 03:58:05 +0800 Subject: [PATCH 166/193] [yang] Change asn to start from 0 for bgp monitor (#15350) (#15482) --- src/sonic-yang-models/tests/files/sample_config_db.json | 2 +- src/sonic-yang-models/yang-models/sonic-bgp-common.yang | 2 +- .../yang-models/sonic-bgp-internal-neighbor.yang | 3 +++ src/sonic-yang-models/yang-models/sonic-bgp-neighbor.yang | 8 +++++++- .../yang-models/sonic-bgp-voq-chassis-neighbor.yang | 3 +++ 5 files changed, 15 insertions(+), 3 deletions(-) diff --git a/src/sonic-yang-models/tests/files/sample_config_db.json b/src/sonic-yang-models/tests/files/sample_config_db.json index 1c14152fd8ef..f35d197019c3 100644 --- a/src/sonic-yang-models/tests/files/sample_config_db.json +++ b/src/sonic-yang-models/tests/files/sample_config_db.json @@ -1351,7 +1351,7 @@ "BGP_MONITORS": { "5.6.7.8": { "admin_status": "up", - "asn": "65000", + "asn": "0", "holdtime": "180", "keepalive": "60", "local_addr": "10.0.0.11", diff --git a/src/sonic-yang-models/yang-models/sonic-bgp-common.yang b/src/sonic-yang-models/yang-models/sonic-bgp-common.yang index 1c360faa9cd4..e56b1cffcb04 100644 --- a/src/sonic-yang-models/yang-models/sonic-bgp-common.yang +++ b/src/sonic-yang-models/yang-models/sonic-bgp-common.yang @@ -534,7 +534,7 @@ module sonic-bgp-common { grouping sonic-bgp-cmn-neigh { leaf asn { type uint32 { - range "1..4294967295"; + range "0..4294967295"; } description "Peer AS number"; } diff --git a/src/sonic-yang-models/yang-models/sonic-bgp-internal-neighbor.yang b/src/sonic-yang-models/yang-models/sonic-bgp-internal-neighbor.yang index 69a089f7cab8..eea5e6bba0bc 100644 --- a/src/sonic-yang-models/yang-models/sonic-bgp-internal-neighbor.yang +++ b/src/sonic-yang-models/yang-models/sonic-bgp-internal-neighbor.yang @@ -43,6 +43,9 @@ module sonic-bgp-internal-neighbor { must "(current() = /dm:sonic-device_metadata/dm:DEVICE_METADATA/dm:localhost/dm:bgp_asn)" { error-message "Internal iBGP neighbors should have same ASN as defined in device metadata"; } + must ". >= 1" { + error-message "ASN must be greater than 0"; + } } refine local_addr { mandatory true; diff --git a/src/sonic-yang-models/yang-models/sonic-bgp-neighbor.yang b/src/sonic-yang-models/yang-models/sonic-bgp-neighbor.yang index 12432ffc35bb..14bfa404f261 100644 --- a/src/sonic-yang-models/yang-models/sonic-bgp-neighbor.yang +++ b/src/sonic-yang-models/yang-models/sonic-bgp-neighbor.yang @@ -61,7 +61,13 @@ module sonic-bgp-neighbor { description "BGP Neighbor address"; } - uses bgpcmn:sonic-bgp-cmn-neigh; + uses bgpcmn:sonic-bgp-cmn-neigh { + refine asn { + must ". >= 1" { + error-message "ASN must be greater than 0"; + } + } + } } list BGP_NEIGHBOR_LIST { diff --git a/src/sonic-yang-models/yang-models/sonic-bgp-voq-chassis-neighbor.yang b/src/sonic-yang-models/yang-models/sonic-bgp-voq-chassis-neighbor.yang index 662f77c3c899..9348b24a951b 100644 --- a/src/sonic-yang-models/yang-models/sonic-bgp-voq-chassis-neighbor.yang +++ b/src/sonic-yang-models/yang-models/sonic-bgp-voq-chassis-neighbor.yang @@ -45,6 +45,9 @@ module sonic-bgp-voq-chassis-neighbor { must "(current() = /dm:sonic-device_metadata/dm:DEVICE_METADATA/dm:localhost/dm:bgp_asn)" { error-message "Voq chassis BGP neighbors should have same ASN as defined in device metadata"; } + must ". >= 1" { + error-message "ASN must be greater than 0"; + } } refine local_addr { mandatory true; From 3c8350c7c888a3713414bf524828e5b45ec01a74 Mon Sep 17 00:00:00 2001 From: mssonicbld <79238446+mssonicbld@users.noreply.github.com> Date: Fri, 16 Jun 2023 05:33:32 +0800 Subject: [PATCH 167/193] [submodule] Update submodule sonic-swss to the latest HEAD automatically (#15470) src/sonic-swss * 6a193e0 - (HEAD -> 202205, origin/202205) [Dual-ToR][ACL] bind LAG to ACL table in order to guarantee rule coverage if lag menber will be added to LAG after binding (#2749) (5 hours ago) [Andriy Yurkiv] --- src/sonic-swss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/sonic-swss b/src/sonic-swss index 2aec5479d093..6a193e089f68 160000 --- a/src/sonic-swss +++ b/src/sonic-swss @@ -1 +1 @@ -Subproject commit 2aec5479d093080d14c97de99a49e0fee1e08a10 +Subproject commit 6a193e089f68ebb84651fd64b1511ea4032d9d59 From 417196f80fd39a38fad27e58419e88c9e71bd4d4 Mon Sep 17 00:00:00 2001 From: Jing Zhang Date: Thu, 15 Jun 2023 14:35:36 -0700 Subject: [PATCH 168/193] [202205][YANG] add model for `MUX_CABLE` and `PEER_SWITCH` (#15485) * [YANG] Add MUX_CABLE yang model (#11797) Why I did it Address issue #10970 sign-off: Jing Zhang zhangjing@microsoft.com How I did it Add sonic-mux-cable.yang and unit tests. How to verify it Compile Compile target/python-wheels/sonic_yang_mgmt-1.0-py3-none-any.whl and target/python-wheels/sonic_yang_models-1.0-py3-none-any.whl. Pass sonic-config-engine unit test. Which release branch to backport (provide reason below if selected) 201811 201911 202006 202012 202106 202111 202205 Description for the changelog Link to config_db schema for YANG module changes https://github.com/sonic-net/sonic-buildimage/blob/f8fe41a0238b8a7b9e32ae42262f41b63050c55f/src/sonic-yang-models/doc/Configuration.md#mux_cable * [YANG] add peer switch model (#11828) Why I did it Address issue #10966 sign-off: Jing Zhang zhangjing@microsoft.com How I did it Add sonic-peer-switch.yang and unit tests. How to verify it Compile Compile target/python-wheels/sonic_yang_mgmt-1.0-py3-none-any.whl and target/python-wheels/sonic_yang_models-1.0-py3-none-any.whl. Which release branch to backport (provide reason below if selected) 201811 201911 202006 202012 202106 202111 202205 Description for the changelog Link to config_db schema for YANG module changes https://github.com/sonic-net/sonic-buildimage/blob/b721ff87b976a6a38bdd65443ea3bc686014e783/src/sonic-yang-models/doc/Configuration.md#peer-switch --- src/sonic-yang-models/doc/Configuration.md | 20 ++++ src/sonic-yang-models/setup.py | 2 + .../tests/files/sample_config_db.json | 21 +++++ .../yang_model_tests/tests/mux_cable.json | 16 ++++ .../yang_model_tests/tests/peer-switch.json | 13 +++ .../tests_config/mux_cable.json | 93 +++++++++++++++++++ .../tests_config/peer-switch.json | 39 ++++++++ .../yang-models/sonic-mux-cable.yang | 92 ++++++++++++++++++ .../yang-models/sonic-peer-switch.yang | 49 ++++++++++ 9 files changed, 345 insertions(+) create mode 100644 src/sonic-yang-models/tests/yang_model_tests/tests/mux_cable.json create mode 100644 src/sonic-yang-models/tests/yang_model_tests/tests/peer-switch.json create mode 100644 src/sonic-yang-models/tests/yang_model_tests/tests_config/mux_cable.json create mode 100644 src/sonic-yang-models/tests/yang_model_tests/tests_config/peer-switch.json create mode 100644 src/sonic-yang-models/yang-models/sonic-mux-cable.yang create mode 100644 src/sonic-yang-models/yang-models/sonic-peer-switch.yang diff --git a/src/sonic-yang-models/doc/Configuration.md b/src/sonic-yang-models/doc/Configuration.md index 25deed912a8c..98d10a5b5dc9 100644 --- a/src/sonic-yang-models/doc/Configuration.md +++ b/src/sonic-yang-models/doc/Configuration.md @@ -37,8 +37,10 @@ Table of Contents * [Management port](#management-port) * [Management VRF](#management-vrf) * [MAP_PFC_PRIORITY_TO_QUEUE](#map_pfc_priority_to_queue) + * [MUX_CABLE](#muxcable) * [NTP Global Configuration](#ntp-global-configuration) * [NTP and SYSLOG servers](#ntp-and-syslog-servers) + * [Peer Switch](#peer-switch) * [Policer](#policer) * [Port](#port) * [Port Channel](#port-channel) @@ -1129,6 +1131,24 @@ instead of data network. } } ``` +### MUX_CABLE + +The **MUX_CABLE** table is used for dualtor interface configuration. The `cable_type` and `soc_ipv4` objects are optional. + +``` +{ + "MUX_CABLE": { + "Ethernet4": { + "cable_type": "active-active", + "server_ipv4": "192.168.0.2/32", + "server_ipv6": "fc02:1000::30/128", + "soc_ipv4": "192.168.0.3/32", + "state": "auto" + } + } +} +``` + ### NTP Global Configuration These configuration options are used to modify the way that diff --git a/src/sonic-yang-models/setup.py b/src/sonic-yang-models/setup.py index 4b5646525d86..b44bbb8c92b0 100644 --- a/src/sonic-yang-models/setup.py +++ b/src/sonic-yang-models/setup.py @@ -117,6 +117,7 @@ def run(self): './yang-models/sonic-mgmt_port.yang', './yang-models/sonic-mgmt_vrf.yang', './yang-models/sonic-mirror-session.yang', + './yang-models/sonic-mux-cable.yang', './yang-models/sonic-ntp.yang', './yang-models/sonic-nat.yang', './yang-models/sonic-nvgre-tunnel.yang', @@ -155,6 +156,7 @@ def run(self): './yang-models/sonic-storm-control.yang', './yang-models/sonic-tc-priority-group-map.yang', './yang-models/sonic-tc-queue-map.yang', + './yang-models/sonic-peer-switch.yang', './yang-models/sonic-pfc-priority-queue-map.yang', './yang-models/sonic-pfc-priority-priority-group-map.yang', './yang-models/sonic-port-qos-map.yang', diff --git a/src/sonic-yang-models/tests/files/sample_config_db.json b/src/sonic-yang-models/tests/files/sample_config_db.json index f35d197019c3..8b274866de04 100644 --- a/src/sonic-yang-models/tests/files/sample_config_db.json +++ b/src/sonic-yang-models/tests/files/sample_config_db.json @@ -1806,6 +1806,27 @@ } }, + "PEER_SWITCH": { + "vlab-05": { + "address_ipv4": "10.1.0.33" + } + }, + + "MUX_CABLE": { + "Ethernet4": { + "cable_type": "active-active", + "server_ipv4": "192.168.0.2/32", + "server_ipv6": "fc02:1000::30/128", + "soc_ipv4": "192.168.0.3/32", + "state": "auto" + }, + "Ethernet0": { + "server_ipv4": "192.168.0.2/32", + "server_ipv6": "fc02:1000::30/128", + "state": "auto" + } + }, + "POLICER": { "everflow_static_policer": { diff --git a/src/sonic-yang-models/tests/yang_model_tests/tests/mux_cable.json b/src/sonic-yang-models/tests/yang_model_tests/tests/mux_cable.json new file mode 100644 index 000000000000..0d02097fdf63 --- /dev/null +++ b/src/sonic-yang-models/tests/yang_model_tests/tests/mux_cable.json @@ -0,0 +1,16 @@ +{ + "MUX_CABLE_ACTIVE_STANDBY_INTERFACE": { + "desc": "Load MUX_CABLE for active-standby interface." + }, + "MUX_CABLE_ACTIVE_ACTIVE_INTERFACE": { + "desc":"Load MUX_CABLE for active-active interface." + }, + "MUX_CABLE_INVALID_STATE": { + "desc": "Load MUX_CABLE with invalid state.", + "eStrKey": "InvalidValue" + }, + "MUX_CABLE_INVALID_IP": { + "desc": "Load MUX_CABLE with invalid server ip address.", + "eStrKey": "Pattern" + } +} \ No newline at end of file diff --git a/src/sonic-yang-models/tests/yang_model_tests/tests/peer-switch.json b/src/sonic-yang-models/tests/yang_model_tests/tests/peer-switch.json new file mode 100644 index 000000000000..b8ee10dbdf9c --- /dev/null +++ b/src/sonic-yang-models/tests/yang_model_tests/tests/peer-switch.json @@ -0,0 +1,13 @@ +{ + "PEER_SWITCH_LOAD_NORMAL": { + "desc": "Load PEER_SWITCH for dualtor device." + }, + "PEER_SWITCH_MISSING_DEVICE__NAME": { + "desc": "Load PEER_SWITCH missing PEER Device name.", + "eStrKey": "Mandatory" + }, + "PEER_SWITCH_INVALID_IP_ADDRESS": { + "desc": "Load PEER_SWITCH with invalid IPv4 Address.", + "eStrKey": "Pattern" + } +} diff --git a/src/sonic-yang-models/tests/yang_model_tests/tests_config/mux_cable.json b/src/sonic-yang-models/tests/yang_model_tests/tests_config/mux_cable.json new file mode 100644 index 000000000000..815171306bdc --- /dev/null +++ b/src/sonic-yang-models/tests/yang_model_tests/tests_config/mux_cable.json @@ -0,0 +1,93 @@ +{ + "MUX_CABLE_ACTIVE_STANDBY_INTERFACE": { + "sonic-port:sonic-port": { + "sonic-port:PORT": { + "PORT_LIST": [ + { + "admin_status": "up", + "alias": "eth0", + "description": "Ethernet0", + "lanes": "65", + "mtu": "9000", + "name": "Ethernet0", + "tpid": "0x8100", + "speed": "25000" + } + ] + } + }, + "sonic-mux-cable:sonic-mux-cable": { + "sonic-mux-cable:MUX_CABLE": { + "MUX_CABLE_LIST": [ + { + "ifname": "Ethernet0", + "server_ipv4": "192.168.0.2/32", + "server_ipv6": "fc02:1000::30/128", + "state": "auto" + } + ] + + } + } + }, + + "MUX_CABLE_ACTIVE_ACTIVE_INTERFACE": { + "sonic-port:sonic-port": { + "sonic-port:PORT": { + "PORT_LIST": [ + { + "admin_status": "up", + "alias": "eth0", + "description": "Ethernet4", + "lanes": "65", + "mtu": "9000", + "name": "Ethernet4", + "tpid": "0x8100", + "speed": "25000" + } + ] + } + }, + "sonic-mux-cable:sonic-mux-cable": { + "sonic-mux-cable:MUX_CABLE": { + "MUX_CABLE_LIST": [ + { + "ifname": "Ethernet4", + "cable_type": "active-active", + "server_ipv4": "192.168.0.2/32", + "server_ipv6": "fc02:1000::30/128", + "soc_ipv4": "192.168.0.3/32", + "state": "auto" + } + ] + + } + } + }, + + "MUX_CABLE_INVALID_STATE": { + "sonic-mux-cable:sonic-mux-cable": { + "sonic-mux-cable:MUX_CABLE": { + "MUX_CABLE_LIST": [ + { + "state": "Standby" + } + ] + + } + } + }, + + "MUX_CABLE_INVALID_IP": { + "sonic-mux-cable:sonic-mux-cable": { + "sonic-mux-cable:MUX_CABLE": { + "MUX_CABLE_LIST": [ + { + "server_ipv4": "999.999.999.999/32" + } + ] + + } + } + } +} diff --git a/src/sonic-yang-models/tests/yang_model_tests/tests_config/peer-switch.json b/src/sonic-yang-models/tests/yang_model_tests/tests_config/peer-switch.json new file mode 100644 index 000000000000..e3857fc392e8 --- /dev/null +++ b/src/sonic-yang-models/tests/yang_model_tests/tests_config/peer-switch.json @@ -0,0 +1,39 @@ +{ + "PEER_SWITCH_LOAD_NORMAL": { + "sonic-peer-switch:sonic-peer-switch": { + "sonic-peer-switch:PEER_SWITCH": { + "PEER_SWITCH_LIST": [ + { + "peer_switch": "vlab-05", + "address_ipv4": "10.1.0.33" + } + ] + } + } + }, + + "PEER_SWITCH_MISSING_DEVICE__NAME": { + "sonic-peer-switch:sonic-peer-switch": { + "sonic-peer-switch:PEER_SWITCH": { + "PEER_SWITCH_LIST": [ + { + "address_ipv4": "10.1.0.33" + } + ] + } + } + }, + + "PEER_SWITCH_INVALID_IP_ADDRESS": { + "sonic-peer-switch:sonic-peer-switch": { + "sonic-peer-switch:PEER_SWITCH": { + "PEER_SWITCH_LIST": [ + { + "peer_switch": "vlab-05", + "address_ipv4": "10.1.0.33/32" + } + ] + } + } + } +} diff --git a/src/sonic-yang-models/yang-models/sonic-mux-cable.yang b/src/sonic-yang-models/yang-models/sonic-mux-cable.yang new file mode 100644 index 000000000000..a66a588c91da --- /dev/null +++ b/src/sonic-yang-models/yang-models/sonic-mux-cable.yang @@ -0,0 +1,92 @@ +module sonic-mux-cable { + namespace "http://github.com/Azure/sonic-mux-cable"; + prefix mux_cable; + yang-version 1.1; + + import ietf-inet-types { + prefix inet; + } + + import sonic-port { + prefix prt; + } + + organization + "SONiC"; + + contact + "SONiC"; + + description + "SONiC DualToR MUX CABLE confifuration data"; + + revision 2022-08-19 { + description + "Initial revision"; + } + + container sonic-mux-cable { + + container MUX_CABLE { + + list MUX_CABLE_LIST { + + key "ifname"; + + leaf ifname { + type leafref { + path "/prt:sonic-port/prt:PORT/prt:PORT_LIST/prt:name"; + } + description + "Reference of port on which MUX cable to be configured."; + } + + leaf cable_type { + type enumeration { + enum active-active; + enum active-standby; + } + default active-standby; + description "SONiC DualToR interface cable type."; + } + + leaf server_ipv4 { + type inet:ipv4-prefix; + + description "Server IPv4 Address."; + } + + leaf server_ipv6 { + type inet:ipv6-prefix; + + description "Server IPv6 Address."; + } + + leaf soc_ipv4 { + type inet:ipv4-prefix; + + description "SoC IPv4 address. Optional and for active-active ports only. "; + } + + leaf soc_ipv6 { + type inet:ipv6-prefix; + + description "SoC IPv6 address. Optional and for active-active ports only. "; + } + + leaf state { + type enumeration { + enum auto; + enum manual; + enum detach; + enum active; + enum standby; + } + + default auto; + description "MUX mode determining if auto failover is enabled. "; + } + } + } + } +} diff --git a/src/sonic-yang-models/yang-models/sonic-peer-switch.yang b/src/sonic-yang-models/yang-models/sonic-peer-switch.yang new file mode 100644 index 000000000000..79a94c95c2c0 --- /dev/null +++ b/src/sonic-yang-models/yang-models/sonic-peer-switch.yang @@ -0,0 +1,49 @@ +module sonic-peer-switch { + yang-version 1.1; + namespace "http://github.com/Azure/sonic-peer-switch"; + prefix peer_switch; + + import ietf-inet-types { + prefix inet; + } + + import sonic-types { + prefix stypes; + } + + organization + "SONiC"; + + contact + "SONiC"; + + description + "SONiC DualToR peer switch data"; + + revision 2022-08-23 { + description + "Initial revision"; + } + + container sonic-peer-switch { + container PEER_SWITCH { + list PEER_SWITCH_LIST { + max-elements 1; + + key "peer_switch"; + + leaf peer_switch { + type stypes:hostname; + + description "SONiC DualToR peer host name."; + } + + leaf address_ipv4 { + type inet:ipv4-address; + + description "SONiC DualToR peer's IPv4 address."; + } + } + } + } +} From 340a6f68a8be4aee1a69a8162c4176900d009644 Mon Sep 17 00:00:00 2001 From: Ikki Zhu <79439153+qnos@users.noreply.github.com> Date: Tue, 28 Mar 2023 01:14:37 +0800 Subject: [PATCH 169/193] [celestica/e1031]: enable emc2305 fan controller timeout feature (#14401) Why I did it There is rare condition, emc2305 hold SMBus and cause SMBus completion wait timed out. How I did it Enable EMC2305 SMBus timeout feature, 30ms period of inactivity will reset the interface. How to verify it Use 'i2cget -y -f 23 0x4d 0x20 b' to read EMC2305 configuration register and check DIS_TO bit not set. Signed-off-by: Eric Zhu --- .../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 89b7f46486dec15b64b21fbe50cabe618baf7bbf Mon Sep 17 00:00:00 2001 From: pavannaregundi <92989231+pavannaregundi@users.noreply.github.com> Date: Wed, 14 Jun 2023 23:24:30 +0530 Subject: [PATCH 170/193] [Marvell] Update armhf driver version (#15138) Changes in MRVL_PRESTERA_DRIVER_1.4: - Memory leak fixed by releasing pci device after retrieval. - Fixes for 5.10 kernel porting. Change-Id: I1d7ee4ec02ec17a29ddb8473725ab68ca399748b Signed-off-by: Pavan Naregundi --- platform/marvell-armhf/prestera.mk | 2 +- .../prestera/debian/mrvlprestera.install.template | 4 ++-- platform/marvell-armhf/prestera/debian/rules | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/platform/marvell-armhf/prestera.mk b/platform/marvell-armhf/prestera.mk index 113b8f41a394..0d48b9ed8aec 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.2 +export MRVL_PRESTERA_SRC_TAG = MRVL_PRESTERA_DRIVER_1.4 $(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/mrvlprestera.install.template b/platform/marvell-armhf/prestera/debian/mrvlprestera.install.template index d0e96ab1e7d6..3c805336cc51 100644 --- a/platform/marvell-armhf/prestera/debian/mrvlprestera.install.template +++ b/platform/marvell-armhf/prestera/debian/mrvlprestera.install.template @@ -1,3 +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/drivers/armhf/cpssEnabler/linuxNoKernelModule/drivers/mvDmaDrv.ko /lib/modules/KVERSION/kernel/extra +mrvl-prestera/drivers/armhf/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 index d3895c2f769a..99bb283874ca 100755 --- a/platform/marvell-armhf/prestera/debian/rules +++ b/platform/marvell-armhf/prestera/debian/rules @@ -6,7 +6,7 @@ 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 +MODULE_DIR := mrvl-prestera/drivers/armhf/cpssEnabler/linuxNoKernelModule/drivers %: dh $@ --with systemd,python2,python3 --buildsystem=pybuild @@ -19,9 +19,9 @@ 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 - sed -i "s/4,11,0)/4,11,0) \&\& LINUX_VERSION_CODE < KERNEL_VERSION(5,8,0)/g" /sonic/platform/marvell-armhf/prestera/mrvl-prestera/cpssEnabler/linuxNoKernelModule/drivers/dmaDriver.c make modules -C $(KERNEL_SRC)/build M=$(MOD_SRC_DIR)/$(MODULE_DIR)/ From 3396cca1a3c5f38231e34361c6b89c4bf821623c Mon Sep 17 00:00:00 2001 From: Samuel Angebault Date: Wed, 14 Jun 2023 13:19:28 -0700 Subject: [PATCH 171/193] [Arista] fix platform.json for a few devices (#15308) Why I did it sonic-mgmt is failing tests due to invalid test data in platform.json Fwutil is upset the chassis name in the platform_component.json of the 7060CX-32S How I did it Fixed the aforementioned issues --- .../x86_64-arista_7050_qx32/platform.json | 42 ++++++++------- .../x86_64-arista_7050_qx32s/platform.json | 51 ++++++++++--------- .../platform_components.json | 2 +- 3 files changed, 51 insertions(+), 44 deletions(-) diff --git a/device/arista/x86_64-arista_7050_qx32/platform.json b/device/arista/x86_64-arista_7050_qx32/platform.json index 115de841943b..8772ce8b23db 100644 --- a/device/arista/x86_64-arista_7050_qx32/platform.json +++ b/device/arista/x86_64-arista_7050_qx32/platform.json @@ -53,37 +53,43 @@ "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": "Board sensor" - }, - { - "name": "Front-panel temp sensor" - }, - { - "name": "Rear temp sensor" - }, - { - "name": "Power supply 1 inlet temp sensor" + "name": "Cpu temp sensor", + "controllable": false }, { - "name": "Power supply 1 internal sensor" + "name": "Board sensor", + "controllable": false }, { - "name": "Power supply 2 inlet temp sensor" + "name": "Front-panel temp sensor", + "controllable": false }, { - "name": "Power supply 2 internal sensor" + "name": "Rear temp sensor", + "controllable": false } ], "sfps": [ diff --git a/device/arista/x86_64-arista_7050_qx32s/platform.json b/device/arista/x86_64-arista_7050_qx32s/platform.json index 0dd9b558d06f..56ee4a0dff25 100644 --- a/device/arista/x86_64-arista_7050_qx32s/platform.json +++ b/device/arista/x86_64-arista_7050_qx32s/platform.json @@ -40,46 +40,47 @@ "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 board temp sensor" - }, - { - "name": "Back-panel temp sensor" - }, - { - "name": "Board Sensor" - }, - { - "name": "Front-panel temp sensor" - }, - { - "name": "Power supply 1 hotspot sensor" - }, - { - "name": "Power supply 1 inlet temp sensor" + "name": "Cpu temp sensor", + "controllable": false }, { - "name": "Power supply 1 exhaust temp sensor" + "name": "Cpu board temp sensor", + "controllable": false }, { - "name": "Power supply 2 hotspot sensor" + "name": "Back-panel temp sensor", + "controllable": false }, { - "name": "Power supply 2 inlet temp sensor" + "name": "Board Sensor", + "controllable": false }, { - "name": "Power supply 2 exhaust temp sensor" + "name": "Front-panel temp sensor", + "controllable": false } ], "sfps": [ diff --git a/device/arista/x86_64-arista_7060_cx32s/platform_components.json b/device/arista/x86_64-arista_7060_cx32s/platform_components.json index d7647e359b86..b89e8017ca57 100644 --- a/device/arista/x86_64-arista_7060_cx32s/platform_components.json +++ b/device/arista/x86_64-arista_7060_cx32s/platform_components.json @@ -1,6 +1,6 @@ { "chassis": { - "DCS-7050CX3-32S": { + "DCS-7060CX-32S": { "component": { "Aboot()": {}, "Scd(addr=0000:02:00.0)": {}, From 118f14dc65f1ef638929f9342f1853f21a4453ae Mon Sep 17 00:00:00 2001 From: mssonicbld <79238446+mssonicbld@users.noreply.github.com> Date: Fri, 16 Jun 2023 23:30:40 +0800 Subject: [PATCH 172/193] [submodule] Update submodule linkmgrd to the latest HEAD automatically (#15503) src/linkmgrd * 9aebd5a - (HEAD -> 202205, origin/202205) Re-handle pre-init mux config notification after state machine init (#202) (10 hours ago) [Longxiang Lyu] --- src/linkmgrd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/linkmgrd b/src/linkmgrd index c0f7c506b361..9aebd5add193 160000 --- a/src/linkmgrd +++ b/src/linkmgrd @@ -1 +1 @@ -Subproject commit c0f7c506b36168d13b6c250444394e9b2f748e9d +Subproject commit 9aebd5add1936f6f7f3fbf9b7f03fc21bc3ab0ee From 6cd8ae36fa373798af3aa8faca08ab21df58852f Mon Sep 17 00:00:00 2001 From: mssonicbld <79238446+mssonicbld@users.noreply.github.com> Date: Fri, 16 Jun 2023 23:32:22 +0800 Subject: [PATCH 173/193] [submodule] Update submodule sonic-platform-daemons to the latest HEAD automatically (#15505) src/sonic-platform-daemons * 78db08e - (HEAD -> 202205, origin/202205) Separate periodic v/s fixed EEPROM reads between threads and optimize xcvrd boot-up time (#360) (5 hours ago) [mihirpat1] * 1a672b0 - [ycable] change logging level for stop main loop to NOTICE from ERR (#376) (9 hours ago) [vdahiya12] --- 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 1d04977a61e6..78db08e7c93d 160000 --- a/src/sonic-platform-daemons +++ b/src/sonic-platform-daemons @@ -1 +1 @@ -Subproject commit 1d04977a61e6551899c171142521bf7537632d56 +Subproject commit 78db08e7c93dbd03aa3dded7d8cbc35a892b76a2 From 2286895073f23aa0e8e63fa47a160be76ed23d38 Mon Sep 17 00:00:00 2001 From: mssonicbld <79238446+mssonicbld@users.noreply.github.com> Date: Fri, 16 Jun 2023 23:32:47 +0800 Subject: [PATCH 174/193] [submodule] Update submodule sonic-sairedis to the latest HEAD automatically (#15506) src/sonic-sairedis * ec81223 - (HEAD -> 202205, origin/202205) [syncd] Add pre match logic for acl entry (#1240) (10 hours ago) [Kamil Cudnik] * 2966e58 - Fix pipeline issue caused by urllib3 v2 (10 hours ago) [Liu Shilong] --- src/sonic-sairedis | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/sonic-sairedis b/src/sonic-sairedis index 7f6abdd8045a..ec81223a4bad 160000 --- a/src/sonic-sairedis +++ b/src/sonic-sairedis @@ -1 +1 @@ -Subproject commit 7f6abdd8045afae2de6a86c332aed680a71adecc +Subproject commit ec81223a4bad1336ecfebf93ef859d9feafd445f From 4a38fb5681723db461c7db150adf655b7ad1748f Mon Sep 17 00:00:00 2001 From: mssonicbld <79238446+mssonicbld@users.noreply.github.com> Date: Fri, 16 Jun 2023 23:33:15 +0800 Subject: [PATCH 175/193] [submodule] Update submodule sonic-swss to the latest HEAD automatically (#15508) src/sonic-swss * 444e3be - (HEAD -> 202205, origin/202205) [subinterface]: Fix admin state handling. (#2806) (10 hours ago) [Nazarii Hnydyn] * 9690c5a - [portsorch]: Enhancing SWSS OA logs to capture host_tx_ready change events (#2822) (10 hours ago) [mihirpat1] --- src/sonic-swss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/sonic-swss b/src/sonic-swss index 6a193e089f68..444e3bea84c0 160000 --- a/src/sonic-swss +++ b/src/sonic-swss @@ -1 +1 @@ -Subproject commit 6a193e089f68ebb84651fd64b1511ea4032d9d59 +Subproject commit 444e3bea84c04c6457f164f2d0e29d65b2d5a317 From b0f2cb3be2d21e0f26c6f0a28478535d8aaa4cd7 Mon Sep 17 00:00:00 2001 From: mssonicbld <79238446+mssonicbld@users.noreply.github.com> Date: Fri, 16 Jun 2023 23:33:40 +0800 Subject: [PATCH 176/193] [submodule] Update submodule sonic-utilities to the latest HEAD automatically (#15510) src/sonic-utilities * 43c85ef5 - (HEAD -> 202205, origin/202205) [dhcp-relay] Fix dhcp6relay counter issue (#2866) (10 hours ago) [Yaqiang Zhu] * e0333b5c - Revert "[config]config reload should generate sysinfo if missing (#2778)" (#2865) (10 hours ago) [jingwenxie] * e7eac6bf - [config] Generate sysinfo in single asic (#2856) (10 hours ago) [jingwenxie] * e42291bb - [config] Generate sysinfo as needed when override config (#2836) (10 hours ago) [jingwenxie] --- src/sonic-utilities | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/sonic-utilities b/src/sonic-utilities index 24d0d1cbd1a0..43c85ef54ddd 160000 --- a/src/sonic-utilities +++ b/src/sonic-utilities @@ -1 +1 @@ -Subproject commit 24d0d1cbd1a000ecf240464eb52c27296ace16ba +Subproject commit 43c85ef54ddd38366fa807d894546132ec9466cd From b4dcd1bcb4167977bb34c8f3ec6087a0862a3681 Mon Sep 17 00:00:00 2001 From: Prince Sunny Date: Fri, 16 Jun 2023 08:35:15 -0700 Subject: [PATCH 177/193] Create default Vxlan and Vnet configs (#13409) (#15497) * Create default Vxlan and Vnet configs for ToRs with Appliance Resource type --- src/sonic-config-engine/minigraph.py | 25 ++++++++++++++++++- .../tests/t0-sample-deployment-id.xml | 5 ++++ src/sonic-config-engine/tests/test_cfggen.py | 16 ++++++++++++ 3 files changed, 45 insertions(+), 1 deletion(-) diff --git a/src/sonic-config-engine/minigraph.py b/src/sonic-config-engine/minigraph.py index 9a7902928e76..0b059c27b19a 100644 --- a/src/sonic-config-engine/minigraph.py +++ b/src/sonic-config-engine/minigraph.py @@ -1255,6 +1255,28 @@ def parse_spine_chassis_fe(results, vni, lo_intfs, phyport_intfs, pc_intfs, pc_m # Enslave the port channel interface to a Vnet pc_intfs[pc_intf] = {'vnet_name': chassis_vnet} +def parse_default_vxlan_decap(results, vni, lo_intfs): + vnet ='Vnet-default' + vxlan_tunnel = 'tunnel_v4' + + # Vxlan tunnel information + lo_addr = '0.0.0.0' + for lo in lo_intfs: + lo_network = ipaddress.ip_network(UNICODE_TYPE(lo[1]), False) + if lo_network.version == 4: + lo_addr = str(lo_network.network_address) + break + results['VXLAN_TUNNEL'] = {vxlan_tunnel: { + 'src_ip': lo_addr + }} + + # Vnet information + results['VNET'] = {vnet: { + 'vxlan_tunnel': vxlan_tunnel, + 'scope': "default", + 'vni': vni + }} + ############################################################################### # # Post-processing functions @@ -1605,9 +1627,10 @@ def parse_xml(filename, platform=None, port_config_file=None, asic_name=None, hw for key in voq_inband_intfs: results['VOQ_INBAND_INTERFACE'][key] = voq_inband_intfs[key] - if resource_type is not None: results['DEVICE_METADATA']['localhost']['resource_type'] = resource_type + if 'Appliance' in resource_type: + parse_default_vxlan_decap(results, vni_default, lo_intfs) if downstream_subrole is not None: results['DEVICE_METADATA']['localhost']['downstream_subrole'] = downstream_subrole diff --git a/src/sonic-config-engine/tests/t0-sample-deployment-id.xml b/src/sonic-config-engine/tests/t0-sample-deployment-id.xml index 30517dfee19f..28c26af921c7 100644 --- a/src/sonic-config-engine/tests/t0-sample-deployment-id.xml +++ b/src/sonic-config-engine/tests/t0-sample-deployment-id.xml @@ -731,6 +731,11 @@ 2.2.2.2 + + ResourceType + + HaAppliance + diff --git a/src/sonic-config-engine/tests/test_cfggen.py b/src/sonic-config-engine/tests/test_cfggen.py index b302855cef3c..634ab15da229 100644 --- a/src/sonic-config-engine/tests/test_cfggen.py +++ b/src/sonic-config-engine/tests/test_cfggen.py @@ -494,6 +494,22 @@ def test_minigraph_port_rs(self): utils.to_dict("{'lanes': '101,102,103,104', 'fec': 'rs', 'pfc_asym': 'off', 'mtu': '9100', 'tpid': '0x8100', 'alias': 'fortyGigE0/124', 'admin_status': 'up', 'speed': '100000', 'description': 'ARISTA04T1:Ethernet1/1'}") ) + def test_minigraph_default_vxlan(self): + argument = '-m "' + self.sample_graph_deployment_id + '" -p "' + self.port_config + '" -v "VXLAN_TUNNEL"' + output = self.run_script(argument) + self.assertEqual( + utils.to_dict(output.strip()), + utils.to_dict("{'tunnel_v4': {'src_ip': '10.1.0.32'}}") + ) + + def test_minigraph_default_vnet(self): + argument = '-m "' + self.sample_graph_deployment_id + '" -p "' + self.port_config + '" -v "VNET"' + output = self.run_script(argument) + self.assertEqual( + utils.to_dict(output.strip()), + utils.to_dict("{'Vnet-default': {'vxlan_tunnel': 'tunnel_v4', 'scope': 'default', 'vni': 8000}}") + ) + def test_minigraph_bgp(self): argument = '-m "' + self.sample_graph_bgp_speaker + '" -p "' + self.port_config + '" -v "BGP_NEIGHBOR[\'10.0.0.59\']"' output = self.run_script(argument) From 2d436cc59db9908ae590068bd6a002542891a603 Mon Sep 17 00:00:00 2001 From: siqbal1986 Date: Fri, 16 Jun 2023 08:36:18 -0700 Subject: [PATCH 178/193] 202205 cast for https://github.com/sonic-net/sonic-buildimage/pull/14992 (#15499) Why I did it CP of orignal PR #14992 which failed automatic CP. Work item tracking Microsoft ADO (number only):21695894 --- 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 fb9177ef0dff..ee6f770219cb 100755 --- a/files/scripts/swss.sh +++ b/files/scripts/swss.sh @@ -175,7 +175,7 @@ start() { $SONIC_DB_CLI GB_ASIC_DB FLUSHDB $SONIC_DB_CLI GB_COUNTERS_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*', 'MACSEC_PORT_TABLE*', 'MACSEC_INGRESS_SA_TABLE*', 'MACSEC_EGRESS_SA_TABLE*', 'MACSEC_INGRESS_SC_TABLE*', 'MACSEC_EGRESS_SC_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*', 'MACSEC_PORT_TABLE*', 'MACSEC_INGRESS_SA_TABLE*', 'MACSEC_EGRESS_SA_TABLE*', 'MACSEC_INGRESS_SC_TABLE*', 'MACSEC_EGRESS_SC_TABLE*', 'VNET_ROUTE*', 'VNET_MONITOR_TABLE*', 'BFD_SESSION_TABLE*'" $SONIC_DB_CLI APPL_STATE_DB FLUSHDB rm -rf /tmp/cache fi From d5d674e89d6749c8e6eb38f2c0c47e0a70817a6d Mon Sep 17 00:00:00 2001 From: mssonicbld <79238446+mssonicbld@users.noreply.github.com> Date: Sat, 17 Jun 2023 09:18:08 +0800 Subject: [PATCH 179/193] Revert "Fix for fast/cold-boot: call db_migrator only after old config is loaded (#14933)" (#15464) (#15517) --- 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 ab13a03ca35a..6879aeb703f7 100644 --- a/files/build_templates/docker_image_ctl.j2 +++ b/files/build_templates/docker_image_ctl.j2 @@ -246,18 +246,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 28a3a4373a42..0f5a248b05f8 100755 --- a/files/image_config/config-setup/config-setup +++ b/files/image_config/config-setup/config-setup @@ -304,16 +304,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() @@ -336,19 +326,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 97f247ddaa79389eb2f98e9f153860bfb2da0702 Mon Sep 17 00:00:00 2001 From: mssonicbld <79238446+mssonicbld@users.noreply.github.com> Date: Sat, 17 Jun 2023 23:36:38 +0800 Subject: [PATCH 180/193] [submodule] Update submodule sonic-telemetry to the latest HEAD automatically (#15522) src/sonic-telemetry * a4bfafe - (HEAD -> 202205, origin/202205) Merge pull request #119 from zbud-msft/202205_gnmi_get_log (5 hours ago) [Ying Xie] * 1b49409 - Merge branch '202205' into 202205_gnmi_get_log (7 days ago) [Zain Budhwani] * b478159 - Cherry pick commit 4a8964a (#104) (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 19ca64a66863..a4bfafe9a137 160000 --- a/src/sonic-telemetry +++ b/src/sonic-telemetry @@ -1 +1 @@ -Subproject commit 19ca64a66863f9b01346b90c589a0bd64bcc992e +Subproject commit a4bfafe9a137f1018831e5d0743edd756f38ddd5 From ff35113a222582e5f79d95fe161dc0b19eb7799b Mon Sep 17 00:00:00 2001 From: mssonicbld <79238446+mssonicbld@users.noreply.github.com> Date: Sat, 17 Jun 2023 23:45:02 +0800 Subject: [PATCH 181/193] Update the defination of acl table type BMCDATA and BMCDATAV6 (#15385) (#15527) Why I did it Update the definition of acl table type BMCDATA and BMCDATAV6 in minigraph parser. Work item tracking Microsoft ADO (number only): 24101023 How I did it Update the definition of acl table type BMCDATA and BMCDATAV6 in minigraph parser. How to verify it Ran unittest to verify this update: Co-authored-by: Zhijian Li --- src/sonic-config-engine/minigraph.py | 4 ++-- src/sonic-config-engine/tests/test_minigraph_case.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/sonic-config-engine/minigraph.py b/src/sonic-config-engine/minigraph.py index 0b059c27b19a..a95b2698de14 100644 --- a/src/sonic-config-engine/minigraph.py +++ b/src/sonic-config-engine/minigraph.py @@ -55,12 +55,12 @@ 'BMCDATA': { "ACTIONS": "PACKET_ACTION,COUNTER", "BIND_POINTS": "PORT", - "MATCHES": "SRC_IP,DST_IP,ETHER_TYPE,IP_TYPE,IP_PROTOCOL,IN_PORTS,TCP_FLAGS", + "MATCHES": "SRC_IP,DST_IP,ETHER_TYPE,IP_TYPE,IP_PROTOCOL,IN_PORTS,L4_SRC_PORT,L4_DST_PORT,L4_SRC_PORT_RANGE,L4_DST_PORT_RANGE", }, 'BMCDATAV6': { "ACTIONS": "PACKET_ACTION,COUNTER", "BIND_POINTS": "PORT", - "MATCHES": "SRC_IPV6,DST_IPV6,ETHER_TYPE,IP_TYPE,IP_PROTOCOL,IN_PORTS,TCP_FLAGS", + "MATCHES": "SRC_IPV6,DST_IPV6,ETHER_TYPE,IP_TYPE,IP_PROTOCOL,IN_PORTS,L4_SRC_PORT,L4_DST_PORT,L4_SRC_PORT_RANGE,L4_DST_PORT_RANGE", } } diff --git a/src/sonic-config-engine/tests/test_minigraph_case.py b/src/sonic-config-engine/tests/test_minigraph_case.py index 23d2b0cac8a3..43f92ccdc996 100644 --- a/src/sonic-config-engine/tests/test_minigraph_case.py +++ b/src/sonic-config-engine/tests/test_minigraph_case.py @@ -500,12 +500,12 @@ def test_minigraph_acl_type_bmcdata(self): expected_acl_type_bmcdata = { "ACTIONS": "PACKET_ACTION,COUNTER", "BIND_POINTS": "PORT", - "MATCHES": "SRC_IP,DST_IP,ETHER_TYPE,IP_TYPE,IP_PROTOCOL,IN_PORTS,TCP_FLAGS", + "MATCHES": "SRC_IP,DST_IP,ETHER_TYPE,IP_TYPE,IP_PROTOCOL,IN_PORTS,L4_SRC_PORT,L4_DST_PORT,L4_SRC_PORT_RANGE,L4_DST_PORT_RANGE", } expected_acl_type_bmcdatav6 = { "ACTIONS": "PACKET_ACTION,COUNTER", "BIND_POINTS": "PORT", - "MATCHES": "SRC_IPV6,DST_IPV6,ETHER_TYPE,IP_TYPE,IP_PROTOCOL,IN_PORTS,TCP_FLAGS", + "MATCHES": "SRC_IPV6,DST_IPV6,ETHER_TYPE,IP_TYPE,IP_PROTOCOL,IN_PORTS,L4_SRC_PORT,L4_DST_PORT,L4_SRC_PORT_RANGE,L4_DST_PORT_RANGE", } expected_acl_table_bmc_acl_northbound = { 'policy_desc': 'BMC_ACL_NORTHBOUND', From d935f430b82bbdbf91c7354127fb120a59744a35 Mon Sep 17 00:00:00 2001 From: mssonicbld <79238446+mssonicbld@users.noreply.github.com> Date: Tue, 20 Jun 2023 09:08:51 +0800 Subject: [PATCH 182/193] [mux] Integrate `linkmgrd` with swss logger (#15392) (#15539) --- dockers/docker-mux/supervisord.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dockers/docker-mux/supervisord.conf b/dockers/docker-mux/supervisord.conf index 33eb650e85d4..43f31050646a 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 -d +command=nice -n -20 /usr/sbin/linkmgrd -v warning -d -l priority=2 autostart=false autorestart=false From 7b13065e7d2fc8804156b8f4afb84e36cc543139 Mon Sep 17 00:00:00 2001 From: Ying Xie Date: Mon, 19 Jun 2023 19:50:10 -0700 Subject: [PATCH 183/193] =?UTF-8?q?[202211][FRR][CVE]=20Add=20FRR=20patche?= =?UTF-8?q?s=20to=20fix=20CVEs:=20CVE-2022-43681=20CVE-2022-40318=E2=80=A6?= =?UTF-8?q?=20(#15263)=20(#15537)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit … CVE-2022-40302 Add patches from PRs https://github.com/FRRouting/frr/pull/12043 https://github.com/FRRouting/frr/pull/12247 #### Why I did it To fix CVEs https://github.com/advisories/GHSA-x7mf-v6gh-vm4g https://github.com/advisories/GHSA-9rqq-99cf-35g5 https://github.com/advisories/GHSA-j7hm-p94x-q9pw ##### Work item tracking - Microsoft ADO **(number only)**: 23268946 #### How I did it Added patches from the FRR fix PRs Co-authored-by: DavidZagury <32644413+DavidZagury@users.noreply.github.com> --- ...capability-and-bgp_open_option_parse.patch | 130 ++++++++++++++++++ ...ssage-stream-has-enough-data-to-read.patch | 47 +++++++ src/sonic-frr/patch/series | 2 + 3 files changed, 179 insertions(+) create mode 100644 src/sonic-frr/patch/0027-bgpd-Ensure-FRR-has-enough-data-to-read-in-peek_for_as4_capability-and-bgp_open_option_parse.patch create mode 100644 src/sonic-frr/patch/0028-bgpd-Ensure-that-bgp-open-message-stream-has-enough-data-to-read.patch diff --git a/src/sonic-frr/patch/0027-bgpd-Ensure-FRR-has-enough-data-to-read-in-peek_for_as4_capability-and-bgp_open_option_parse.patch b/src/sonic-frr/patch/0027-bgpd-Ensure-FRR-has-enough-data-to-read-in-peek_for_as4_capability-and-bgp_open_option_parse.patch new file mode 100644 index 000000000000..fb6352b3fc9d --- /dev/null +++ b/src/sonic-frr/patch/0027-bgpd-Ensure-FRR-has-enough-data-to-read-in-peek_for_as4_capability-and-bgp_open_option_parse.patch @@ -0,0 +1,130 @@ +From 3e46b43e3788f0f87bae56a86b54d412b4710286 Mon Sep 17 00:00:00 2001 +From: Donald Sharp +Date: Fri, 30 Sep 2022 08:51:45 -0400 +Subject: [PATCH 1/2] bgpd: Ensure FRR has enough data to read 2 bytes in + peek_for_as4_capability + +In peek_for_as4_capability the code is checking that the +stream has at least 2 bytes to read ( the opt_type and the +opt_length ). However if BGP_OPEN_EXT_OPT_PARAMS_CAPABLE(peer) +is configured then FRR is reading 3 bytes. Which is not good +since the packet could be badly formated. Ensure that +FRR has the appropriate data length to read the data. + +Signed-off-by: Donald Sharp +--- + bgpd/bgp_open.c | 27 +++++++++++++++++++++------ + 1 file changed, 21 insertions(+), 6 deletions(-) + +diff --git a/bgpd/bgp_open.c b/bgpd/bgp_open.c +index 7248f034a5a..a760a7ca013 100644 +--- a/bgpd/bgp_open.c ++++ b/bgpd/bgp_open.c +@@ -1185,15 +1185,30 @@ as_t peek_for_as4_capability(struct peer *peer, uint16_t length) + uint8_t opt_type; + uint16_t opt_length; + +- /* Check the length. */ +- if (stream_get_getp(s) + 2 > end) ++ /* Ensure we can read the option type */ ++ if (stream_get_getp(s) + 1 > end) + goto end; + +- /* Fetch option type and length. */ ++ /* Fetch the option type */ + opt_type = stream_getc(s); +- opt_length = BGP_OPEN_EXT_OPT_PARAMS_CAPABLE(peer) +- ? stream_getw(s) +- : stream_getc(s); ++ ++ /* ++ * Check the length and fetch the opt_length ++ * If the peer is BGP_OPEN_EXT_OPT_PARAMS_CAPABLE(peer) ++ * then we do a getw which is 2 bytes. So we need to ++ * ensure that we can read that as well ++ */ ++ if (BGP_OPEN_EXT_OPT_PARAMS_CAPABLE(peer)) { ++ if (stream_get_getp(s) + 2 > end) ++ goto end; ++ ++ opt_length = stream_getw(s); ++ } else { ++ if (stream_get_getp(s) + 1 > end) ++ goto end; ++ ++ opt_length = stream_getc(s); ++ } + + /* Option length check. */ + if (stream_get_getp(s) + opt_length > end) + +From 1117baca3c592877a4d8a13ed6a1d9bd83977487 Mon Sep 17 00:00:00 2001 +From: Donald Sharp +Date: Fri, 30 Sep 2022 08:57:43 -0400 +Subject: [PATCH 2/2] bgpd: Ensure FRR has enough data to read 2 bytes in + bgp_open_option_parse + +In bgp_open_option_parse the code is checking that the +stream has at least 2 bytes to read ( the opt_type and +the opt_length). However if BGP_OPEN_EXT_OPT_PARAMS_CAPABLE(peer) +is configured then FRR is reading 3 bytes. Which is not good +since the packet could be badly formateed. Ensure that +FRR has the appropriate data length to read the data. + +Signed-off-by: Donald Sharp +--- + bgpd/bgp_open.c | 35 ++++++++++++++++++++++++++++------- + 1 file changed, 28 insertions(+), 7 deletions(-) + +diff --git a/bgpd/bgp_open.c b/bgpd/bgp_open.c +index a760a7ca013..d1667fac261 100644 +--- a/bgpd/bgp_open.c ++++ b/bgpd/bgp_open.c +@@ -1278,19 +1278,40 @@ int bgp_open_option_parse(struct peer *peer, uint16_t length, + uint8_t opt_type; + uint16_t opt_length; + +- /* Must have at least an OPEN option header */ +- if (STREAM_READABLE(s) < 2) { ++ /* ++ * Check that we can read the opt_type and fetch it ++ */ ++ if (STREAM_READABLE(s) < 1) { + zlog_info("%s Option length error", peer->host); + bgp_notify_send(peer, BGP_NOTIFY_OPEN_ERR, + BGP_NOTIFY_OPEN_MALFORMED_ATTR); + return -1; + } +- +- /* Fetch option type and length. */ + opt_type = stream_getc(s); +- opt_length = BGP_OPEN_EXT_OPT_PARAMS_CAPABLE(peer) +- ? stream_getw(s) +- : stream_getc(s); ++ ++ /* ++ * Check the length of the stream to ensure that ++ * FRR can properly read the opt_length. Then read it ++ */ ++ if (BGP_OPEN_EXT_OPT_PARAMS_CAPABLE(peer)) { ++ if (STREAM_READABLE(s) < 2) { ++ zlog_info("%s Option length error", peer->host); ++ bgp_notify_send(peer, BGP_NOTIFY_OPEN_ERR, ++ BGP_NOTIFY_OPEN_MALFORMED_ATTR); ++ return -1; ++ } ++ ++ opt_length = stream_getw(s); ++ } else { ++ if (STREAM_READABLE(s) < 1) { ++ zlog_info("%s Option length error", peer->host); ++ bgp_notify_send(peer, BGP_NOTIFY_OPEN_ERR, ++ BGP_NOTIFY_OPEN_MALFORMED_ATTR); ++ return -1; ++ } ++ ++ opt_length = stream_getc(s); ++ } + + /* Option length check. */ + if (STREAM_READABLE(s) < opt_length) { diff --git a/src/sonic-frr/patch/0028-bgpd-Ensure-that-bgp-open-message-stream-has-enough-data-to-read.patch b/src/sonic-frr/patch/0028-bgpd-Ensure-that-bgp-open-message-stream-has-enough-data-to-read.patch new file mode 100644 index 000000000000..73fcfc30266b --- /dev/null +++ b/src/sonic-frr/patch/0028-bgpd-Ensure-that-bgp-open-message-stream-has-enough-data-to-read.patch @@ -0,0 +1,47 @@ +From 766eec1b7accffe2c04a5c9ebb14e9f487bb9f78 Mon Sep 17 00:00:00 2001 +From: Donald Sharp +Date: Wed, 2 Nov 2022 13:24:48 -0400 +Subject: [PATCH] bgpd: Ensure that bgp open message stream has enough data to + read + +If a operator receives an invalid packet that is of insufficient size +then it is possible for BGP to assert during reading of the packet +instead of gracefully resetting the connection with the peer. + +Signed-off-by: Donald Sharp +--- + bgpd/bgp_packet.c | 19 +++++++++++++++++++ + 1 file changed, 19 insertions(+) + +diff --git a/bgpd/bgp_packet.c b/bgpd/bgp_packet.c +index 769f9613da8..72d6a923175 100644 +--- a/bgpd/bgp_packet.c ++++ b/bgpd/bgp_packet.c +@@ -1386,8 +1386,27 @@ static int bgp_open_receive(struct peer *peer, bgp_size_t size) + || CHECK_FLAG(peer->flags, PEER_FLAG_EXTENDED_OPT_PARAMS)) { + uint8_t opttype; + ++ if (STREAM_READABLE(peer->curr) < 1) { ++ flog_err( ++ EC_BGP_PKT_OPEN, ++ "%s: stream does not have enough bytes for extended optional parameters", ++ peer->host); ++ bgp_notify_send(peer, BGP_NOTIFY_OPEN_ERR, ++ BGP_NOTIFY_OPEN_MALFORMED_ATTR); ++ return BGP_Stop; ++ } ++ + opttype = stream_getc(peer->curr); + if (opttype == BGP_OPEN_NON_EXT_OPT_TYPE_EXTENDED_LENGTH) { ++ if (STREAM_READABLE(peer->curr) < 2) { ++ flog_err( ++ EC_BGP_PKT_OPEN, ++ "%s: stream does not have enough bytes to read the extended optional parameters optlen", ++ peer->host); ++ bgp_notify_send(peer, BGP_NOTIFY_OPEN_ERR, ++ BGP_NOTIFY_OPEN_MALFORMED_ATTR); ++ return BGP_Stop; ++ } + optlen = stream_getw(peer->curr); + SET_FLAG(peer->sflags, + PEER_STATUS_EXT_OPT_PARAMS_LENGTH); diff --git a/src/sonic-frr/patch/series b/src/sonic-frr/patch/series index 5bee50310f5c..7fef7127fb8f 100644 --- a/src/sonic-frr/patch/series +++ b/src/sonic-frr/patch/series @@ -11,3 +11,5 @@ Disable-ipv6-src-address-test-in-pceplib.patch 0010-zebra-Note-when-the-netlink-DUMP-command-is-interrup.patch 0011-bgpd-enhanced-capability-is-always-turned-on-for-int.patch 0012-Ensure-ospf_apiclient_lsa_originate-cannot-accidently-write-into-stack.patch +0027-bgpd-Ensure-FRR-has-enough-data-to-read-in-peek_for_as4_capability-and-bgp_open_option_parse.patch +0028-bgpd-Ensure-that-bgp-open-message-stream-has-enough-data-to-read.patch From 9d3ee142083931ca8b20466cabac44575ab2eb1a Mon Sep 17 00:00:00 2001 From: Tejaswini Chadaga <85581939+tjchadaga@users.noreply.github.com> Date: Wed, 21 Jun 2023 17:17:17 -0700 Subject: [PATCH 184/193] [202205] Update Broadcom DNX SAI version to 7.1.50.4 (#15561) DNX fixes: CS00012287482 - support for 1024 LAGs on DNX Other changes (XGS fixes) SID - L3 multicast packet drop due to wrong VFI derivation - SDK-350470 SID - SIGSEGV in linkscan callback delivery - SDK-287578 SID - Repeated VXLAN calls deletes vlan translation action profile SDK-313980 SER - error in IS_TDM_CALENDAR0/1 can cause traffic hit in TH SID - L2_ENTRY Table Lookups May Miss [CSP CS00012275452] sai_object_type_get_availability failed with SAI_STATUS_INVALID_PARAMETER --- platform/broadcom/sai.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platform/broadcom/sai.mk b/platform/broadcom/sai.mk index ad318414ac60..8782388137c4 100644 --- a/platform/broadcom/sai.mk +++ b/platform/broadcom/sai.mk @@ -1,5 +1,5 @@ LIBSAIBCM_XGS_VERSION = 7.1.36.4 -LIBSAIBCM_DNX_VERSION = 7.1.42.4 +LIBSAIBCM_DNX_VERSION = 7.1.50.4 LIBSAIBCM_BRANCH_NAME = REL_7.0_202205 LIBSAIBCM_XGS_URL_PREFIX = "https://sonicstorage.blob.core.windows.net/public/sai/bcmsai/$(LIBSAIBCM_BRANCH_NAME)/$(LIBSAIBCM_XGS_VERSION)" LIBSAIBCM_DNX_URL_PREFIX = "https://sonicstorage.blob.core.windows.net/public/sai/bcmsai/$(LIBSAIBCM_BRANCH_NAME)/$(LIBSAIBCM_DNX_VERSION)" From 30392c7917add7f262feec585e62ea9802e90f55 Mon Sep 17 00:00:00 2001 From: mssonicbld <79238446+mssonicbld@users.noreply.github.com> Date: Thu, 22 Jun 2023 08:25:02 +0800 Subject: [PATCH 185/193] [submodule] Update submodule sonic-telemetry to the latest HEAD automatically (#15544) src/sonic-telemetry * 0b8843c - (HEAD -> 202205, origin/202205) Merge pull request #120 from zbud-msft/202205_divide_by_zero (3 hours ago) [Ying Xie] | * 015defa - Merge branch '202205' into 202205_divide_by_zero (5 hours ago) [Zain Budhwani] * | de2124b - Change log level (5 hours ago) [zbud-msft] * | f203be5 - Add logs for md5 checksum (#80) (5 hours ago) [Zain Budhwani] | * ea6c84b - Merge branch '202205' into 202205_divide_by_zero (31 hours ago) [Zain Budhwani] * | ab98380 - Fix sonic-mgmt-common version to ec32690 in pipeline (#123) (34 hours ago) [Sachin Holla] * 5fcecef - Merge branch '202205' into 202205_divide_by_zero (4 days ago) [Ying Xie] * 09c8bfc - Merge branch '202205' into 202205_divide_by_zero (11 days ago) [Zain Budhwani] * 21b9bc8 - Fix crash when retrieving cpu utilization (#70) (#71) (11 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 a4bfafe9a137..0b8843c32001 160000 --- a/src/sonic-telemetry +++ b/src/sonic-telemetry @@ -1 +1 @@ -Subproject commit a4bfafe9a137f1018831e5d0743edd756f38ddd5 +Subproject commit 0b8843c3200179d3ff6215df7050f3dbe28949f4 From 5db1a495a135ebc95e4a6db8a279c59efeac1db9 Mon Sep 17 00:00:00 2001 From: mssonicbld <79238446+mssonicbld@users.noreply.github.com> Date: Thu, 22 Jun 2023 08:25:31 +0800 Subject: [PATCH 186/193] [ci/build]: Upgrade SONiC package versions (#15525) --- files/build/versions/default/versions-docker | 24 ++++----- files/build/versions/default/versions-git | 16 +++--- files/build/versions/default/versions-mirror | 22 ++++---- files/build/versions/default/versions-web | 2 +- .../versions-deb-bullseye | 1 - .../docker-base-buster/versions-deb-buster | 10 ++-- .../docker-fpm-frr/versions-deb-bullseye | 2 +- .../dockers/docker-nat/versions-deb-buster | 4 +- .../dockers/docker-ptf/versions-deb-buster | 16 +++--- .../dockers/docker-sflow/versions-deb-buster | 4 +- .../versions-deb-buster | 4 +- .../docker-sonic-vs/versions-deb-buster | 2 +- .../docker-syncd-bfn-rpc/versions-deb-buster | 2 +- .../versions-deb-buster | 2 +- .../docker-syncd-centec/versions-deb-buster | 4 +- .../docker-syncd-vs/versions-deb-buster | 4 +- .../versions-deb-bullseye | 19 ++++--- .../sonic-slave-buster/versions-deb-buster | 52 +++++++++---------- .../versions/host-image/versions-deb-bullseye | 2 +- 19 files changed, 95 insertions(+), 97 deletions(-) diff --git a/files/build/versions/default/versions-docker b/files/build/versions/default/versions-docker index 88fb88010ad2..5fee8d25ae02 100644 --- a/files/build/versions/default/versions-docker +++ b/files/build/versions/default/versions-docker @@ -1,12 +1,12 @@ -amd64:amd64/debian:bullseye==sha256:1bf0e24813ee8306c3fba1fe074793eb91c15ee580b61fff7f3f41662bc0031d -amd64:amd64/debian:buster==sha256:a067a9e8b39d5f19659b3bc9fd4348f6319afabd0d6ba1fe3b43df108926ea92 -amd64:debian:bullseye==sha256:432f545c6ba13b79e2681f4cc4858788b0ab099fc1cca799cc0fae4687c69070 -amd64:debian:buster==sha256:322859539526a04978dee1a2575b515295f6706f17d280f877a634299a7c1414 -arm64:arm64v8/debian:bullseye==sha256:0d1881fd981442bd6721e0e4ff40eb0ba705475c3a8469482ccee9029af56ebf -arm64:arm64v8/debian:buster==sha256:62a3eb2f5ace2f8415171855a84375616cb3cdb60b799d1811c3fda923b8dfbc -arm64:debian:bullseye==sha256:432f545c6ba13b79e2681f4cc4858788b0ab099fc1cca799cc0fae4687c69070 -arm64:debian:buster==sha256:322859539526a04978dee1a2575b515295f6706f17d280f877a634299a7c1414 -armhf:arm32v7/debian:bullseye==sha256:16aa677e45937a8c9f2e5a932ff1a611bc85b6416e47ab66532e05af2c08e066 -armhf:arm32v7/debian:buster==sha256:5340ee96c308b59f4590ec929adeeaf61ffe5a0758adcba09d0595a6619c3462 -armhf:debian:bullseye==sha256:432f545c6ba13b79e2681f4cc4858788b0ab099fc1cca799cc0fae4687c69070 -armhf:debian:buster==sha256:322859539526a04978dee1a2575b515295f6706f17d280f877a634299a7c1414 \ No newline at end of file +amd64:amd64/debian:bullseye==sha256:1e8185ca8683c04e6c23cc7bb21b564d54faeb7e20852a6068c85cbdd7bac531 +amd64:amd64/debian:buster==sha256:108052254277ea53cd807d2782ed3cbe4b9242256af5c7519c6e5692ae2b5d97 +amd64:debian:bullseye==sha256:1e5f2d70c9441c971607727f56d0776fb9eecf23cd37b595b26db7a974b2301d +amd64:debian:buster==sha256:28842e4895d36e67c49015c0b41089fa3248e865c76994b19f706ab91e800b95 +arm64:arm64v8/debian:bullseye==sha256:0f56dd5a1687619972eeb539b273b4f3ec04431db69d4b569c2ce6ef48478538 +arm64:arm64v8/debian:buster==sha256:25bb297f257d6422b3aa44891469abc07e63096ea721da57002f0297ddcc599c +arm64:debian:bullseye==sha256:1e5f2d70c9441c971607727f56d0776fb9eecf23cd37b595b26db7a974b2301d +arm64:debian:buster==sha256:28842e4895d36e67c49015c0b41089fa3248e865c76994b19f706ab91e800b95 +armhf:arm32v7/debian:bullseye==sha256:93effc32fdca33aebfcef7225219dde573daebd3e1ddd09ab21e635887271096 +armhf:arm32v7/debian:buster==sha256:626ee3ce3a78f7a900fc5a99bfdbb44297f1c943a4fe261de4ec3fb4a23266bd +armhf:debian:bullseye==sha256:1e5f2d70c9441c971607727f56d0776fb9eecf23cd37b595b26db7a974b2301d +armhf:debian:buster==sha256:28842e4895d36e67c49015c0b41089fa3248e865c76994b19f706ab91e800b95 \ No newline at end of file diff --git a/files/build/versions/default/versions-git b/files/build/versions/default/versions-git index 2f7ee2bbc712..b41b6bb440f5 100644 --- a/files/build/versions/default/versions-git +++ b/files/build/versions/default/versions-git @@ -1,24 +1,24 @@ -https://chromium.googlesource.com/chromium/tools/depot_tools.git==df2f11113c23d65c1fd7824b7ab3c55f7cfb9604 +https://chromium.googlesource.com/chromium/tools/depot_tools.git==522e12caff136406943edbf7c025821681c05749 https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f https://github.com/CESNET/libyang.git==ea94c8b9f513f8a6ddc6ce1540fa41eaf4c8922a https://github.com/daveolson53/audisp-tacplus.git==559c9f22edd4f2dea0ecedffb3ad9502b12a75b6 https://github.com/daveolson53/libnss-tacplus.git==19008ab68d9d504aa58eb34d5f564755a1613b8b https://github.com/dyninc/OpenBFDD.git==e35f43ad8d2b3f084e96a84c392528a90d05a287 -https://github.com/flashrom/flashrom.git==c7812231bd5c69956ef8d97315e8e2f306d1c550 -https://github.com/FreeRADIUS/freeradius-server.git==fe2ea7b89312774ce007a2fdc0da27fd41f29a89 +https://github.com/flashrom/flashrom.git==885f7923265e4e48f4bfc109f3723bb9167b75bc +https://github.com/FreeRADIUS/freeradius-server.git==7832608debf040d46117012a547475ae79c99c8d https://github.com/FreeRADIUS/pam_radius.git==8d373539bb9f13b0abfe8bcae0095a930a00fad0 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==9dbae444204a2c27b33be698ce497d55926b8893 +https://github.com/Marvell-switching/mrvl-prestera.git==179c08b0544db0b3a95a843e31266e00a68fb4b0 https://github.com/Mellanox/libpsample.git==62bb27d9a49424e45191eee81df7ce0d8c74e774 -https://github.com/opencomputeproject/SAI.git==fdaf928679dfa53ae21690f963b9b1f80032f2bf +https://github.com/opencomputeproject/SAI.git==e06d81e955ef7be957226f80ba98363b61595dfc https://github.com/p4lang/scapy-vxlan.git==85ffe83da156568ee47a0750f638227e6e1d7479 -https://github.com/sflow/host-sflow==b9b61bc037aed4d3d0fac6b0b4d88bc78b7b485d +https://github.com/sflow/host-sflow==4dc68a95fa57758119d76e42965b32493ffd7094 https://github.com/sflow/sflowtool==4ce1223bb4c2cd0cbb1dd688dc0914561fcbb6c4 https://github.com/thom311/libnl==cbafad9ddf24caef5230fef715d34f0539603be0 https://salsa.debian.org/debian/libteam.git==48142125234a665ad5367b724af36a58fb484d3d -https://salsa.debian.org/kernel-team/ethtool/==532e36ef02837c78df47f8d561aa04b5cfed438f +https://salsa.debian.org/kernel-team/ethtool/==581ffbde5b349852a56fa581f7b512a755c33e26 https://salsa.debian.org/kernel-team/initramfs-tools.git==193dfbb7929e518976f89f6c8dd9201982e56f80 https://salsa.debian.org/sk-guest/monit.git==c9da7ebb1f35dfba17b50b5969a6e75e29cbec0d -https://salsa.debian.org/ssh-team/openssh.git==4cb9ac54235e8f90a590a976e1404480fb521930 \ No newline at end of file +https://salsa.debian.org/ssh-team/openssh.git==74d15e80b8730335a9b13469ca6cafe4c1c8e485 \ No newline at end of file diff --git a/files/build/versions/default/versions-mirror b/files/build/versions/default/versions-mirror index a1c3ae07e191..34a15c76573c 100644 --- a/files/build/versions/default/versions-mirror +++ b/files/build/versions/default/versions-mirror @@ -1,15 +1,15 @@ deb.nodesource.com_node%5f14.x_dists_bullseye==2023-02-17T00:35:28Z deb.nodesource.com_node%5f14.x_dists_buster==2023-02-17T00:35:28Z -debian==20230604T000128Z -debian-security==20230604T000129Z -download.docker.com_linux_debian_dists_bullseye==2023-05-26T07:49:37Z +debian==20230620T000414Z +debian-security==20230620T000233Z +download.docker.com_linux_debian_dists_bullseye==2023-06-09T17:17:20Z download.docker.com_linux_debian_dists_buster==2023-05-26T07:49:38Z packages.microsoft.com_repos_sonic-dev_dists_jessie==2022-10-31T19:34:29Z -packages.trafficmanager.net_snapshot_debian-security_20230604T000129Z_dists_bullseye-security==2023-06-03T16:23:43Z -packages.trafficmanager.net_snapshot_debian-security_20230604T000129Z_dists_buster_updates==2023-06-03T16:23:43Z -packages.trafficmanager.net_snapshot_debian_20230604T000128Z_dists_bullseye==2023-04-29T09:31:02Z -packages.trafficmanager.net_snapshot_debian_20230604T000128Z_dists_bullseye-backports==2023-06-03T20:10:57Z -packages.trafficmanager.net_snapshot_debian_20230604T000128Z_dists_bullseye-updates==2023-06-03T20:10:57Z -packages.trafficmanager.net_snapshot_debian_20230604T000128Z_dists_buster==2022-09-10T11:30:54Z -packages.trafficmanager.net_snapshot_debian_20230604T000128Z_dists_buster-backports==2023-06-03T20:10:57Z -packages.trafficmanager.net_snapshot_debian_20230604T000128Z_dists_buster-updates==2023-06-03T20:10:57Z \ No newline at end of file +packages.trafficmanager.net_snapshot_debian-security_20230620T000233Z_dists_bullseye-security==2023-06-19T23:23:18Z +packages.trafficmanager.net_snapshot_debian-security_20230620T000233Z_dists_buster_updates==2023-06-19T23:23:18Z +packages.trafficmanager.net_snapshot_debian_20230620T000414Z_dists_bullseye==2023-06-10T08:52:21Z +packages.trafficmanager.net_snapshot_debian_20230620T000414Z_dists_bullseye-backports==2023-06-19T20:13:05Z +packages.trafficmanager.net_snapshot_debian_20230620T000414Z_dists_bullseye-updates==2023-06-19T20:13:05Z +packages.trafficmanager.net_snapshot_debian_20230620T000414Z_dists_buster==2023-06-10T08:53:33Z +packages.trafficmanager.net_snapshot_debian_20230620T000414Z_dists_buster-backports==2023-06-19T20:13:05Z +packages.trafficmanager.net_snapshot_debian_20230620T000414Z_dists_buster-updates==2023-06-10T08:55:10Z \ No newline at end of file diff --git a/files/build/versions/default/versions-web b/files/build/versions/default/versions-web index a4ea405623d6..7dca3dea092c 100644 --- a/files/build/versions/default/versions-web +++ b/files/build/versions/default/versions-web @@ -72,7 +72,7 @@ https://github.com/nanomsg/nanomsg/archive/1.0.0.tar.gz==6f56ef28c93cee644e8c4aa https://launchpad.net/debian/+archive/primary/+sourcefiles/bash/5.1-2/bash_5.1-2.debian.tar.xz==9d0cbd5f463f461c840c95f62a64d61b https://launchpad.net/debian/+archive/primary/+sourcefiles/bash/5.1-2/bash_5.1-2.dsc==be44c5a9fc12fb567a486f54b842dd9e https://launchpad.net/debian/+archive/primary/+sourcefiles/bash/5.1-2/bash_5.1.orig.tar.xz==6ddb13b6111f601db08fc7c72afa0263 -https://github.com/raw/p4lang/ptf/master/ptf_nn/ptf_nn_agent.py==628956b660575965429cec84b1778816 +https://github.com/raw/p4lang/ptf/master/ptf_nn/ptf_nn_agent.py==963c345c75fe5c5bdedc05ed98a5fd1f 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_5.10.140-1.debian.tar.xz==9813a002af43da3a5be05f3d31e85328 https://sonicstorage.blob.core.windows.net/debian-security/pool/updates/main/l/linux/linux_5.10.140-1.dsc==84ab224b073f97978802d9f998248fcc diff --git a/files/build/versions/dockers/docker-base-bullseye/versions-deb-bullseye b/files/build/versions/dockers/docker-base-bullseye/versions-deb-bullseye index dafee34b3d80..5de4c222ef8f 100644 --- a/files/build/versions/dockers/docker-base-bullseye/versions-deb-bullseye +++ b/files/build/versions/dockers/docker-base-bullseye/versions-deb-bullseye @@ -48,7 +48,6 @@ libsodium23==1.0.18-1 libsqlite3-0==3.34.1-3 libssh2-1==1.9.0-2 libssl-dev==1.1.1n-0+deb11u4+fips -libssl1.1==1.1.1n-0+deb11u4+fips libwrap0==7.6.q-31 libxtables12==1.8.7-1 libzmq5==4.3.4-1 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 46757c2935f4..97c8bd53e8bd 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+deb10u2 libssh2-1==1.8.0-2.1 -libssl1.1==1.1.1n-0+deb10u4 +libssl1.1==1.1.1n-0+deb10u5 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+deb10u4 +openssl==1.1.1n-0+deb10u5 perl==5.28.1-6+deb10u1 perl-modules-5.28==5.28.1-6+deb10u1 procps==2:3.3.15-2 @@ -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.4.1-3 -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 +vim-common==2:8.1.0875-5+deb10u5 +vim-tiny==2:8.1.0875-5+deb10u5 +xxd==2:8.1.0875-5+deb10u5 \ No newline at end of file diff --git a/files/build/versions/dockers/docker-fpm-frr/versions-deb-bullseye b/files/build/versions/dockers/docker-fpm-frr/versions-deb-bullseye index 479f7e112a22..9e6777c12bf6 100644 --- a/files/build/versions/dockers/docker-fpm-frr/versions-deb-bullseye +++ b/files/build/versions/dockers/docker-fpm-frr/versions-deb-bullseye @@ -7,7 +7,7 @@ gdb==10.1-1.7 gdbserver==10.1-1.7 libbabeltrace1==1.5.8-1+b3 libboost-regex1.74.0==1.74.0-9 -libc-ares2==1.17.1-1+deb11u2 +libc-ares2==1.17.1-1+deb11u3 libcbor0==0.5.0+dfsg-2 libcurl3-gnutls==7.74.0-1.3+deb11u7 libdebuginfod1==0.183-1 diff --git a/files/build/versions/dockers/docker-nat/versions-deb-buster b/files/build/versions/dockers/docker-nat/versions-deb-buster index 8273d568ebcb..04302e824a47 100644 --- a/files/build/versions/dockers/docker-nat/versions-deb-buster +++ b/files/build/versions/dockers/docker-nat/versions-deb-buster @@ -24,5 +24,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+deb10u4 -vim-runtime==2:8.1.0875-5+deb10u4 \ No newline at end of file +vim==2:8.1.0875-5+deb10u5 +vim-runtime==2:8.1.0875-5+deb10u5 \ No newline at end of file diff --git a/files/build/versions/dockers/docker-ptf/versions-deb-buster b/files/build/versions/dockers/docker-ptf/versions-deb-buster index d70e17e82d2c..90c2bb5453c6 100644 --- a/files/build/versions/dockers/docker-ptf/versions-deb-buster +++ b/files/build/versions/dockers/docker-ptf/versions-deb-buster @@ -285,8 +285,8 @@ libsigsegv2==2.12-2 libsm6==2:1.2.3-1 libsqlite3-0==3.27.2-3+deb10u2 libssh2-1==1.8.0-2.1 -libssl-dev==1.1.1n-0+deb10u4 -libssl1.1==1.1.1n-0+deb10u4 +libssl-dev==1.1.1n-0+deb10u5 +libssl1.1==1.1.1n-0+deb10u5 libstdc++-8-dev==8.3.0-6 libsynctex2==2018.20181218.49446-1+deb10u2 libsystemd0==241-7~deb10u9 @@ -355,7 +355,7 @@ libxml-xpathengine-perl==0.14-1 libxml2==2.9.4+dfsg1-7+deb10u6 libxmu6==2:1.1.2-2+b3 libxmuu1==2:1.1.2-2+b3 -libxpm4==1:3.5.12-1 +libxpm4==1:3.5.12-1+deb10u1 libxrandr2==2:1.5.1-1 libxrender1==1:0.9.10-1 libxshmfence1==1.3-1 @@ -388,7 +388,7 @@ ntpstat==0.0.0.1-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+deb10u4 +openssl==1.1.1n-0+deb10u5 patch==2.7.6-3+deb10u1 perl==5.28.1-6+deb10u1 perl-modules-5.28==5.28.1-6+deb10u1 @@ -487,9 +487,9 @@ ttf-bitstream-vera==1.10-8 tzdata==2021a-0+deb10u11 ucf==3.0038+nmu1 unzip==6.0-23+deb10u3 -vim==2:8.1.0875-5+deb10u4 -vim-common==2:8.1.0875-5+deb10u4 -vim-runtime==2:8.1.0875-5+deb10u4 +vim==2:8.1.0875-5+deb10u5 +vim-common==2:8.1.0875-5+deb10u5 +vim-runtime==2:8.1.0875-5+deb10u5 wget==1.20.1-1.1 x11-common==1:7.7+19 x11-utils==7.7+4 @@ -499,6 +499,6 @@ 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 -xxd==2:8.1.0875-5+deb10u4 +xxd==2:8.1.0875-5+deb10u5 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/dockers/docker-sflow/versions-deb-buster b/files/build/versions/dockers/docker-sflow/versions-deb-buster index 9b35def629ea..506cd2be984d 100644 --- a/files/build/versions/dockers/docker-sflow/versions-deb-buster +++ b/files/build/versions/dockers/docker-sflow/versions-deb-buster @@ -18,5 +18,5 @@ psample==1.1-1 sflowtool==5.04 sshpass==1.06-1 strace==4.26-0.2 -vim==2:8.1.0875-5+deb10u4 -vim-runtime==2:8.1.0875-5+deb10u4 \ No newline at end of file +vim==2:8.1.0875-5+deb10u5 +vim-runtime==2:8.1.0875-5+deb10u5 \ 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 74a4b2dedb41..193eec79d8cf 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 @@ -55,5 +55,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+deb10u4 -vim-runtime==2:8.1.0875-5+deb10u4 \ No newline at end of file +vim==2:8.1.0875-5+deb10u5 +vim-runtime==2:8.1.0875-5+deb10u5 \ 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 f448201f57d9..af2da1d2d477 100644 --- a/files/build/versions/dockers/docker-sonic-vs/versions-deb-buster +++ b/files/build/versions/dockers/docker-sonic-vs/versions-deb-buster @@ -138,7 +138,7 @@ libselinux1-dev==2.8-1+b1 libsepol1-dev==2.8-1 libsm-dev==2:1.2.3-1 libsm6==2:1.2.3-1 -libssl-dev==1.1.1n-0+deb10u4 +libssl-dev==1.1.1n-0+deb10u5 libstdc++-8-dev==8.3.0-6 libsystemd-dev==241-7~deb10u9 libsystemd0==241-7~deb10u9 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 77c3f6af811d..606b9f5e72fe 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+deb10u5 libqt5network5==5.11.3+dfsg1-1+deb10u5 libquadmath0==8.3.0-6 librhash0==1.3.8-1 -libssl-dev==1.1.1n-0+deb10u4 +libssl-dev==1.1.1n-0+deb10u5 libstdc++-8-dev==8.3.0-6 libthrift0==0.14.1 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 f0ae6faa5266..a12fc452f264 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 @@ -49,7 +49,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+deb10u4 +libssl-dev==1.1.1n-0+deb10u5 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 b/files/build/versions/dockers/docker-syncd-centec/versions-deb-buster index 697fbed945ba..0521833afde1 100644 --- a/files/build/versions/dockers/docker-syncd-centec/versions-deb-buster +++ b/files/build/versions/dockers/docker-syncd-centec/versions-deb-buster @@ -21,5 +21,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+deb10u4 -vim-runtime==2:8.1.0875-5+deb10u4 \ No newline at end of file +vim==2:8.1.0875-5+deb10u5 +vim-runtime==2:8.1.0875-5+deb10u5 \ 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 69991139fbab..d190a6829961 100644 --- a/files/build/versions/dockers/docker-syncd-vs/versions-deb-buster +++ b/files/build/versions/dockers/docker-syncd-vs/versions-deb-buster @@ -25,5 +25,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+deb10u4 -vim-runtime==2:8.1.0875-5+deb10u4 \ No newline at end of file +vim==2:8.1.0875-5+deb10u5 +vim-runtime==2:8.1.0875-5+deb10u5 \ No newline at end of file diff --git a/files/build/versions/dockers/sonic-slave-bullseye/versions-deb-bullseye b/files/build/versions/dockers/sonic-slave-bullseye/versions-deb-bullseye index e288388b0e0e..906d7b5048ea 100644 --- a/files/build/versions/dockers/sonic-slave-bullseye/versions-deb-bullseye +++ b/files/build/versions/dockers/sonic-slave-bullseye/versions-deb-bullseye @@ -355,8 +355,8 @@ libbsd-dev==0.11.3-1 libbsd0==0.11.3-1 libbsh-java==2.0b4-20 libbz2-dev==1.0.8-4 -libc-ares-dev==1.17.1-1+deb11u2 -libc-ares2==1.17.1-1+deb11u2 +libc-ares-dev==1.17.1-1+deb11u3 +libc-ares2==1.17.1-1+deb11u3 libc-dev-bin==2.31-13+deb11u6 libc-devtools==2.31-13+deb11u6 libc-l10n==2.31-13+deb11u6 @@ -1105,7 +1105,6 @@ libsrt1.4-gnutls==1.4.2-1.3 libssh-gcrypt-4==0.9.7-0+deb11u1 libssh2-1==1.9.0-2 libssl-dev==1.1.1n-0+deb11u5 -libssl1.1==1.1.1n-0+deb11u5 libstdc++-10-dev==10.2.1-6 libstemmer0d==2.1.0-1 libstrictures-perl==2.000006-1 @@ -1460,13 +1459,13 @@ php-timer==5.0.3-2 php-tokenizer==1.2.0-1 php-webmozart-assert==1.9.1-2 php-xml==2:7.4+76 -php7.4-cli==7.4.33-1+deb11u3 -php7.4-common==7.4.33-1+deb11u3 -php7.4-json==7.4.33-1+deb11u3 -php7.4-mbstring==7.4.33-1+deb11u3 -php7.4-opcache==7.4.33-1+deb11u3 -php7.4-readline==7.4.33-1+deb11u3 -php7.4-xml==7.4.33-1+deb11u3 +php7.4-cli==7.4.33-1+deb11u4 +php7.4-common==7.4.33-1+deb11u4 +php7.4-json==7.4.33-1+deb11u4 +php7.4-mbstring==7.4.33-1+deb11u4 +php7.4-opcache==7.4.33-1+deb11u4 +php7.4-readline==7.4.33-1+deb11u4 +php7.4-xml==7.4.33-1+deb11u4 phpunit==9.5.2-1 phpunit-cli-parser==1.0.1-1 phpunit-code-unit==1.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 e4cac0f64a26..b418d9ebe921 100644 --- a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster +++ b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster @@ -53,7 +53,7 @@ comerr-dev==2.1-1.44.5-1+deb10u3 containerd.io==1.6.21-1 cowbuilder==0.88 cowdancer==0.88 -cpio==2.12+dfsg-9 +cpio==2.12+dfsg-9+deb10u1 cpp==4:8.3.0-1 cpp-8==8.3.0-6 cppcheck==1.86-1 @@ -275,10 +275,10 @@ 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 -libavfilter7==7:4.1.10-0+deb10u1 -libavformat58==7:4.1.10-0+deb10u1 -libavutil56==7:4.1.10-0+deb10u1 +libavcodec58==7:4.1.11-0+deb10u1 +libavfilter7==7:4.1.11-0+deb10u1 +libavformat58==7:4.1.11-0+deb10u1 +libavutil56==7:4.1.11-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 @@ -764,9 +764,9 @@ libmagickcore-6.q16-6-extra==8:6.9.10.23+dfsg-2.1+deb10u5 libmagickwand-6.q16-6==8:6.9.10.23+dfsg-2.1+deb10u5 libmail-sendmail-perl==0.80-1 libmailtools-perl==2.18-1 -libmariadb-dev==1:10.3.38-0+deb10u1 -libmariadb-dev-compat==1:10.3.38-0+deb10u1 -libmariadb3==1:10.3.38-0+deb10u1 +libmariadb-dev==1:10.3.39-0+deb10u1 +libmariadb-dev-compat==1:10.3.39-0+deb10u1 +libmariadb3==1:10.3.39-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 @@ -945,7 +945,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.10-0+deb10u1 +libpostproc55==7:4.1.11-0+deb10u1 libpotrace0==1.15-1 libprocps7==2:3.3.15-2 libprotobuf-c1==1.3.1-1+b1 @@ -1036,7 +1036,7 @@ 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 +libruby2.5==2.5.5-3+deb10u6 libsamplerate0==0.1.9-2 libsasl2-2==2.1.27+dfsg-1+deb10u2 libsasl2-modules==2.1.27+dfsg-1+deb10u2 @@ -1089,8 +1089,8 @@ libsqlite3-0==3.27.2-3+deb10u2 libsratom-0-0==0.6.0~dfsg0-1 libssh-gcrypt-4==0.8.7-1+deb10u2 libssh2-1==1.8.0-2.1 -libssl-dev==1.1.1n-0+deb10u4 -libssl1.1==1.1.1n-0+deb10u4 +libssl-dev==1.1.1n-0+deb10u5 +libssl1.1==1.1.1n-0+deb10u5 libstdc++-8-dev==8.3.0-6 libstemmer0d==0+svn585-1+b2 libstrictures-perl==2.000005-1 @@ -1108,8 +1108,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.10-0+deb10u1 -libswscale5==7:4.1.10-0+deb10u1 +libswresample3==7:4.1.11-0+deb10u1 +libswscale5==7:4.1.11-0+deb10u1 libsynctex2==2018.20181218.49446-1+deb10u2 libsys-hostname-long-perl==1.5-1 libsystemd-dev==241-7~deb10u9 @@ -1317,7 +1317,7 @@ 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 +libxpm4==1:3.5.12-1+deb10u1 libxrandr-dev==2:1.5.1-1 libxrandr2==2:1.5.1-1 libxrender-dev==1:0.9.10-1 @@ -1378,7 +1378,7 @@ man-db==2.8.5-2 man2html-base==1.6g-11 manpages==4.16-2 manpages-dev==4.16-2 -mariadb-common==1:10.3.38-0+deb10u1 +mariadb-common==1:10.3.39-0+deb10u1 maven==3.6.0-1 maven-debian-helper==2.3.2 maven-repo-helper==1.9.3 @@ -1405,7 +1405,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.1n-0+deb10u4 +openssl==1.1.1n-0+deb10u5 ovmf==0~20181115.85588389-3+deb10u3 packagekit==1.1.12-5 packagekit-tools==1.1.12-5 @@ -1546,7 +1546,7 @@ 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-requests==2.21.0-1+deb10u1 python-roman==2.0.0-3 python-scandir==1.9.0-2 python-secretstorage==2.3.1-2 @@ -1630,7 +1630,7 @@ 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-requests==2.21.0-1+deb10u1 python3-roman==2.0.0-3 python3-secretstorage==2.3.1-2 python3-setuptools==40.8.0-1 @@ -1683,9 +1683,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+deb10u4 -ruby2.5-dev==2.5.5-3+deb10u4 -ruby2.5-doc==2.5.5-3+deb10u4 +ruby2.5==2.5.5-3+deb10u6 +ruby2.5-dev==2.5.5-3+deb10u6 +ruby2.5-doc==2.5.5-3+deb10u6 rubygems-integration==1.11+deb10u1 sbsigntool==0.9.2-2 seabios==1.12.0-1 @@ -1740,9 +1740,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+deb10u4 -vim-common==2:8.1.0875-5+deb10u4 -vim-runtime==2:8.1.0875-5+deb10u4 +vim==2:8.1.0875-5+deb10u5 +vim-common==2:8.1.0875-5+deb10u5 +vim-runtime==2:8.1.0875-5+deb10u5 wayland-protocols==1.17-1 wdiff==1.2.2-2+b1 wget==1.20.1-1.1 @@ -1774,7 +1774,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+deb10u4 +xxd==2:8.1.0875-5+deb10u5 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/host-image/versions-deb-bullseye b/files/build/versions/host-image/versions-deb-bullseye index 13df298ca2f3..d7947047e6d5 100644 --- a/files/build/versions/host-image/versions-deb-bullseye +++ b/files/build/versions/host-image/versions-deb-bullseye @@ -106,7 +106,7 @@ libbpf0==1:0.3-2 libbrotli-dev==1.0.9-2+b2 libbrotli1==1.0.9-2+b2 libbsd0==0.11.3-1 -libc-ares2==1.17.1-1+deb11u2 +libc-ares2==1.17.1-1+deb11u3 libc-dev-bin==2.31-13+deb11u6 libc-l10n==2.31-13+deb11u6 libc6-dev==2.31-13+deb11u6 From 41cd22d04e2252d421ce1e154260e3fc3cd4ea17 Mon Sep 17 00:00:00 2001 From: vmittal-msft <46945843+vmittal-msft@users.noreply.github.com> Date: Thu, 22 Jun 2023 08:17:45 -0700 Subject: [PATCH 187/193] Updated default ECN settings for T2 chassis (#15541) * Updated default ECN settings for T2 chassis (#14388) Why I did it Update ECN settings for T2 chassis How I did it Updated qos config file to load these settings during switch bootup How to verify it Verified on line card on T2 chassis * Fix for test failures * Test case failures * test case fix --- .../Arista-7800R3-48CQ2-C48/qos.json.j2 | 20 +++++++++++++++++++ .../Arista-7800R3-48CQM2-C48/qos.json.j2 | 20 +++++++++++++++++++ .../Arista-7800R3A-36D2-C36/0/qos.json.j2 | 20 +++++++++++++++++++ .../Arista-7800R3A-36D2-C36/1/qos.json.j2 | 20 +++++++++++++++++++ .../Arista-7800R3A-36D2-C72/0/qos.json.j2 | 20 +++++++++++++++++++ .../Arista-7800R3A-36D2-C72/1/qos.json.j2 | 20 +++++++++++++++++++ .../Arista-7800R3A-36D2-D36/0/qos.json.j2 | 20 +++++++++++++++++++ .../Arista-7800R3A-36D2-D36/1/qos.json.j2 | 20 +++++++++++++++++++ .../Nokia-IXR7250E-36x100G/0/qos.json.j2 | 20 +++++++++++++++++++ .../Nokia-IXR7250E-36x100G/1/qos.json.j2 | 20 +++++++++++++++++++ .../Nokia-IXR7250E-36x400G/0/qos.json.j2 | 20 +++++++++++++++++++ .../Nokia-IXR7250E-36x400G/1/qos.json.j2 | 20 +++++++++++++++++++ ...ista-7800r3a-36dm2-c36-lc-t2-minigraph.xml | 2 -- ...ista-7800r3a-36dm2-d36-lc-t2-minigraph.xml | 2 -- ...le-nokia-ixr7250e-36x100g-t2-minigraph.xml | 2 -- ...le-nokia-ixr7250e-36x400g-t2-minigraph.xml | 2 -- .../py2/qos-arista7800r3-48cq2-lc.json | 12 +++++------ .../py2/qos-arista7800r3-48cqm2-lc.json | 12 +++++------ .../py2/qos-arista7800r3a-36dm2-c36-lc.json | 12 +++++------ .../py2/qos-arista7800r3a-36dm2-d36-lc.json | 12 +++++------ .../py2/qos-nokia-ixr7250e-36x100g.json | 12 +++++------ .../py2/qos-nokia-ixr7250e-36x400g.json | 12 +++++------ .../py3/qos-arista7800r3-48cq2-lc.json | 12 +++++------ .../py3/qos-arista7800r3-48cqm2-lc.json | 12 +++++------ .../py3/qos-arista7800r3a-36dm2-c36-lc.json | 12 +++++------ .../py3/qos-arista7800r3a-36dm2-d36-lc.json | 12 +++++------ .../py3/qos-nokia-ixr7250e-36x100g.json | 12 +++++------ .../py3/qos-nokia-ixr7250e-36x400g.json | 12 +++++------ src/sonic-config-engine/tests/test_j2files.py | 2 ++ 29 files changed, 314 insertions(+), 80 deletions(-) diff --git a/device/arista/x86_64-arista_7800r3_48cq2_lc/Arista-7800R3-48CQ2-C48/qos.json.j2 b/device/arista/x86_64-arista_7800r3_48cq2_lc/Arista-7800R3-48CQ2-C48/qos.json.j2 index 3e548325ea30..411942ab526b 100644 --- a/device/arista/x86_64-arista_7800r3_48cq2_lc/Arista-7800R3-48CQ2-C48/qos.json.j2 +++ b/device/arista/x86_64-arista_7800r3_48cq2_lc/Arista-7800R3-48CQ2-C48/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" : "10000000", + "yellow_min_threshold" : "2000000", + "red_max_threshold" : "10000000", + "red_min_threshold" : "2000000", + "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_7800r3_48cqm2_lc/Arista-7800R3-48CQM2-C48/qos.json.j2 b/device/arista/x86_64-arista_7800r3_48cqm2_lc/Arista-7800R3-48CQM2-C48/qos.json.j2 index 3e548325ea30..411942ab526b 100644 --- a/device/arista/x86_64-arista_7800r3_48cqm2_lc/Arista-7800R3-48CQM2-C48/qos.json.j2 +++ b/device/arista/x86_64-arista_7800r3_48cqm2_lc/Arista-7800R3-48CQM2-C48/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" : "10000000", + "yellow_min_threshold" : "2000000", + "red_max_threshold" : "10000000", + "red_min_threshold" : "2000000", + "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_7800r3a_36d2_lc/Arista-7800R3A-36D2-C36/0/qos.json.j2 b/device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-C36/0/qos.json.j2 index 3e548325ea30..411942ab526b 100644 --- a/device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-C36/0/qos.json.j2 +++ b/device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-C36/0/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" : "10000000", + "yellow_min_threshold" : "2000000", + "red_max_threshold" : "10000000", + "red_min_threshold" : "2000000", + "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_7800r3a_36d2_lc/Arista-7800R3A-36D2-C36/1/qos.json.j2 b/device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-C36/1/qos.json.j2 index 3e548325ea30..411942ab526b 100644 --- a/device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-C36/1/qos.json.j2 +++ b/device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-C36/1/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" : "10000000", + "yellow_min_threshold" : "2000000", + "red_max_threshold" : "10000000", + "red_min_threshold" : "2000000", + "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_7800r3a_36d2_lc/Arista-7800R3A-36D2-C72/0/qos.json.j2 b/device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-C72/0/qos.json.j2 index 3e548325ea30..411942ab526b 100644 --- a/device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-C72/0/qos.json.j2 +++ b/device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-C72/0/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" : "10000000", + "yellow_min_threshold" : "2000000", + "red_max_threshold" : "10000000", + "red_min_threshold" : "2000000", + "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_7800r3a_36d2_lc/Arista-7800R3A-36D2-C72/1/qos.json.j2 b/device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-C72/1/qos.json.j2 index 3e548325ea30..411942ab526b 100644 --- a/device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-C72/1/qos.json.j2 +++ b/device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-C72/1/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" : "10000000", + "yellow_min_threshold" : "2000000", + "red_max_threshold" : "10000000", + "red_min_threshold" : "2000000", + "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_7800r3a_36d2_lc/Arista-7800R3A-36D2-D36/0/qos.json.j2 b/device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-D36/0/qos.json.j2 index 3e548325ea30..411942ab526b 100644 --- a/device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-D36/0/qos.json.j2 +++ b/device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-D36/0/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" : "10000000", + "yellow_min_threshold" : "2000000", + "red_max_threshold" : "10000000", + "red_min_threshold" : "2000000", + "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_7800r3a_36d2_lc/Arista-7800R3A-36D2-D36/1/qos.json.j2 b/device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-D36/1/qos.json.j2 index 3e548325ea30..411942ab526b 100644 --- a/device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-D36/1/qos.json.j2 +++ b/device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-D36/1/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" : "10000000", + "yellow_min_threshold" : "2000000", + "red_max_threshold" : "10000000", + "red_min_threshold" : "2000000", + "green_drop_probability" : "5", + "yellow_drop_probability": "5", + "red_drop_probability" : "5" + } + }, +{%- endmacro %} + {%- include 'qos_config.j2' %} diff --git a/device/nokia/x86_64-nokia_ixr7250e_36x400g-r0/Nokia-IXR7250E-36x100G/0/qos.json.j2 b/device/nokia/x86_64-nokia_ixr7250e_36x400g-r0/Nokia-IXR7250E-36x100G/0/qos.json.j2 index 3e548325ea30..411942ab526b 100644 --- a/device/nokia/x86_64-nokia_ixr7250e_36x400g-r0/Nokia-IXR7250E-36x100G/0/qos.json.j2 +++ b/device/nokia/x86_64-nokia_ixr7250e_36x400g-r0/Nokia-IXR7250E-36x100G/0/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" : "10000000", + "yellow_min_threshold" : "2000000", + "red_max_threshold" : "10000000", + "red_min_threshold" : "2000000", + "green_drop_probability" : "5", + "yellow_drop_probability": "5", + "red_drop_probability" : "5" + } + }, +{%- endmacro %} + {%- include 'qos_config.j2' %} diff --git a/device/nokia/x86_64-nokia_ixr7250e_36x400g-r0/Nokia-IXR7250E-36x100G/1/qos.json.j2 b/device/nokia/x86_64-nokia_ixr7250e_36x400g-r0/Nokia-IXR7250E-36x100G/1/qos.json.j2 index 3e548325ea30..411942ab526b 100644 --- a/device/nokia/x86_64-nokia_ixr7250e_36x400g-r0/Nokia-IXR7250E-36x100G/1/qos.json.j2 +++ b/device/nokia/x86_64-nokia_ixr7250e_36x400g-r0/Nokia-IXR7250E-36x100G/1/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" : "10000000", + "yellow_min_threshold" : "2000000", + "red_max_threshold" : "10000000", + "red_min_threshold" : "2000000", + "green_drop_probability" : "5", + "yellow_drop_probability": "5", + "red_drop_probability" : "5" + } + }, +{%- endmacro %} + {%- include 'qos_config.j2' %} diff --git a/device/nokia/x86_64-nokia_ixr7250e_36x400g-r0/Nokia-IXR7250E-36x400G/0/qos.json.j2 b/device/nokia/x86_64-nokia_ixr7250e_36x400g-r0/Nokia-IXR7250E-36x400G/0/qos.json.j2 index 3e548325ea30..411942ab526b 100644 --- a/device/nokia/x86_64-nokia_ixr7250e_36x400g-r0/Nokia-IXR7250E-36x400G/0/qos.json.j2 +++ b/device/nokia/x86_64-nokia_ixr7250e_36x400g-r0/Nokia-IXR7250E-36x400G/0/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" : "10000000", + "yellow_min_threshold" : "2000000", + "red_max_threshold" : "10000000", + "red_min_threshold" : "2000000", + "green_drop_probability" : "5", + "yellow_drop_probability": "5", + "red_drop_probability" : "5" + } + }, +{%- endmacro %} + {%- include 'qos_config.j2' %} diff --git a/device/nokia/x86_64-nokia_ixr7250e_36x400g-r0/Nokia-IXR7250E-36x400G/1/qos.json.j2 b/device/nokia/x86_64-nokia_ixr7250e_36x400g-r0/Nokia-IXR7250E-36x400G/1/qos.json.j2 index 3e548325ea30..411942ab526b 100644 --- a/device/nokia/x86_64-nokia_ixr7250e_36x400g-r0/Nokia-IXR7250E-36x400G/1/qos.json.j2 +++ b/device/nokia/x86_64-nokia_ixr7250e_36x400g-r0/Nokia-IXR7250E-36x400G/1/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" : "10000000", + "yellow_min_threshold" : "2000000", + "red_max_threshold" : "10000000", + "red_min_threshold" : "2000000", + "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-arista-7800r3a-36dm2-c36-lc-t2-minigraph.xml b/src/sonic-config-engine/tests/sample-arista-7800r3a-36dm2-c36-lc-t2-minigraph.xml index 8afcaf9d8dd1..2c9940cc4a1c 100644 --- a/src/sonic-config-engine/tests/sample-arista-7800r3a-36dm2-c36-lc-t2-minigraph.xml +++ b/src/sonic-config-engine/tests/sample-arista-7800r3a-36dm2-c36-lc-t2-minigraph.xml @@ -914,8 +914,6 @@ 10 3 - - ASIC0 ASIC1 diff --git a/src/sonic-config-engine/tests/sample-arista-7800r3a-36dm2-d36-lc-t2-minigraph.xml b/src/sonic-config-engine/tests/sample-arista-7800r3a-36dm2-d36-lc-t2-minigraph.xml index 2ba497bb99a0..f3aad825e5d9 100644 --- a/src/sonic-config-engine/tests/sample-arista-7800r3a-36dm2-d36-lc-t2-minigraph.xml +++ b/src/sonic-config-engine/tests/sample-arista-7800r3a-36dm2-d36-lc-t2-minigraph.xml @@ -914,8 +914,6 @@ 10 3 - - ASIC0 str3-7800-lc2-1 diff --git a/src/sonic-config-engine/tests/sample-nokia-ixr7250e-36x100g-t2-minigraph.xml b/src/sonic-config-engine/tests/sample-nokia-ixr7250e-36x100g-t2-minigraph.xml index 7bb8229839ba..d07612240abf 100644 --- a/src/sonic-config-engine/tests/sample-nokia-ixr7250e-36x100g-t2-minigraph.xml +++ b/src/sonic-config-engine/tests/sample-nokia-ixr7250e-36x100g-t2-minigraph.xml @@ -914,8 +914,6 @@ 10 3 - - ASIC0 ASIC1 diff --git a/src/sonic-config-engine/tests/sample-nokia-ixr7250e-36x400g-t2-minigraph.xml b/src/sonic-config-engine/tests/sample-nokia-ixr7250e-36x400g-t2-minigraph.xml index ff923b50919e..87069e53fd61 100644 --- a/src/sonic-config-engine/tests/sample-nokia-ixr7250e-36x400g-t2-minigraph.xml +++ b/src/sonic-config-engine/tests/sample-nokia-ixr7250e-36x400g-t2-minigraph.xml @@ -154,8 +154,6 @@ 10 3 - - ASIC0 ASIC1 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 bd8f5a22a9f5..7aecbdbd90e5 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 @@ -484,12 +484,12 @@ "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_max_threshold" : "10000000", + "green_min_threshold" : "2000000", + "yellow_max_threshold" : "10000000", + "yellow_min_threshold" : "2000000", + "red_max_threshold" : "10000000", + "red_min_threshold" : "2000000", "green_drop_probability" : "5", "yellow_drop_probability": "5", "red_drop_probability" : "5" diff --git a/src/sonic-config-engine/tests/sample_output/py2/qos-arista7800r3-48cqm2-lc.json b/src/sonic-config-engine/tests/sample_output/py2/qos-arista7800r3-48cqm2-lc.json index bd8f5a22a9f5..7aecbdbd90e5 100644 --- a/src/sonic-config-engine/tests/sample_output/py2/qos-arista7800r3-48cqm2-lc.json +++ b/src/sonic-config-engine/tests/sample_output/py2/qos-arista7800r3-48cqm2-lc.json @@ -484,12 +484,12 @@ "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_max_threshold" : "10000000", + "green_min_threshold" : "2000000", + "yellow_max_threshold" : "10000000", + "yellow_min_threshold" : "2000000", + "red_max_threshold" : "10000000", + "red_min_threshold" : "2000000", "green_drop_probability" : "5", "yellow_drop_probability": "5", "red_drop_probability" : "5" diff --git a/src/sonic-config-engine/tests/sample_output/py2/qos-arista7800r3a-36dm2-c36-lc.json b/src/sonic-config-engine/tests/sample_output/py2/qos-arista7800r3a-36dm2-c36-lc.json index f1dff3a0bd7c..cf6fbf64f8db 100644 --- a/src/sonic-config-engine/tests/sample_output/py2/qos-arista7800r3a-36dm2-c36-lc.json +++ b/src/sonic-config-engine/tests/sample_output/py2/qos-arista7800r3a-36dm2-c36-lc.json @@ -268,12 +268,12 @@ "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_max_threshold" : "10000000", + "green_min_threshold" : "2000000", + "yellow_max_threshold" : "10000000", + "yellow_min_threshold" : "2000000", + "red_max_threshold" : "10000000", + "red_min_threshold" : "2000000", "green_drop_probability" : "5", "yellow_drop_probability": "5", "red_drop_probability" : "5" diff --git a/src/sonic-config-engine/tests/sample_output/py2/qos-arista7800r3a-36dm2-d36-lc.json b/src/sonic-config-engine/tests/sample_output/py2/qos-arista7800r3a-36dm2-d36-lc.json index f1dff3a0bd7c..cf6fbf64f8db 100644 --- a/src/sonic-config-engine/tests/sample_output/py2/qos-arista7800r3a-36dm2-d36-lc.json +++ b/src/sonic-config-engine/tests/sample_output/py2/qos-arista7800r3a-36dm2-d36-lc.json @@ -268,12 +268,12 @@ "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_max_threshold" : "10000000", + "green_min_threshold" : "2000000", + "yellow_max_threshold" : "10000000", + "yellow_min_threshold" : "2000000", + "red_max_threshold" : "10000000", + "red_min_threshold" : "2000000", "green_drop_probability" : "5", "yellow_drop_probability": "5", "red_drop_probability" : "5" diff --git a/src/sonic-config-engine/tests/sample_output/py2/qos-nokia-ixr7250e-36x100g.json b/src/sonic-config-engine/tests/sample_output/py2/qos-nokia-ixr7250e-36x100g.json index f1dff3a0bd7c..cf6fbf64f8db 100644 --- a/src/sonic-config-engine/tests/sample_output/py2/qos-nokia-ixr7250e-36x100g.json +++ b/src/sonic-config-engine/tests/sample_output/py2/qos-nokia-ixr7250e-36x100g.json @@ -268,12 +268,12 @@ "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_max_threshold" : "10000000", + "green_min_threshold" : "2000000", + "yellow_max_threshold" : "10000000", + "yellow_min_threshold" : "2000000", + "red_max_threshold" : "10000000", + "red_min_threshold" : "2000000", "green_drop_probability" : "5", "yellow_drop_probability": "5", "red_drop_probability" : "5" diff --git a/src/sonic-config-engine/tests/sample_output/py2/qos-nokia-ixr7250e-36x400g.json b/src/sonic-config-engine/tests/sample_output/py2/qos-nokia-ixr7250e-36x400g.json index f1dff3a0bd7c..cf6fbf64f8db 100644 --- a/src/sonic-config-engine/tests/sample_output/py2/qos-nokia-ixr7250e-36x400g.json +++ b/src/sonic-config-engine/tests/sample_output/py2/qos-nokia-ixr7250e-36x400g.json @@ -268,12 +268,12 @@ "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_max_threshold" : "10000000", + "green_min_threshold" : "2000000", + "yellow_max_threshold" : "10000000", + "yellow_min_threshold" : "2000000", + "red_max_threshold" : "10000000", + "red_min_threshold" : "2000000", "green_drop_probability" : "5", "yellow_drop_probability": "5", "red_drop_probability" : "5" 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 bd8f5a22a9f5..7aecbdbd90e5 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 @@ -484,12 +484,12 @@ "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_max_threshold" : "10000000", + "green_min_threshold" : "2000000", + "yellow_max_threshold" : "10000000", + "yellow_min_threshold" : "2000000", + "red_max_threshold" : "10000000", + "red_min_threshold" : "2000000", "green_drop_probability" : "5", "yellow_drop_probability": "5", "red_drop_probability" : "5" diff --git a/src/sonic-config-engine/tests/sample_output/py3/qos-arista7800r3-48cqm2-lc.json b/src/sonic-config-engine/tests/sample_output/py3/qos-arista7800r3-48cqm2-lc.json index bd8f5a22a9f5..7aecbdbd90e5 100644 --- a/src/sonic-config-engine/tests/sample_output/py3/qos-arista7800r3-48cqm2-lc.json +++ b/src/sonic-config-engine/tests/sample_output/py3/qos-arista7800r3-48cqm2-lc.json @@ -484,12 +484,12 @@ "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_max_threshold" : "10000000", + "green_min_threshold" : "2000000", + "yellow_max_threshold" : "10000000", + "yellow_min_threshold" : "2000000", + "red_max_threshold" : "10000000", + "red_min_threshold" : "2000000", "green_drop_probability" : "5", "yellow_drop_probability": "5", "red_drop_probability" : "5" diff --git a/src/sonic-config-engine/tests/sample_output/py3/qos-arista7800r3a-36dm2-c36-lc.json b/src/sonic-config-engine/tests/sample_output/py3/qos-arista7800r3a-36dm2-c36-lc.json index f1dff3a0bd7c..cf6fbf64f8db 100644 --- a/src/sonic-config-engine/tests/sample_output/py3/qos-arista7800r3a-36dm2-c36-lc.json +++ b/src/sonic-config-engine/tests/sample_output/py3/qos-arista7800r3a-36dm2-c36-lc.json @@ -268,12 +268,12 @@ "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_max_threshold" : "10000000", + "green_min_threshold" : "2000000", + "yellow_max_threshold" : "10000000", + "yellow_min_threshold" : "2000000", + "red_max_threshold" : "10000000", + "red_min_threshold" : "2000000", "green_drop_probability" : "5", "yellow_drop_probability": "5", "red_drop_probability" : "5" diff --git a/src/sonic-config-engine/tests/sample_output/py3/qos-arista7800r3a-36dm2-d36-lc.json b/src/sonic-config-engine/tests/sample_output/py3/qos-arista7800r3a-36dm2-d36-lc.json index f1dff3a0bd7c..cf6fbf64f8db 100644 --- a/src/sonic-config-engine/tests/sample_output/py3/qos-arista7800r3a-36dm2-d36-lc.json +++ b/src/sonic-config-engine/tests/sample_output/py3/qos-arista7800r3a-36dm2-d36-lc.json @@ -268,12 +268,12 @@ "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_max_threshold" : "10000000", + "green_min_threshold" : "2000000", + "yellow_max_threshold" : "10000000", + "yellow_min_threshold" : "2000000", + "red_max_threshold" : "10000000", + "red_min_threshold" : "2000000", "green_drop_probability" : "5", "yellow_drop_probability": "5", "red_drop_probability" : "5" diff --git a/src/sonic-config-engine/tests/sample_output/py3/qos-nokia-ixr7250e-36x100g.json b/src/sonic-config-engine/tests/sample_output/py3/qos-nokia-ixr7250e-36x100g.json index f1dff3a0bd7c..cf6fbf64f8db 100644 --- a/src/sonic-config-engine/tests/sample_output/py3/qos-nokia-ixr7250e-36x100g.json +++ b/src/sonic-config-engine/tests/sample_output/py3/qos-nokia-ixr7250e-36x100g.json @@ -268,12 +268,12 @@ "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_max_threshold" : "10000000", + "green_min_threshold" : "2000000", + "yellow_max_threshold" : "10000000", + "yellow_min_threshold" : "2000000", + "red_max_threshold" : "10000000", + "red_min_threshold" : "2000000", "green_drop_probability" : "5", "yellow_drop_probability": "5", "red_drop_probability" : "5" diff --git a/src/sonic-config-engine/tests/sample_output/py3/qos-nokia-ixr7250e-36x400g.json b/src/sonic-config-engine/tests/sample_output/py3/qos-nokia-ixr7250e-36x400g.json index f1dff3a0bd7c..cf6fbf64f8db 100644 --- a/src/sonic-config-engine/tests/sample_output/py3/qos-nokia-ixr7250e-36x400g.json +++ b/src/sonic-config-engine/tests/sample_output/py3/qos-nokia-ixr7250e-36x400g.json @@ -268,12 +268,12 @@ "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_max_threshold" : "10000000", + "green_min_threshold" : "2000000", + "yellow_max_threshold" : "10000000", + "yellow_min_threshold" : "2000000", + "red_max_threshold" : "10000000", + "red_min_threshold" : "2000000", "green_drop_probability" : "5", "yellow_drop_probability": "5", "red_drop_probability" : "5" diff --git a/src/sonic-config-engine/tests/test_j2files.py b/src/sonic-config-engine/tests/test_j2files.py index 1567db6cc90c..74003f7fe0a5 100644 --- a/src/sonic-config-engine/tests/test_j2files.py +++ b/src/sonic-config-engine/tests/test_j2files.py @@ -31,6 +31,8 @@ def setUp(self): self.dell9332_t1_minigraph = os.path.join(self.test_dir, 'sample-dell-9332-t1-minigraph.xml') 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.nokia_ixr7250e_36x100g_t2_minigraph = os.path.join(self.test_dir, 'sample-nokia-ixr7250e-36x100g-t2-minigraph.xml') + self.nokia_ixr7250e_36x400g_t2_minigraph = os.path.join(self.test_dir, 'sample-nokia-ixr7250e-36x400g-t2-minigraph.xml') self.output_file = os.path.join(self.test_dir, 'output') self.nokia_ixr7250e_36x100g_t2_minigraph = os.path.join(self.test_dir, 'sample-nokia-ixr7250e-36x100g-t2-minigraph.xml') self.nokia_ixr7250e_36x400g_t2_minigraph = os.path.join(self.test_dir, 'sample-nokia-ixr7250e-36x400g-t2-minigraph.xml') From a1990d4c4877cd44a51890e544558d82ad948203 Mon Sep 17 00:00:00 2001 From: mssonicbld <79238446+mssonicbld@users.noreply.github.com> Date: Fri, 23 Jun 2023 03:41:58 +0800 Subject: [PATCH 188/193] [Arista][x86_64-arista_7050_qx32] Add Components to platform.json (#15252) (#15585) --- .../x86_64-arista_7050_qx32/platform.json | 12 +++++++++++- .../x86_64-arista_7050_qx32s/platform.json | 18 +++++++++++++++++- 2 files changed, 28 insertions(+), 2 deletions(-) diff --git a/device/arista/x86_64-arista_7050_qx32/platform.json b/device/arista/x86_64-arista_7050_qx32/platform.json index 8772ce8b23db..ccce2079a29d 100644 --- a/device/arista/x86_64-arista_7050_qx32/platform.json +++ b/device/arista/x86_64-arista_7050_qx32/platform.json @@ -1,7 +1,17 @@ { "chassis": { "name": "DCS-7050QX-32", - "components": [], + "components": [ + { + "name": "Scd(addr=0000:04:00.0)" + }, + { + "name": "Ucd90120A(addr=6-004e)" + }, + { + "name": "Ucd90160(addr=10-004e)" + } + ], "fans": [ { "name": "fan1" diff --git a/device/arista/x86_64-arista_7050_qx32s/platform.json b/device/arista/x86_64-arista_7050_qx32s/platform.json index 56ee4a0dff25..2bcc31a9a381 100644 --- a/device/arista/x86_64-arista_7050_qx32s/platform.json +++ b/device/arista/x86_64-arista_7050_qx32s/platform.json @@ -1,7 +1,23 @@ { "chassis": { "name": "DCS-7050QX-32S", - "components": [], + "components": [ + { + "name": "Aboot()" + }, + { + "name": "Scd(addr=0000:02:00.0)" + }, + { + "name": "Ucd90120A(addr=4-004e)" + }, + { + "name": "Ucd90120A(addr=8-004e)" + }, + { + "name": "CrowSysCpld(addr=2-0023)" + } + ], "fans": [], "fan_drawers": [ { From a589d610b7db02df90ecc6e52823570fc6a6d934 Mon Sep 17 00:00:00 2001 From: zitingguo-ms Date: Fri, 23 Jun 2023 04:29:55 +0800 Subject: [PATCH 189/193] Upgrade XGS SAI version to 7.1.50.4 (#15530) Update SAI xgs version to 7.1.50.4 to include the following changes: patch fix from CSP CS00012282080 needed to support speed change from 400g to 100g on chassis linecards. Backport SONIC-71507 VSQF/VSQE are not created after port creation. JIRA# SONIC-71507 Backport JIRA SONIC-70704 to rel_ocp_sai_7_1. JIRA# SONIC-70704 SID - L3 multicast packet drop due to wrong VFI derivation - SDK-350470 SID - SIGSEGV in linkscan callback delivery - SDK-287578 SID - Repeated VXLAN calls deletes vlan translation action profile SDK-313980 SER - error in IS_TDM_CALENDAR0/1 can cause traffic hit in TH SID - L2_ENTRY Table Lookups May Miss [CSP CS00012275452] sai_object_type_get_availability failed with SAI_STATUS_INVALID_PARAMETER Signed-off-by: zitingguo-ms --- platform/broadcom/sai.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platform/broadcom/sai.mk b/platform/broadcom/sai.mk index 8782388137c4..ff1460f78fbd 100644 --- a/platform/broadcom/sai.mk +++ b/platform/broadcom/sai.mk @@ -1,4 +1,4 @@ -LIBSAIBCM_XGS_VERSION = 7.1.36.4 +LIBSAIBCM_XGS_VERSION = 7.1.50.4 LIBSAIBCM_DNX_VERSION = 7.1.50.4 LIBSAIBCM_BRANCH_NAME = REL_7.0_202205 LIBSAIBCM_XGS_URL_PREFIX = "https://sonicstorage.blob.core.windows.net/public/sai/bcmsai/$(LIBSAIBCM_BRANCH_NAME)/$(LIBSAIBCM_XGS_VERSION)" From e8e8c019c2e33aef164376b7c9a8ebcc16d9c400 Mon Sep 17 00:00:00 2001 From: "Marty Y. Lok" <76118573+mlok-nokia@users.noreply.github.com> Date: Fri, 23 Jun 2023 18:41:46 -0400 Subject: [PATCH 190/193] [Nokia-IXR7250E][Devicedata] update the device data for Nokia IXR7250E platform (#15605) Signed-off-by: mlok (cherry picked from commit 478ba478f5aaea347d36bc22021e0c5ab7e7e39b) --- .../0/jr2cp-nokia-18x100g-4x25g-config.bcm | 1 + .../1/jr2cp-nokia-18x100g-4x25g-config.bcm | 1 + .../Nokia-IXR7250E-36x400G/0/jr2cp-nokia-18x400g-config.bcm | 1 + .../Nokia-IXR7250E-36x400G/1/jr2cp-nokia-18x400g-config.bcm | 1 + device/nokia/x86_64-nokia_ixr7250e_sup-r0/chassisdb.conf | 2 +- 5 files changed, 5 insertions(+), 1 deletion(-) diff --git a/device/nokia/x86_64-nokia_ixr7250e_36x400g-r0/Nokia-IXR7250E-36x100G/0/jr2cp-nokia-18x100g-4x25g-config.bcm b/device/nokia/x86_64-nokia_ixr7250e_36x400g-r0/Nokia-IXR7250E-36x100G/0/jr2cp-nokia-18x100g-4x25g-config.bcm index ce0a5278976d..aa9ce7875d10 100644 --- a/device/nokia/x86_64-nokia_ixr7250e_36x400g-r0/Nokia-IXR7250E-36x100G/0/jr2cp-nokia-18x100g-4x25g-config.bcm +++ b/device/nokia/x86_64-nokia_ixr7250e_36x400g-r0/Nokia-IXR7250E-36x100G/0/jr2cp-nokia-18x100g-4x25g-config.bcm @@ -2093,3 +2093,4 @@ xflow_macsec_secure_chan_to_num_secure_assoc_decrypt=4 cmic_dma_abort_in_cold_boot=0 sai_pfc_dlr_init_capability=0 sai_disable_srcmacqedstmac_ctrl=1 +trunk_group_max_members=16 diff --git a/device/nokia/x86_64-nokia_ixr7250e_36x400g-r0/Nokia-IXR7250E-36x100G/1/jr2cp-nokia-18x100g-4x25g-config.bcm b/device/nokia/x86_64-nokia_ixr7250e_36x400g-r0/Nokia-IXR7250E-36x100G/1/jr2cp-nokia-18x100g-4x25g-config.bcm index 8c6ae9b47777..d07dce85d605 100644 --- a/device/nokia/x86_64-nokia_ixr7250e_36x400g-r0/Nokia-IXR7250E-36x100G/1/jr2cp-nokia-18x100g-4x25g-config.bcm +++ b/device/nokia/x86_64-nokia_ixr7250e_36x400g-r0/Nokia-IXR7250E-36x100G/1/jr2cp-nokia-18x100g-4x25g-config.bcm @@ -2094,3 +2094,4 @@ xflow_macsec_secure_chan_to_num_secure_assoc_decrypt=4 cmic_dma_abort_in_cold_boot=0 sai_pfc_dlr_init_capability=0 sai_disable_srcmacqedstmac_ctrl=1 +trunk_group_max_members=16 diff --git a/device/nokia/x86_64-nokia_ixr7250e_36x400g-r0/Nokia-IXR7250E-36x400G/0/jr2cp-nokia-18x400g-config.bcm b/device/nokia/x86_64-nokia_ixr7250e_36x400g-r0/Nokia-IXR7250E-36x400G/0/jr2cp-nokia-18x400g-config.bcm index 32c09336766a..f0f3cbfb4730 100644 --- a/device/nokia/x86_64-nokia_ixr7250e_36x400g-r0/Nokia-IXR7250E-36x400G/0/jr2cp-nokia-18x400g-config.bcm +++ b/device/nokia/x86_64-nokia_ixr7250e_36x400g-r0/Nokia-IXR7250E-36x400G/0/jr2cp-nokia-18x400g-config.bcm @@ -2095,3 +2095,4 @@ xflow_macsec_secure_chan_to_num_secure_assoc_decrypt=4 cmic_dma_abort_in_cold_boot=0 sai_pfc_dlr_init_capability=0 sai_disable_srcmacqedstmac_ctrl=1 +trunk_group_max_members=16 diff --git a/device/nokia/x86_64-nokia_ixr7250e_36x400g-r0/Nokia-IXR7250E-36x400G/1/jr2cp-nokia-18x400g-config.bcm b/device/nokia/x86_64-nokia_ixr7250e_36x400g-r0/Nokia-IXR7250E-36x400G/1/jr2cp-nokia-18x400g-config.bcm index d5173d52b75b..8c2e3a895f1a 100644 --- a/device/nokia/x86_64-nokia_ixr7250e_36x400g-r0/Nokia-IXR7250E-36x400G/1/jr2cp-nokia-18x400g-config.bcm +++ b/device/nokia/x86_64-nokia_ixr7250e_36x400g-r0/Nokia-IXR7250E-36x400G/1/jr2cp-nokia-18x400g-config.bcm @@ -2097,3 +2097,4 @@ xflow_macsec_secure_chan_to_num_secure_assoc_decrypt=4 cmic_dma_abort_in_cold_boot=0 sai_pfc_dlr_init_capability=0 sai_disable_srcmacqedstmac_ctrl=1 +trunk_group_max_members=16 diff --git a/device/nokia/x86_64-nokia_ixr7250e_sup-r0/chassisdb.conf b/device/nokia/x86_64-nokia_ixr7250e_sup-r0/chassisdb.conf index 3296a7929a81..220e262f68e8 100644 --- a/device/nokia/x86_64-nokia_ixr7250e_sup-r0/chassisdb.conf +++ b/device/nokia/x86_64-nokia_ixr7250e_sup-r0/chassisdb.conf @@ -1,4 +1,4 @@ start_chassis_db=1 chassis_db_address=10.6.0.100 lag_id_start=1 -lag_id_end=512 +lag_id_end=1024 From 199a67a15aadd32112132713a1d36bc6d0d0ab84 Mon Sep 17 00:00:00 2001 From: jhli-cisco <93410383+jhli-cisco@users.noreply.github.com> Date: Mon, 26 Jun 2023 18:34:13 -0700 Subject: [PATCH 191/193] Update cisco-8000.ini (#15620) Why I did it Fix incorrectly specified table name in the extra queues and extra pgs j2 files for 8101-32FH-O How I did it Update platform module to 202205.2.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 19ddab92411a..6e0fef1e7673 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=202205.2.2.5 +ref=202205.2.2.7 From 386ce286955de418542ee15491d9482f22e16ea3 Mon Sep 17 00:00:00 2001 From: Ye Jianquan Date: Tue, 27 Jun 2023 11:01:50 +0800 Subject: [PATCH 192/193] [CI/CD] Refine t0 sonic and remove SPECIFIED_PARAMS (#15626) Why I did it t0-sonic's specific params has been set on sonic-mgmt repo, remove useless SPECIFIED_PARAMS usage --- .azure-pipelines/run-test-scheduler-template.yml | 6 +----- azure-pipelines.yml | 3 +-- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/.azure-pipelines/run-test-scheduler-template.yml b/.azure-pipelines/run-test-scheduler-template.yml index 49c89f4586c7..f1284be4d541 100644 --- a/.azure-pipelines/run-test-scheduler-template.yml +++ b/.azure-pipelines/run-test-scheduler-template.yml @@ -34,10 +34,6 @@ parameters: type: string default: "ceos" -- name: SPECIFIED_PARAMS - type: string - default: "{}" - - name: COMMON_EXTRA_PARAMS type: string default: "" @@ -61,7 +57,7 @@ steps: 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 }} \ - --vm-type ${{ parameters.VM_TYPE }} --specified-params "${{ parameters.SPECIFIED_PARAMS }}" --common-extra-params "${{ parameters.COMMON_EXTRA_PARAMS }}" --num-asic ${{ parameters.NUM_ASIC }} + --vm-type ${{ parameters.VM_TYPE }} --common-extra-params "${{ parameters.COMMON_EXTRA_PARAMS }}" --num-asic ${{ parameters.NUM_ASIC }} 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 a5353ffb2001..43218e11d3a8 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -192,9 +192,8 @@ stages: MIN_WORKER: $(T0_SONIC_INSTANCE_NUM) MAX_WORKER: $(T0_SONIC_INSTANCE_NUM) TEST_SET: t0-sonic - COMMON_EXTRA_PARAMS: "--neighbor_type=sonic --enable_macsec --macsec_profile=128_SCI,256_XPN_SCI" + COMMON_EXTRA_PARAMS: "--neighbor_type=sonic " VM_TYPE: vsonic - SPECIFIED_PARAMS: '{\"test_pretest.py\":[\"--completeness_level=confident\",\"--allow_recover\"],\"test_posttest.py\":[\"--completeness_level=confident\",\"--allow_recover\"]}' MGMT_BRANCH: 202205 - job: dualtor_elastictest From b6cdd8091eaf457cb2b361bf7fa7653e0e6af528 Mon Sep 17 00:00:00 2001 From: Jing Zhang Date: Tue, 27 Jun 2023 18:59:34 -0700 Subject: [PATCH 193/193] [202205][yang] add Yang model for MUX_LINKMGR|LINK_PROBER (#15384) (#15607) * [yang] add Yang model for `MUX_LINKMGR|LINK_PROBER` (#15384) Add yang model for MUX_LINKMGR|LINK_PROBER table. sign-off: zhangjing@microsoft.com --- src/sonic-yang-models/doc/Configuration.md | 20 +++++ src/sonic-yang-models/setup.py | 1 + .../tests/files/sample_config_db.json | 13 +++ .../yang_model_tests/tests/mux-linkmgr.json | 8 ++ .../tests_config/mux-linkmgr.json | 26 ++++++ .../yang-models/sonic-mux-linkmgr.yang | 88 +++++++++++++++++++ 6 files changed, 156 insertions(+) create mode 100644 src/sonic-yang-models/tests/yang_model_tests/tests/mux-linkmgr.json create mode 100644 src/sonic-yang-models/tests/yang_model_tests/tests_config/mux-linkmgr.json create mode 100644 src/sonic-yang-models/yang-models/sonic-mux-linkmgr.yang diff --git a/src/sonic-yang-models/doc/Configuration.md b/src/sonic-yang-models/doc/Configuration.md index 98d10a5b5dc9..a1fdfc13a217 100644 --- a/src/sonic-yang-models/doc/Configuration.md +++ b/src/sonic-yang-models/doc/Configuration.md @@ -38,6 +38,7 @@ Table of Contents * [Management VRF](#management-vrf) * [MAP_PFC_PRIORITY_TO_QUEUE](#map_pfc_priority_to_queue) * [MUX_CABLE](#muxcable) + * [MUX_LINKMGR](#mux_linkmgr) * [NTP Global Configuration](#ntp-global-configuration) * [NTP and SYSLOG servers](#ntp-and-syslog-servers) * [Peer Switch](#peer-switch) @@ -1149,6 +1150,25 @@ The **MUX_CABLE** table is used for dualtor interface configuration. The `cable_ } ``` +### MUX_LINKMGR +The **MUX_LINKMGR** table is used for dualtor device configuration. +``` +{ + "MUX_LINKMGR": { + "LINK_PROBER": { + "interval_v4": "100", + "interval_v6": "1000", + "positive_signal_count": "1", + "negative_signal_count": "3", + "suspend_timer": "500", + "use_well_known_mac": "enabled", + "src_mac": "ToRMac", + "interval_pck_loss_count_update": "3" + } + } +} +``` + ### NTP Global Configuration These configuration options are used to modify the way that diff --git a/src/sonic-yang-models/setup.py b/src/sonic-yang-models/setup.py index b44bbb8c92b0..0c478ffe4b04 100644 --- a/src/sonic-yang-models/setup.py +++ b/src/sonic-yang-models/setup.py @@ -118,6 +118,7 @@ def run(self): './yang-models/sonic-mgmt_vrf.yang', './yang-models/sonic-mirror-session.yang', './yang-models/sonic-mux-cable.yang', + './yang-models/sonic-mux-linkmgr.yang', './yang-models/sonic-ntp.yang', './yang-models/sonic-nat.yang', './yang-models/sonic-nvgre-tunnel.yang', diff --git a/src/sonic-yang-models/tests/files/sample_config_db.json b/src/sonic-yang-models/tests/files/sample_config_db.json index 8b274866de04..c28eab35ace0 100644 --- a/src/sonic-yang-models/tests/files/sample_config_db.json +++ b/src/sonic-yang-models/tests/files/sample_config_db.json @@ -1827,6 +1827,19 @@ } }, + "MUX_LINKMGR": { + "LINK_PROBER": { + "interval_v4": "100", + "interval_v6": "1000", + "positive_signal_count": "1", + "negative_signal_count": "3", + "suspend_timer": "500", + "use_well_known_mac": "enabled", + "src_mac": "ToRMac", + "interval_pck_loss_count_update": "3" + } + }, + "POLICER": { "everflow_static_policer": { diff --git a/src/sonic-yang-models/tests/yang_model_tests/tests/mux-linkmgr.json b/src/sonic-yang-models/tests/yang_model_tests/tests/mux-linkmgr.json new file mode 100644 index 000000000000..3f399eec76cc --- /dev/null +++ b/src/sonic-yang-models/tests/yang_model_tests/tests/mux-linkmgr.json @@ -0,0 +1,8 @@ +{ + "MUX_LINKMGR_LINK_PROBER_INTERVAL_CHANGE": { + "desc": "Consume ICMP heartbeat interval and timeout config changes. " + }, + "MUX_LINKMGR_LINK_PROBER_CHANGE_MAC_ADDR": { + "desc": "Use well-known mac and vlan mac as dst/src in linkmgrd link prober. " + } +} \ No newline at end of file diff --git a/src/sonic-yang-models/tests/yang_model_tests/tests_config/mux-linkmgr.json b/src/sonic-yang-models/tests/yang_model_tests/tests_config/mux-linkmgr.json new file mode 100644 index 000000000000..2210c169365c --- /dev/null +++ b/src/sonic-yang-models/tests/yang_model_tests/tests_config/mux-linkmgr.json @@ -0,0 +1,26 @@ +{ + "MUX_LINKMGR_LINK_PROBER_INTERVAL_CHANGE": { + "sonic-mux-linkmgr:sonic-mux-linkmgr": { + "sonic-mux-linkmgr:MUX_LINKMGR": { + "sonic-mux-linkmgr:LINK_PROBER": + { + "interval_v4": "1000", + "interval_v6": "10000", + "positive_signal_count": 3, + "negative_signal_count": 9 + } + } + } + }, + "MUX_LINKMGR_LINK_PROBER_CHANGE_MAC_ADDR": { + "sonic-mux-linkmgr:sonic-mux-linkmgr": { + "sonic-mux-linkmgr:MUX_LINKMGR": { + "sonic-mux-linkmgr:LINK_PROBER": + { + "use_well_known_mac": "enabled", + "src_mac": "VlanMac" + } + } + } + } +} \ No newline at end of file diff --git a/src/sonic-yang-models/yang-models/sonic-mux-linkmgr.yang b/src/sonic-yang-models/yang-models/sonic-mux-linkmgr.yang new file mode 100644 index 000000000000..93e605ea8e51 --- /dev/null +++ b/src/sonic-yang-models/yang-models/sonic-mux-linkmgr.yang @@ -0,0 +1,88 @@ +module sonic-mux-linkmgr { + namespace "http://github.com/sonic-net/sonic-mux-linkmgr"; + prefix mux_linkmgr; + yang-version 1.1; + + organization + "SONiC"; + + contact + "SONiC"; + + description + "SONiC DualToR Linkmgrd configuration data"; + + revision 2023-06-07 { + description + "Initial revision"; + } + + container sonic-mux-linkmgr { + + container MUX_LINKMGR { + + container LINK_PROBER { + + leaf interval_v4 { + type uint32; + default 100; + units milliseconds; + + description "IPv4 ICMP heartbeat interval. "; + } + + leaf interval_v6 { + type uint32; + default 1000; + units milliseconds; + + description "IPv6 ICMP heartbeat interval. "; + } + + leaf positive_signal_count { + type uint32; + default 1; + + description "Linkmgrd positive signal count. "; + } + + leaf negative_signal_count { + type uint32; + default 3; + + description "Linkmgrd negative signal count. "; + } + + leaf suspend_timer { + type uint32; + + description "ICMP heartbeat suspending timer, currently not in use. "; + } + + leaf use_well_known_mac { + type enumeration { + enum enabled; + enum disabled; + } + + description "ICMP heartbeat use well known mac as dst mac or not. "; + } + + leaf src_mac { + type enumeration { + enum ToRMac; + enum VlanMac; + } + + description "ICMP heartbeat use what mac as src mac. "; + } + + leaf interval_pck_loss_count_update { + type uint32; + + description "The frequency of streaming ICMP heartbeat loss data to telemetry. "; + } + } + } + } +} \ No newline at end of file