Merged PR 8419167: Fix master merge conflict

Related work items: sonic-net#94, sonic-net#13789, sonic-net#14149, sonic-net#14515, sonic-net#14788, sonic-net#14922, sonic-net#14933, sonic-net#15284, sonic-net#15383, sonic-net#15464, sonic-net#15519, sonic-net#15521, sonic-net#15575, sonic-net#15636, sonic-net#15652, sonic-net#15684, sonic-net#15708, sonic-net#15725, sonic-net#15739, sonic-net#15755, sonic-net#15756, sonic-net#15757

.azure-pipelines/azure-pipelines-build-ubuntu-2004.yml

@@ -0,0 +1,55 @@
+# C/C++ with GCC
+# Build your C/C++ project with GCC using make.
+# Add steps that publish test results, save build artifacts, deploy, and more:
+# https://docs.microsoft.com/azure/devops/pipelines/apps/c-cpp/gcc
+pr: none
+
+trigger:
+ batch: true
+ branches:
+ include:
+ - master
+
+stages:
+- stage: Build
+
+ jobs:
+ - job:
+ displayName: "amd64/ubuntu-20.04"
+ pool:
+ vmImage: 'ubuntu-20.04'
+
+ steps:
+ - checkout: self
+ submodules: true
+ - script: |
+ sudo apt-get update
+ sudo apt-get install -y make wget libtool m4 autoconf dh-exec libdebhelper-perl=13.6ubuntu1~bpo20.04.1 debhelper=13.6ubuntu1~bpo20.04.1 \
+ cmake pkg-config python3-pip python cmake libgtest-dev libgmock-dev libyang-dev \
+ debhelper-compat dh-elpa dh-sequence-python3 python3-all \
+ libpython3-all-dev python3-six xmlto unzip rake-compiler gem2deb pkg-php-tools \
+ ant default-jdk maven-repo-helper libguava-java
+ wget http://ftp.us.debian.org/debian/pool/main/libg/libgoogle-gson-java/libgoogle-gson-java_2.8.6-1+deb11u1_all.deb
+ sudo dpkg -i libgoogle-gson-java_2.8.6-1+deb11u1_all.deb
+ mkdir -p /tmp/artifacts
+ displayName: "Install dependencies"
+ - script: |
+ SONIC_CONFIG_MAKE_JOBS=$(nproc) CONFIGURED_ARCH=amd64 DEST=/tmp/artifacts make -f ../rules/protobuf.mk -f protobuf/Makefile
+ workingDirectory: src
+ displayName: "Build protobuf"
+ - script: |
+ sudo dpkg -i protobuf-compiler_3.21.12-3_amd64.deb libprotoc32_3.21.12-3_amd64.deb \
+ libprotobuf32_3.21.12-3_amd64.deb libprotobuf-dev_3.21.12-3_amd64.deb \
+ libprotobuf-lite32_3.21.12-3_amd64.deb
+ workingDirectory: /tmp/artifacts
+ displayName: "Install protobuf"
+ - script: |
+ dpkg-buildpackage -rfakeroot -b -us -uc
+ workingDirectory: src/sonic-dash-api
+ displayName: "Build sonic-dash-api"
+ - script: |
+ cp *.deb /tmp/artifacts
+ workingDirectory: src
+ - publish: /tmp/artifacts
+ artifact: sonic-buildimage.amd64.ubuntu20_04
+ displayName: "Archive sonic-buildimage debian packages for ubuntu20.04"

.gitmodules

@@ -121,3 +121,6 @@
 [submodule "src/dhcpmon"]
  path = src/dhcpmon
  url = https:/sonic-net/sonic-dhcpmon.git
+[submodule "src/sonic-dash-api/sonic-dash-api"]
+ path = src/sonic-dash-api/sonic-dash-api
+ url = https:/sonic-net/sonic-dash-api.git

azure-pipelines.yml

@@ -157,6 +157,7 @@ stages:
  TOPOLOGY: t0
  MIN_WORKER: $(T0_INSTANCE_NUM)
  MAX_WORKER: $(T0_INSTANCE_NUM)
+ MGMT_BRANCH: master
 
  - job: t0_2vlans_elastictest
  pool: ubuntu-20.04
@@ -170,6 +171,7 @@ stages:
  TEST_SET: t0-2vlans
  MIN_WORKER: $(T0_2VLANS_INSTANCE_NUM)
  MAX_WORKER: $(T0_2VLANS_INSTANCE_NUM)
+ MGMT_BRANCH: master
  DEPLOY_MG_EXTRA_PARAMS: "-e vlan_config=two_vlan_a"
 
  - job: t1_lag_elastictest
@@ -183,6 +185,7 @@ stages:
  TOPOLOGY: t1-lag
  MIN_WORKER: $(T1_LAG_INSTANCE_NUM)
  MAX_WORKER: $(T1_LAG_INSTANCE_NUM)
+ MGMT_BRANCH: master
 
  - job: multi_asic_elastictest
  displayName: "kvmtest-multi-asic-t1-lag by Elastictest"
@@ -197,6 +200,7 @@ stages:
  MIN_WORKER: $(MULTI_ASIC_INSTANCE_NUM)
  MAX_WORKER: $(MULTI_ASIC_INSTANCE_NUM)
  NUM_ASIC: 4
+ MGMT_BRANCH: master
 
  - job: dualtor_elastictest
  pool: ubuntu-20.04
@@ -209,6 +213,7 @@ stages:
  TOPOLOGY: dualtor
  MIN_WORKER: $(T0_DUALTOR_INSTANCE_NUM)
  MAX_WORKER: $(T0_DUALTOR_INSTANCE_NUM)
+ MGMT_BRANCH: master
  COMMON_EXTRA_PARAMS: "--disable_loganalyzer "
 
  - job: sonic_t0_elastictest
@@ -223,18 +228,19 @@ stages:
  MIN_WORKER: $(T0_SONIC_INSTANCE_NUM)
  MAX_WORKER: $(T0_SONIC_INSTANCE_NUM)
  TEST_SET: t0-sonic
+ MGMT_BRANCH: master
  COMMON_EXTRA_PARAMS: "--neighbor_type=sonic "
  VM_TYPE: vsonic
 
- - job: wan_elastictest
- displayName: "kvmtest-wan by Elastictest"
- pool: ubuntu-20.04
- timeoutInMinutes: 240
- continueOnError: false
- steps:
- - template: .azure-pipelines/run-test-scheduler-template.yml
- parameters:
- TOPOLOGY: wan-pub
- MIN_WORKER: $(WAN_INSTANCE_NUM)
- MAX_WORKER: $(WAN_INSTANCE_NUM)
- COMMON_EXTRA_PARAMS: "--skip_sanity "
+# - job: wan_elastictest
+# displayName: "kvmtest-wan by Elastictest"
+# pool: ubuntu-20.04
+# timeoutInMinutes: 240
+# continueOnError: false
+# steps:
+# - template: .azure-pipelines/run-test-scheduler-template.yml
+# parameters:
+# TOPOLOGY: wan-pub
+# MIN_WORKER: $(WAN_INSTANCE_NUM)
+# MAX_WORKER: $(WAN_INSTANCE_NUM)
+# COMMON_EXTRA_PARAMS: "--skip_sanity "

build_debian.sh

@@ -31,8 +31,8 @@ set -x -e
 CONFIGURED_ARCH=$([ -f .arch ] && cat .arch || echo amd64)
 
 ## docker engine version (with platform)
-DOCKER_VERSION=5:20.10.14~3-0~debian-$IMAGE_DISTRO
-CONTAINERD_IO_VERSION=1.5.11-1
+DOCKER_VERSION=5:24.0.2-1~debian.11~$IMAGE_DISTRO
+CONTAINERD_IO_VERSION=1.6.21-1
 LINUX_KERNEL_VERSION=5.10.0-18-2
 
 ## Working directory to prepare the file system

device/ufispace/x86_64-ufispace_s9300_32d-r0/UFISPACE-S9300-32D/hwsku.json

@@ -0,0 +1,140 @@
+{
+ "interfaces": {
+ "Ethernet0": {
+ "default_brkout_mode": "1x400G"
+ },
+
+ "Ethernet8": {
+ "default_brkout_mode": "1x400G"
+ },
+
+ "Ethernet16": {
+ "default_brkout_mode": "1x400G"
+ },
+
+ "Ethernet24": {
+ "default_brkout_mode": "1x400G"
+ },
+
+ "Ethernet32": {
+ "default_brkout_mode": "1x400G"
+ },
+
+ "Ethernet40": {
+ "default_brkout_mode": "1x400G"
+ },
+
+ "Ethernet48": {
+ "default_brkout_mode": "1x400G"
+ },
+
+ "Ethernet56": {
+ "default_brkout_mode": "1x400G"
+ },
+
+ "Ethernet64": {
+ "default_brkout_mode": "1x400G"
+ },
+
+ "Ethernet72": {
+ "default_brkout_mode": "1x400G"
+ },
+
+ "Ethernet80": {
+ "default_brkout_mode": "1x400G"
+ },
+
+ "Ethernet88": {
+ "default_brkout_mode": "1x400G"
+ },
+
+ "Ethernet96": {
+ "default_brkout_mode": "1x400G"
+ },
+
+ "Ethernet104": {
+ "default_brkout_mode": "1x400G"
+ },
+
+ "Ethernet112": {
+ "default_brkout_mode": "1x400G"
+ },
+
+ "Ethernet120": {
+ "default_brkout_mode": "1x400G"
+ },
+
+ "Ethernet128": {
+ "default_brkout_mode": "1x400G"
+ },
+
+ "Ethernet136": {
+ "default_brkout_mode": "1x400G"
+ },
+
+ "Ethernet144": {
+ "default_brkout_mode": "1x400G"
+ },
+
+ "Ethernet152": {
+ "default_brkout_mode": "1x400G"
+ },
+
+ "Ethernet160": {
+ "default_brkout_mode": "1x400G"
+ },
+
+ "Ethernet168": {
+ "default_brkout_mode": "1x400G"
+ },
+
+ "Ethernet176": {
+ "default_brkout_mode": "1x400G"
+ },
+
+ "Ethernet184": {
+ "default_brkout_mode": "1x400G"
+ },
+
+ "Ethernet192": {
+ "default_brkout_mode": "1x400G"
+ },
+
+ "Ethernet200": {
+ "default_brkout_mode": "1x400G"
+ },
+
+ "Ethernet208": {
+ "default_brkout_mode": "1x400G"
+ },
+
+ "Ethernet216": {
+ "default_brkout_mode": "1x400G"
+ },
+
+ "Ethernet224": {
+ "default_brkout_mode": "1x400G"
+ },
+
+ "Ethernet232": {
+ "default_brkout_mode": "1x400G"
+ },
+
+ "Ethernet240": {
+ "default_brkout_mode": "1x400G"
+ },
+
+ "Ethernet248": {
+ "default_brkout_mode": "1x400G"
+ },
+
+ "Ethernet256": {
+ "default_brkout_mode": "1x10G"
+ },
+
+ "Ethernet257": {
+ "default_brkout_mode": "1x10G"
+ }
+ }
+}
+

device/ufispace/x86_64-ufispace_s9300_32d-r0/UFISPACE-S9300-32D/port_config.ini

@@ -0,0 +1,35 @@
+# name lanes alias index speed
+Ethernet0 1,2,3,4,5,6,7,8 Ethernet1/1 0 400000
+Ethernet8 9,10,11,12,13,14,15,16 Ethernet2/1 1 400000
+Ethernet16 17,18,19,20,21,22,23,24 Ethernet3/1 2 400000
+Ethernet24 25,26,27,28,29,30,31,32 Ethernet4/1 3 400000
+Ethernet32 33,34,35,36,37,38,39,40 Ethernet5/1 4 400000
+Ethernet40 41,42,43,44,45,46,47,48 Ethernet6/1 5 400000
+Ethernet48 49,50,51,52,53,54,55,56 Ethernet7/1 6 400000
+Ethernet56 57,58,59,60,61,62,63,64 Ethernet8/1 7 400000
+Ethernet64 65,66,67,68,69,70,71,72 Ethernet9/1 8 400000
+Ethernet72 73,74,75,76,77,78,79,80 Ethernet10/1 9 400000
+Ethernet80 81,82,83,84,85,86,87,88 Ethernet11/1 10 400000
+Ethernet88 89,90,91,92,93,94,95,96 Ethernet12/1 11 400000
+Ethernet96 97,98,99,100,101,102,103,104 Ethernet13/1 12 400000
+Ethernet104 105,106,107,108,109,110,111,112 Ethernet14/1 13 400000
+Ethernet112 113,114,115,116,117,118,119,120 Ethernet15/1 14 400000
+Ethernet120 121,122,123,124,125,126,127,128 Ethernet16/1 15 400000
+Ethernet128 129,130,131,132,133,134,135,136 Ethernet17/1 16 400000
+Ethernet136 137,138,139,140,141,142,143,144 Ethernet18/1 17 400000
+Ethernet144 145,146,147,148,149,150,151,152 Ethernet19/1 18 400000
+Ethernet152 153,154,155,156,157,158,159,160 Ethernet20/1 19 400000
+Ethernet160 161,162,163,164,165,166,167,168 Ethernet21/1 20 400000
+Ethernet168 169,170,171,172,173,174,175,176 Ethernet22/1 21 400000
+Ethernet176 177,178,179,180,181,182,183,184 Ethernet23/1 22 400000
+Ethernet184 185,186,187,188,189,190,191,192 Ethernet24/1 23 400000
+Ethernet192 193,194,195,196,197,198,199,200 Ethernet25/1 24 400000
+Ethernet200 201,202,203,204,205,206,207,208 Ethernet26/1 25 400000
+Ethernet208 209,210,211,212,213,214,215,216 Ethernet27/1 26 400000
+Ethernet216 217,218,219,220,221,222,223,224 Ethernet28/1 27 400000
+Ethernet224 225,226,227,228,229,230,231,232 Ethernet29/1 28 400000
+Ethernet232 233,234,235,236,237,238,239,240 Ethernet30/1 29 400000
+Ethernet240 241,242,243,244,245,246,247,248 Ethernet31/1 30 400000
+Ethernet248 249,250,251,252,253,254,255,256 Ethernet32/1 31 400000
+Ethernet256 257 Ethernet33 32 10000
+Ethernet257 259 Ethernet34 33 10000

device/ufispace/x86_64-ufispace_s9300_32d-r0/UFISPACE-S9300-32D/sai.profile

@@ -0,0 +1 @@
+SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/td4-s9300-32x400G.config.yml