[202111] [build] Use public storage for public resources. (#18201)

* [build] Use public storage for public resources. (#18038)

.azure-pipelines/azure-pipelines-UpgrateVersion.yml

@@ -11,32 +11,86 @@ schedules:
   displayName: Daily Build
   branches:
     include:
-    - 202012
+    - 20*
+    exclude:
+    - 200*
+    - 201*
+    - 202006
   always: true
 
+resources:
+  repositories:
+  - repository: buildimage
+    type: github
+    name: sonic-net/sonic-buildimage
+    ref: master
+    endpoint: sonic-net
+
 pool: sonicbld
 
+parameters:
+- name: 'jobFilters'
+  type: object
+  default:
+  - vs
+  - barefoot
+  - broadcom
+  - centec
+  - centec-arm64
+  - generic
+  - marvell-armhf
+  - mellanox
+
 stages:
+- stage: Prepare
+  jobs:
+  - job: Prepare
+    steps:
+    - script: |
+        DEFAULT_MIRROR_URL_PREFIX=http://packages.trafficmanager.net
+        DEBIAN_TIMESTAMP=$(curl $DEFAULT_MIRROR_URL_PREFIX/snapshot/debian/latest/timestamp)
+        DEBIAN_SECURITY_TIMESTAMP=$(curl $DEFAULT_MIRROR_URL_PREFIX/snapshot/debian-security/latest/timestamp)
+        echo "DEBIAN_TIMESTAMP=$DEBIAN_TIMESTAMP, DEBIAN_SECURITY_TIMESTAMP=$DEBIAN_SECURITY_TIMESTAMP"
+        echo "##vso[task.setvariable variable=DEBIAN_TIMESTAMP;isOutput=true]$DEBIAN_TIMESTAMP"
+        echo "##vso[task.setvariable variable=DEBIAN_SECURITY_TIMESTAMP;isOutput=true]$DEBIAN_SECURITY_TIMESTAMP"
+      name: SetVersions
+      displayName: 'Set snapshot versions'
 - stage: Build
+  dependsOn: Prepare
   variables:
-    CACHE_MODE: none
-    VERSION_CONTROL_OPTIONS: 'SONIC_VERSION_CONTROL_COMPONENTS='
+    - name: CACHE_MODE
+      value: none
+    - name: VERSION_CONTROL_OPTIONS
+      value: 'SONIC_VERSION_CONTROL_COMPONENTS='
+    - name: SKIP_CHECKOUT
+      value: true
+    - name: DEBIAN_TIMESTAMP
+      value: $[ stageDependencies.Prepare.Prepare.outputs['SetVersions.DEBIAN_TIMESTAMP'] ]
+    - name: DEBIAN_SECURITY_TIMESTAMP
+      value: $[ stageDependencies.Prepare.Prepare.outputs['SetVersions.DEBIAN_SECURITY_TIMESTAMP'] ]
+    - template: .azure-pipelines/template-variables.yml@buildimage
   jobs:
   - template: azure-pipelines-build.yml
     parameters:
-      buildOptions: '${{ variables.VERSION_CONTROL_OPTIONS }} SONIC_BUILD_JOBS=$(nproc) ENABLE_IMAGE_SIGNATURE=y'
+      jobFilters: ${{ parameters.jobFilters }}
+      buildOptions: '${{ variables.VERSION_CONTROL_OPTIONS }} ENABLE_DOCKER_BASE_PULL=n SONIC_BUILD_JOBS=$(nproc) ENABLE_IMAGE_SIGNATURE=y'
       preSteps:
+      - template: .azure-pipelines/template-clean-sonic-slave.yml@buildimage
+      - checkout: self
+        submodules: recursive
+        fetchDepth: 0
+        path: s
+        displayName: 'Checkout code'
       - script: |
-          containers=$(docker container ls | grep "sonic-slave" | awk '{ print $1 }')
-          if [ ! -z "$containers" ]; then
-            docker container kill $containers || true
-            sleep 5
+          echo "DEBIAN_TIMESTAMP=$DEBIAN_TIMESTAMP, DEBIAN_SECURITY_TIMESTAMP=$DEBIAN_SECURITY_TIMESTAMP"
+          if [ "$MIRROR_SNAPSHOT" == y ]; then
+            mkdir -p target/versions/default/
+            echo "debian==$DEBIAN_TIMESTAMP" > target/versions/default/versions-mirror
+            echo "debian-security==$DEBIAN_SECURITY_TIMESTAMP" >> target/versions/default/versions-mirror
+            cat target/versions/default/versions-mirror
           fi
-          images=$(docker images 'sonic-slave-*' -a -q)
-          if [ ! -z "$images" ]; then
-            docker rmi -f $images
-          fi
-        displayName: 'Cleanup sonic slave'
+        displayName: 'Set snapshot versions'
+
 - stage: UpgradeVersions
   jobs:
   - job: UpgradeVersions
@@ -60,14 +114,14 @@ stages:
         default_platform=broadcom
         artifacts=$(find $(Pipeline.Workspace) -maxdepth 1 -type d -name 'sonic-buildimage.*' | grep -v "sonic-buildimage.${default_platform}")
         echo "artifacts$artifacts"
-        cp -r $(Pipeline.Workspace)/sonic-buildimage.${default_platform}/versions target/
+        cp -r $(Pipeline.Workspace)/sonic-buildimage.${default_platform}/target/versions target/
         make freeze FREEZE_VERSION_OPTIONS=-r
         find files/build/versions 
         ordered_artifacts=$(echo "$artifacts" | grep -v -E "arm64|armhf" && echo "$artifacts" | grep -E "arm64|armhf")
         for artifact in $ordered_artifacts
         do
           rm -rf target/versions
-          cp -r $artifact/versions target/
+          cp -r $artifact/target/versions target/
           OPTIONS="-a -d"
           [[ "$artifact" == *arm64* || "$artifact" == *armhf* ]] && OPTIONS="-d"
           make freeze FREEZE_VERSION_OPTIONS="$OPTIONS"

.azure-pipelines/azure-pipelines-build.yml

@@ -50,6 +50,7 @@ jobs:
             swi_image: yes
 
         - name: broadcom
+          timeoutInMinutes: 1440
           variables:
             dbg_image: yes
             swi_image: yes
@@ -97,6 +98,8 @@ jobs:
             platform_rpc: nephos
 
     buildSteps:
+      - template: .azure-pipelines/template-skipvstest.yml@buildimage
+      - template: .azure-pipelines/template-daemon.yml@buildimage
       - bash: |
           set -ex
           if [ $(GROUP_NAME) == vs ]; then
@@ -107,7 +110,7 @@ jobs:
             make $BUILD_OPTIONS target/docker-sonic-vs.gz target/sonic-vs.img.gz target/docker-ptf.gz
             if [ $(Build.Reason) != 'PullRequest' ];then
               gzip -kd target/sonic-vs.img.gz
-              SONIC_RUN_CMDS="qemu-img convert target/sonic-vs.img -O vhdx -o subformat=dynamic target/sonic-vs.vhdx" make sonic-slave-run
+              SONIC_RUN_CMDS="qemu-img convert target/sonic-vs.img -O vhdx -o subformat=dynamic target/sonic-vs.vhdx" make $BUILD_OPTIONS sonic-slave-run
               rm target/sonic-vs.img
             fi
           else
@@ -131,3 +134,4 @@ jobs:
             make $BUILD_OPTIONS target/sonic-$(GROUP_NAME).bin
           fi
         displayName: "Build sonic image"
+      - template: .azure-pipelines/check-dirty-version.yml@buildimage

.azure-pipelines/azure-pipelines-download-certificate.yml

@@ -0,0 +1,33 @@
+parameters:
+- name: connectionName
+  type: string
+  default: sonic-dev-connection
+- name: kevaultName
+  type: string
+  default: sonic-kv
+- name: certificateName
+  type: string
+  default: sonic-secure-boot
+
+steps:
+- task: AzureKeyVault@2
+  inputs:
+    connectedServiceName: ${{ parameters.connectionName }}
+    keyVaultName: ${{ parameters.kevaultName }}
+    secretsFilter: ${{ parameters.certificateName }}
+
+- script: |
+    set -e
+    TMP_FILE=$(mktemp)
+    echo "$CERTIFICATE" | base64 -d > $TMP_FILE
+    sudo mkdir -p /etc/certificates
+    mkdir -p $(Build.StagingDirectory)/target
+    # Save the public key
+    openssl pkcs12 -in $TMP_FILE -clcerts --nokeys -nodes -passin pass: | sed -z -e "s/.*\(-----BEGIN CERTIFICATE\)/\1/" > $(SIGNING_CERT)
+    # Save the private key
+    openssl pkcs12 -in $TMP_FILE -nocerts -nodes -passin pass: | sed -z -e "s/.*\(-----BEGIN PRIVATE KEY\)/\1/" | sudo tee $(SIGNING_KEY) 1>/dev/null
+    ls -lt $(SIGNING_CERT) $(SIGNING_KEY)
+    rm $TMP_FILE
+  env:
+    CERTIFICATE: $(${{ parameters.certificateName }})
+  displayName: "Save certificate"

.azure-pipelines/azure-pipelines-image-template.yml

@@ -25,14 +25,17 @@ jobs:
     jobFilters: ${{ parameters.jobFilters }}
     jobVariables: ${{ parameters.jobVariables }}
     preSteps:
-      - template: cleanup.yml
+      - template: .azure-pipelines/cleanup.yml@buildimage
       - ${{ parameters.preSteps }}
       - script: |
-          if [ -n "$(CACHE_MODE)" ] && echo $(PLATFORM_AZP) | grep -E -q "^(vs|broadcom|mellanox)$"; then
+          [ -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"
-            echo "##vso[task.setvariable variable=BUILD_OPTIONS]$BUILD_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
         submodules: recursive
@@ -48,7 +51,7 @@ jobs:
           ENABLE_DOCKER_BASE_PULL=y make PLATFORM=$(PLATFORM_AZP) PLATFORM_ARCH=$(PLATFORM_ARCH) $(BUILD_OPTIONS) configure
         displayName: 'Make configure'
     postSteps:
-      - script: cp target -r $(Build.ArtifactStagingDirectory)/
+      - script: mv target $(Build.ArtifactStagingDirectory)/
         displayName: Copy Artifacts
         condition: always()
       - publish:  $(Build.ArtifactStagingDirectory)
@@ -58,7 +61,12 @@ jobs:
         condition: failed()
         artifact: 'sonic-buildimage.$(GROUP_NAME)$(GROUP_EXTNAME)$(System.JobAttempt)'
         displayName: "Archive failed sonic image"
+      - ${{ if ne(variables['Build.Reason'], 'PullRequest') }}:
+        - template: trigger-publish-artifacts-build.yml
+          parameters:
+            artifactName: 'sonic-buildimage.$(GROUP_NAME)$(GROUP_EXTNAME)'
+            publishPrefix: '$(Build.DefinitionName)/$(Build.SourceBranchName)/$(GROUP_NAME)'
       - ${{ parameters.postSteps }}
-      - template: cleanup.yml
+      - template: .azure-pipelines/cleanup.yml@buildimage
     jobGroups: ${{ parameters.jobGroups }}
     buildSteps: ${{ parameters.buildSteps }}

.azure-pipelines/azure-pipelines-repd-build-variables.yml

@@ -0,0 +1,2 @@
+variables:
+  VERSION_CONTROL_OPTIONS: 'SONIC_VERSION_CONTROL_COMPONENTS=deb,py2,py3,web,git,docker'

.azure-pipelines/build-commonlib.yml

@@ -0,0 +1,19 @@
+pr: none
+trigger: none
+schedules:
+- cron: "0 0 * * *"
+  displayName: Daily build
+  branches:
+    include:
+      - master
+      - 202???
+resources:
+  repositories:
+  - repository: buildimage
+    type: github
+    name: sonic-net/sonic-buildimage
+    ref: master
+    endpoint: sonic-net
+
+jobs:
+- template: .azure-pipelines/template-commonlib.yml@buildimage

.azure-pipelines/check-dirty-version.yml

@@ -0,0 +1,16 @@
+steps:
+- script: |
+    . functions.sh
+    SONIC_VERSION=$(sonic_get_version)
+    echo "SONIC_VERSION=$SONIC_VERSION"
+    if [[ "$SONIC_VERSION" == *dirty* ]]; then
+      # Print the detail dirty info
+      git status --untracked-files=no -s --ignore-submodules
+
+      # Exit with error, if it is a PR build
+      if [ "$(Build.Reason)" == "PullRequest" ]; then
+        echo "Build failed for the dirty version: $SONIC_VERSION" 1>&2
+        exit 1
+      fi
+    fi
+  displayName: "Check the dirty version"

.azure-pipelines/cleanup.yml

@@ -1,5 +1,11 @@
 steps:
 - script: |
+    set -x
+    # kill daemon process
+    ps $(cat /tmp/azp_daemon_kill_docker_pid)
+    sudo kill $(cat /tmp/azp_daemon_kill_docker_pid)
+    rm /tmp/azp_daemon_kill_docker_pid
+
     if sudo [ -f /var/run/march/docker.pid ] ; then
         pid=`sudo cat /var/run/march/docker.pid` ; sudo kill $pid
     fi
@@ -11,4 +17,5 @@ steps:
         pid=`sudo cat dockerfs/var/run/docker.pid` ; sudo kill $pid
     fi
     sudo rm -rf $(ls -A1)
+  condition: always()
   displayName: "Clean Workspace"

.azure-pipelines/docker-sonic-slave-template.yml

@@ -3,6 +3,13 @@
 # Add steps that build, run tests, deploy, and more:
 # https://aka.ms/yaml
 # Build and push sonic-slave-[buster|jessie|stretch] images for amd64/armhf/arm64
+resources:
+  repositories:
+  - repository: buildimage
+    type: github
+    name: sonic-net/sonic-buildimage
+    ref: master
+    endpoint: sonic-net
 
 parameters:
 - name: arch
@@ -38,6 +45,10 @@ jobs:
   pool: ${{ parameters.pool }}
   steps:
   - template: cleanup.yml
+  - ${{ if eq(variables['Build.Reason'], 'PullRequest') }}:
+    - template: template-clean-sonic-slave.yml
+  - ${{ else }}:
+    - template: .azure-pipelines/template-variables.yml@buildimage
   - checkout: self
     clean: true
     submodules: recursive
@@ -68,16 +79,6 @@ jobs:
         BUILD_OPTIONS = 'SONIC_VERSION_CONTROL_COMPONENTS=deb,py2,py3,web,git,docker'
       fi
 
-      containers=$(docker container ls | grep "sonic-slave" | awk '{ print $1 }')
-      if [ ! -z "$containers" ]; then
-        docker container kill $containers || true
-        sleep 5
-      fi
-      images=$(docker images 'sonic-slave-*' -a -q)
-      if [ ! -z "$images" ]; then
-        docker rmi -f $images
-      fi
-
       tmpfile=$(mktemp)
 
       echo ${{ parameters.arch }} > .arch

.azure-pipelines/docker-sonic-slave.yml

@@ -3,26 +3,36 @@
 # Add steps that build, run tests, deploy, and more:
 # https://aka.ms/yaml
 # Build and push sonic-slave-[buster|jessie|stretch] images for amd64/armhf/arm64
+resources:
+  repositories:
+  - repository: buildimage
+    type: github
+    name: sonic-net/sonic-buildimage
+    ref: master
+    endpoint: sonic-net
 
 schedules:
-- cron: "0 8 * * *"
+- cron: "0 0 * * 0"
+  displayName: Weekly build
   branches:
     include:
     - master
-    - 202012
+    - 202???
   always: true
 
-trigger: none
-pr:
+pr: none
+trigger:
+  batch: true
   branches:
     include:
     - master
+    - 202???
   paths:
     include:
-    - sonic-slave-jessie
-    - sonic-slave-stretch
-    - sonic-slave-buster
-    - sonic-slave-bullseye
+    - sonic-slave-*
+    - files/build/versions
+    - Makefile
+    - Makefile.work
 
 parameters:
 - name: 'arches'
@@ -46,13 +56,28 @@ parameters:
   default: sonicdev
 
 stages:
-- stage: Build
+- stage: Build_in_amd64
   jobs:
   - ${{ each dist in parameters.dists }}:
     - ${{ if endswith(variables['Build.DefinitionName'], dist) }}:
       - ${{ each arch in parameters.arches }}:
-        - template: docker-sonic-slave-template.yml
+        - template: .azure-pipelines/docker-sonic-slave-template.yml@buildimage
           parameters:
             pool: sonicbld
             arch: ${{ arch }}
             dist: ${{ dist }}
+            ${{ if ne(arch, 'amd64') }}:
+              march: _march_${{ arch }}
+- stage: Build_native_arm
+  dependsOn: []
+  jobs:
+  - ${{ each dist in parameters.dists }}:
+    - ${{ if endswith(variables['Build.DefinitionName'], dist) }}:
+      - ${{ each arch in parameters.arches }}:
+        - ${{ if ne(arch, 'amd64') }}:
+          - template: .azure-pipelines/docker-sonic-slave-template.yml@buildimage
+            parameters:
+              pool: sonicbld-${{ arch }}
+              arch: ${{ arch }}
+              dist: ${{ dist }}
+              march: _${{ arch }}

.azure-pipelines/official-build-cache.yml

@@ -18,7 +18,9 @@ stages:
 - stage: Build
   pool: sonicbld
   variables:
-    CACHE_MODE: cache
+  - name: CACHE_MODE
+    value: cache
+  - template: azure-pipelines-repd-build-variables.yml
   jobs:
   - template: azure-pipelines-build.yml
     parameters:
@@ -35,3 +37,8 @@ stages:
           variables:
             docker_syncd_rpc_image: yes
             platform_rpc: mlnx
+        - name: marvell-armhf
+          pool: sonicbld-armhf
+          timeoutInMinutes: 1200
+          variables:
+            PLATFORM_ARCH: armhf

.azure-pipelines/official-build-cisco-8000.yml

@@ -22,6 +22,18 @@ resources:
     name: Cisco-8000-sonic/platform-cisco-8000
     endpoint: cisco-connection
 
+
+variables:
+- group: SONIC-AKV-STROAGE-1
+- name: StorageSASKey
+  value: $(sonicstorage-SasToken)
+- name: SONIC_ENABLE_SECUREBOOT_SIGNATURE
+  value: y
+- name: SIGNING_KEY
+  value: /etc/certificates/sonic-secure-boot-private.pem
+- name: SIGNING_CERT
+  value: $(Build.StagingDirectory)/target/sonic-secure-boot-public.pem
+
 stages:
 - stage: Build
   pool: sonic
@@ -29,12 +41,14 @@ stages:
     CACHE_MODE: wcache
     SKIP_CHECKOUT: true
     TERM: ''
+    PACKAGE_URL: "https://sonicstorage.blob.core.windows.net/packages"
 
   jobs:
   - template: azure-pipelines-build.yml
     parameters:
       buildOptions: 'USERNAME=admin SONIC_BUILD_JOBS=$(nproc) ${{ variables.VERSION_CONTROL_OPTIONS }}'
       preSteps:
+      - template: azure-pipelines-download-certificate.yml
       - checkout: self
         submodules: recursive
         path: s
@@ -60,5 +74,34 @@ stages:
           make PLATFORM=cisco-8000 platform/cisco-8000
           tar xfz $(System.ArtifactsDirectory)/artifactory-*.tar.gz -C platform/cisco-8000
         displayName: 'Setup cisco artifacts'
+      - script: |
+          set -ex
+          filename=$(find platform/cisco-8000/artifactory/sonic -name cisco-* -type f | head -n 1)
+          if [ -z "$filename" ]; then
+            echo "Cisco sai package not found" 1>&2
+            exit 1
+          fi
+          cd $(dirname $filename)
+          echo "PWD=$(pwd)"
+          ls -l *.deb
+          while read -r package; do
+            # Cisco version format: <VERSION>-sai-<sai-ver>-<distribution>-<COMMIT HASH>
+            # The <sai-ver> may contain several values in one build, the part is skipped when publishing to storage
+            # See https://github.com/Cisco-8000-sonic/sdk/blob/master/azure-pipelines.yml
+            # The $PACKAGE_URL is only accessible for AZP
+            version=$(echo $package | awk -F_ '{print $(NF-1)}' | cut -d- -f1,2,4,5)
+            package_url="$PACKAGE_URL/sai/ciscosai/master/$version/$package"
+            echo "Override package $package from $package_url"
+            wget "$package_url$StorageSASKey" -O "$package"
+          done < <(ls *.deb)
+        env:
+          StorageSASKey: $(StorageSASKey)
+        condition: ne(variables['Build.Reason'], 'PullRequest')
+        displayName: "Override cisco sai packages"
+      - script: |
+          echo "SONIC_ENABLE_SECUREBOOT_SIGNATURE := y" >> rules/config.user
+          echo "SIGNING_KEY := $(SIGNING_KEY)" >> rules/config.user
+          echo "SIGNING_CERT := $(SIGNING_CERT)" >> rules/config.user
+        displayName: "Enable secure boot signature"
       jobGroups:
       - name: cisco-8000

.azure-pipelines/official-build-multi-asic.yml

@@ -18,9 +18,9 @@ stages:
 - stage: Build
   pool: sonicbld
   variables:
-    CACHE_MODE: wcache
-    ${{ if eq(variables['Build.SourceBranchName'], '202012') }}:
-      VERSION_CONTROL_OPTIONS: 'SONIC_VERSION_CONTROL_COMPONENTS=deb,py2,py3,web'
+  - template: azure-pipelines-repd-build-variables.yml
+  - name: CACHE_MODE
+    value: wcache
   jobs:
   - template: azure-pipelines-build.yml
     parameters:

.azure-pipelines/official-build.yml

@@ -9,7 +9,7 @@ schedules:
   branches:
     include:
     - master
-    - 202012
+    - 202111
   always: true
 - cron: "0 4 * * *"
   displayName: nightly build for release
@@ -18,16 +18,27 @@ schedules:
     - 201911
     - 201811
 
+resources:
+  repositories:
+  - repository: buildimage
+    type: github
+    name: sonic-net/sonic-buildimage
+    ref: master
+    endpoint: sonic-net
+
 trigger: none
 pr: none
 
+variables:
+- template: .azure-pipelines/template-variables.yml@buildimage
+
 stages:
 - stage: Build
   pool: sonicbld
   variables:
-    CACHE_MODE: wcache
-    ${{ if eq(variables['Build.SourceBranchName'], '202012') }}:
-      VERSION_CONTROL_OPTIONS: 'SONIC_VERSION_CONTROL_COMPONENTS=deb,py2,py3,web'
+  - name: CACHE_MODE
+    value: wcache
+  - template: .azure-pipelines/azure-pipelines-repd-build-variables.yml@buildimage
   jobs:
   - template: azure-pipelines-build.yml
     parameters:

.azure-pipelines/template-clean-sonic-slave.yml

@@ -0,0 +1,10 @@
+steps:
+- script: |
+    set -x
+    containers=$(docker container ls -aq)
+    [ -n "$containers" ] && docker container rm -f $containers
+    docker images | grep "^<none>" | awk '{print$3}' | xargs -i docker rmi {}
+    images=$(docker images 'sonic-slave-*' -a -q)
+    [ -n "$images" ] && docker rmi -f $images
+    exit 0
+  displayName: 'Cleanup sonic slave'

.azure-pipelines/template-commonlib.yml

@@ -0,0 +1,53 @@
+parameters:
+- name: archs
+  type: object
+  default:
+    - amd64
+    - armhf
+    - arm64
+
+jobs:
+- ${{ each arch in parameters.archs }}:
+  - job: Build_${{ arch }}
+    timeoutInMinutes: 120
+    ${{ if eq(arch,'amd64') }}:
+      pool: sonicbld
+    ${{ else }}:
+      pool: sonicbld-${{ arch }}
+    variables:
+      - template: template-variables.yml
+    steps:
+    - checkout: self
+      clean: true
+      submodules: recursive
+    - script: |
+        set -ex
+        branch=$(Build.SourceBranchName)
+        # replace all: '-' -> '_'
+        branch=${branch//-/_}
+        # replace all: 'a' -> 'A', DIST_MASTER is set in variable.
+        BRANCH=DIST_${branch^^}
+        # variable name is dynamic
+        bldenvs=${!BRANCH}
+        [ "$bldenvs" == "" ] && bldenvs="$(COMMON_LIB_BUILD_ENVS)"
+        for bldenv in $bldenvs
+        do
+          BLDENV=$bldenv make -f Makefile.work configure PLATFORM_ARCH=${{ arch }} PLATFORM=vs ENABLE_DOCKER_BASE_PULL=y
+        done
+        set +x
+        echo "##vso[task.setvariable variable=bldenvs;]$bldenvs"
+      displayName: Make configure
+    - script: |
+        set -ex
+        for bldenv in $(bldenvs)
+        do
+          SONIC_BUILD_JOBS=$(nproc) BLDENV=$bldenv make -f Makefile.work lib-packages ENABLE_DOCKER_BASE_PULL=y
+        done
+        mv target $(Build.ArtifactStagingDirectory)
+      displayName: Make common lib packages
+    - ${{ if eq(arch,'amd64') }}:
+      - publish: $(Build.ArtifactStagingDirectory)
+        artifact: common-lib
+    - ${{ else }}:
+      - publish: $(Build.ArtifactStagingDirectory)
+        artifact: common-lib.${{ arch }}

.azure-pipelines/template-daemon.yml

@@ -0,0 +1,24 @@
+steps:
+- bash: |
+    (
+      while true
+      do
+        sleep 120
+        now=$(date +%s)
+        pids=$(ps -C docker -o pid,etime,args | grep "docker build" | cut -d" " -f2)
+        for pid in $pids
+        do
+          start=$(date --date="$(ls -dl /proc/$pid --time-style full-iso | awk '{print$6,$7}')" +%s)
+          time_s=$(($now-$start))
+          if [[ $time_s -gt $(DOCKER_BUILD_TIMEOUT) ]]; then
+            echo =========== $(date +%F%T) $time_s &>> target/daemon.log
+            ps $pid &>> target/daemon.log
+            sudo kill $pid
+          fi
+        done
+      done
+    ) &
+    daemon_pid=$!
+    ps $daemon_pid
+    echo $daemon_pid >> /tmp/azp_daemon_kill_docker_pid
+  displayName: start daemon to kill hang docker

.azure-pipelines/template-skipvstest.yml

@@ -0,0 +1,12 @@
+steps:
+- ${{ if eq(variables['Build.Reason'], 'PullRequest') }}:
+  - script: |
+      set -ex
+      tar_branch=origin/$(System.PullRequest.TargetBranch)
+      git diff $tar_branch..HEAD --name-only | grep -v -f .azure-pipelines/vstest-exclude && exit 0
+      git diff $tar_branch..HEAD --name-only | grep -f .azure-pipelines/vstest-include && exit 0
+      set +x
+      echo "Skip vstest jobs"
+      echo "##vso[task.setvariable variable=SKIP_VSTEST;isOutput=true]YES"
+    name: SetVar
+    displayName: "Check if vstest is needed."

.azure-pipelines/template-variables.yml

@@ -0,0 +1,8 @@
+variables:
+  DEFAULT_CONTAINER_REGISTRY: 'publicmirror.azurecr.io'
+  COMMON_LIB_BUILD_ENVS: 'bullseye'
+  SONIC_SLAVE_DOCKER_DRIVER: 'overlay2'
+  SONIC_BUILD_RETRY_COUNT: 3
+  SONIC_BUILD_RETRY_INTERVAL: 600
+  DOCKER_BUILDKIT: 0
+  DOCKER_BUILD_TIMEOUT: 3600

.azure-pipelines/trigger-publish-artifacts-build.yml

@@ -0,0 +1,62 @@
+# The steps to trigger the pipeline to publish the artifacts
+
+parameters:
+- name: artifactName
+  type: string
+  default: ""
+- name: publishPrefix
+  type: string
+  default: "$(Build.DefinitionName)/$(Build.SourceBranchName)"
+
+steps:
+- script: |
+    . functions.sh
+    sonic_version=$(sonic_get_version)
+    latest_tag=$(git describe --tags --abbrev=0)
+    docker_tags="$sonic_version $(Build.SourceBranchName)"
+    if [ "$(Build.SourceBranchName)" == "master" ]; then
+      docker_tags="$docker_tags latest"
+    fi
+    echo "##vso[task.setvariable variable=sonic_version]$sonic_version"
+    echo "##vso[task.setvariable variable=latest_tag]$latest_tag"
+    echo "##vso[task.setvariable variable=docker_tags]$docker_tags"
+  displayName: 'Set trigger build variables'
+- task: TriggerBuild@4
+  inputs:
+    definitionIsInCurrentTeamProject: false
+    teamProject: internal
+    tfsServer: $(System.CollectionUri)
+    buildDefinition: 'publish-artifacts'
+    queueBuildForUserThatTriggeredBuild: true
+    ignoreSslCertificateErrors: false
+    useSameSourceVersion: false
+    useCustomSourceVersion: false
+    useSameBranch: false
+    waitForQueuedBuildsToFinish: false
+    storeInEnvironmentVariable: true
+    authenticationMethod: 'Personal Access Token'
+    password: '$(system.accesstoken)'
+    enableBuildInQueueCondition: false
+    dependentOnSuccessfulBuildCondition: false
+    dependentOnFailedBuildCondition: false
+    checkbuildsoncurrentbranch: false
+    failTaskIfConditionsAreNotFulfilled: false
+    buildParameters: ''
+    templateParameters: |
+      pipelineContext: {"buildId":"$(Build.BuildId)",
+        "pipelineId":"$(System.DefinitionId)",
+        "project": "$(System.TeamProject)",
+        "branchName":"$(Build.SourceBranchName)"},
+      artifactContext: {"artifactName":"${{ parameters.artifactName }}",
+        "artifactPatterns":"**/*.bin\n
+              **/*.swi\n
+              **/*.raw\n
+              **/*.img.gz\n
+              **/*-rpc.gz\n
+              **/python-saithrift*.deb"},
+      publishContext: {"publishPrefix":"${{ parameters.publishPrefix }}",
+        "keepArtifactName":false,
+        "dockerImagePatterns":"target/*-rpc.gz",
+        "dockerTags":"$(docker_tags)",
+        "version":"$(sonic_version)",
+        "latestTag":"$(latest_tag)"}

.azure-pipelines/vstest-exclude

@@ -0,0 +1,3 @@
+^platform
+^.azure-pipelines
+^files/build/versions

.azure-pipelines/vstest-include

@@ -0,0 +1,2 @@
+^platform/vs
+^.azure-pipelines/run-test-template.yml

.github/codeql/codeql-config.yml

@@ -0,0 +1,4 @@
+name: "CodeQL config"
+queries:
+  - uses: security-and-quality
+  - uses: security-extended

.github/workflows/README.md

@@ -0,0 +1,38 @@
+#  Github actions README
+This is an introduction about auto-cherry-pick workflow.
+take 202205 branch for example:
+1. pr_cherrypick_prestep:
+```mermaid
+graph
+Start(Origin PR) --> A{merged?}
+A -- NO --> STOP
+A -- YES --> A1{Approved<br> for 202205<br> Branch?}
+A1 -- NO --> STOP
+A1 -- YES --> A2(pr_cherrypick_prestep)
+B(pr_cherrypick_prestep)
+B --> B1{cherry pick<br>conflict?}
+B1 -- YES --> B2(Add tag:<br>Cherry Pick Confclit_202205) --> B3(Add comment:<br>refer author code conflict) --> STOP1(STOP)
+B1 -- NO --> B4(Create New PR) -- success --> B5(New PR add tag:<br> automerge) --> B6(New PR add comment:<br>Origin PR link) --> B7(Origin PR add tag:<br>Created PR to 202205 Branch) --> B8(Origin PR add comment:<br>New PR link)
+B4 -- fail --> STOP1
+```
+
+2. automerge:
+```mermaid
+graph
+Start(PR azp finished successfully) --> A{author:<br>mssonicbld?}
+A -- NO --> STOP
+A -- YES --> B{tag:<br>automerge?} -- YES --> C(Merge PR)
+B -- NO --> STOP
+```
+
+3. pr_cherrypick_poststep:
+```mermaid
+graph
+A(PR is Merged) --> B{tag:<br>automerge?}
+B -- YES --> B1{author:<br>mssonicbld?}
+B1 -- YES --> B2{"title starts:<br>[action] [PR:123]"}
+B2 -- YES --> C(Origin PR remove tag:<br> Created PR to 202205 Branch) --> D(Origin PR add tag:<br> Included in 202205 Branch)
+B -- NO --> STOP
+B1 -- NO --> STOP
+B2 -- NO --> STOP
+```

.github/workflows/automerge.yml

@@ -15,7 +15,7 @@ jobs:
     - name: automerge
       uses: 'pascalgn/automerge-action@v0.13.1'
       env:
-        GITHUB_TOKEN: '${{ secrets.GITHUB_TOKEN }}'
+        GITHUB_TOKEN: '${{ secrets.TOKEN }}'
         MERGE_LABELS: 'automerge'
         MERGE_METHOD: 'squash'
         MERGE_FILTER_AUTHOR: 'mssonicbld'

.github/workflows/codeql-analysis.yml

@@ -0,0 +1,43 @@
+# For more infomation, please visit: https://github.com/github/codeql-action
+
+name: "CodeQL"
+
+on:
+  push:
+    branches:
+      - 'master'
+      - '202[0-9][0-9][0-9]'
+  pull_request:
+    branches:
+      - 'master'
+      - '202[0-9][0-9][0-9]'
+
+jobs:
+  analyze:
+    name: Analyze
+    runs-on: ubuntu-latest
+    permissions:
+      actions: read
+      contents: read
+      security-events: write
+
+    strategy:
+      fail-fast: false
+      matrix:
+        language: [ 'python' ]
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v3
+
+    # Initializes the CodeQL tools for scanning.
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v2
+      with:
+        config-file: ./.github/codeql/codeql-config.yml
+        languages: ${{ matrix.language }}
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v2
+      with:
+        category: "/language:${{matrix.language}}"

.github/workflows/label.yml

@@ -13,6 +13,8 @@ on:
     - reopened
     branches:
     - '202012'
+    - '202[1-9][0-9][0-9]'
+    - '20[3-9][0-9][0-9][0-9]'
     paths:
     - 'files/build/versions/**'
 

.github/workflows/pr_cherrypick_poststep.yml

@@ -0,0 +1,49 @@
+name: PostCherryPick
+on:
+  pull_request_target:
+    types:
+    - closed
+    branches:
+    - '20*'
+
+jobs:
+  post_cherry_pick:
+    if: github.event.pull_request.merged == true && contains(github.event.pull_request.labels.*.name, 'automerge') && github.event.pull_request.head.user.login == 'mssonicbld' && startsWith(github.event.pull_request.title, '[action]')
+    runs-on: ubuntu-latest
+    steps:
+    - name: Debug
+      env:
+        GITHUB_CONTEXT: ${{ toJson(github) }}
+      run: echo $GITHUB_CONTEXT | jq
+    - name: Checkout
+      uses: actions/checkout@v3
+      with:
+        persist-credentials: false
+    - name: Main
+      env:
+        GITHUB_CONTEXT: ${{ toJson(github) }}
+        TOKEN: ${{ secrets.TOKEN }}
+      run: |
+        set -e
+        pr_url=$(echo $GITHUB_CONTEXT | jq -r ".event.pull_request._links.html.href")
+        pr_id=$(echo $GITHUB_CONTEXT | jq -r ".event.number")
+        base_ref=$(echo $GITHUB_CONTEXT | jq -r ".base_ref")
+        echo ${TOKEN} | gh auth login --with-token
+        title=$(echo $GITHUB_CONTEXT | jq -r ".event.pull_request.title")
+        origin_pr_id=$(echo $title | grep -Eo "\[action\] \[PR:[0-9]*\]" | grep -Eo "[0-9]*")
+        origin_pr_url=$(echo $pr_url | sed "s/$pr_id/$origin_pr_id/")
+        echo =============================
+        echo pr_url:        $pr_url
+        echo pr_id:         $pr_id
+        echo base_ref:      $base_ref
+        echo title:         $title
+        echo origin_pr_id:  $origin_pr_id
+        echo origin_pr_url: $origin_pr_url
+        echo =============================
+        # Add label
+        if [[ "$origin_pr_id" == "" ]];then
+          echo "original PR didn't found."
+          exit 1
+        fi
+        gh pr edit $origin_pr_url --add-label "Included in ${base_ref} Branch"
+        gh pr edit $origin_pr_url --remove-label "Created PR to ${base_ref} Branch,Request for ${base_ref} Branch,Approved for ${base_ref} Branch"

.github/workflows/pr_cherrypick_prestep.yml

@@ -0,0 +1,136 @@
+name: PreCherryPick
+on:
+  pull_request_target:
+    types:
+    - labeled
+    - closed
+    branches:
+    - master-test
+
+jobs:
+  pre_cherry_pick:
+    if: github.event.pull_request.merged == true && ( (github.event.action == 'closed' && contains(join(github.event.pull_request.labels.*.name, ','), 'Approved for 20')) || (github.event.action == 'labeled' && startsWith(github.event.label.name, 'Approved for 20')) )
+    runs-on: ubuntu-latest
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v3
+      with:
+        fetch-depth: 0
+        persist-credentials: false
+    - name: Debug
+      env:
+        GITHUB_CONTEXT: ${{ toJson(github) }}
+      run: echo $GITHUB_CONTEXT | jq
+    - name: Main
+      env:
+        GITHUB_CONTEXT: ${{ toJson(github) }}
+        TOKEN: ${{ secrets.TOKEN }}
+      run: |
+        set -e
+
+        sha=$(echo $GITHUB_CONTEXT | jq -r ".event.pull_request.merge_commit_sha")
+        pr_id=$(echo $GITHUB_CONTEXT | jq -r ".event.number")
+        pr_url=$(echo $GITHUB_CONTEXT | jq -r ".event.pull_request._links.html.href")
+        repository=$(echo $GITHUB_CONTEXT | jq -r ".repository")
+        labels=$(echo $GITHUB_CONTEXT | jq -r ".event.pull_request.labels[].name")
+        author=$(echo $GITHUB_CONTEXT | jq -r ".event.pull_request.base.user.login")
+        branches=$(git branch -a --list 'origin/20????' | awk -F/ '{print$3}' | grep -E "202[0-9]{3}")
+        if [[ $(echo $GITHUB_CONTEXT | jq -r ".event.action") == "labeled" ]];then
+          labels=$(echo $GITHUB_CONTEXT | jq -r ".event.label.name")
+        fi
+        title=$(echo $GITHUB_CONTEXT | jq -r ".event.pull_request.title")
+        echo =============================
+        echo SHA:           $sha
+        echo PRID:          $pr_id
+        echo pr_url:        $pr_url
+        echo repository:    $repository
+        echo branches:      $branches
+        echo labels:
+        echo "$labels"
+        echo ${TOKEN} | gh auth login --with-token
+        echo author:        $author
+        echo title:         $title
+        echo =============================
+
+        git config user.name mssonicbld
+        git config user.email sonicbld@microsoft.com
+        git config credential.https://github.com.username mssonicbld
+        git remote add mssonicbld https://mssonicbld:${TOKEN}@github.com/mssonicbld/sonic-buildimage
+        git fetch mssonicbld
+        git remote -vv
+
+        cherry_pick(){
+          set -e
+          local create_pr=''
+          while read label
+          do
+            echo label: $label
+            if [[ "$label" == "Approved for $branch Branch" ]];then
+              create_pr=1
+            fi
+            if [[ "$label" == "Created PR to $branch Branch" ]];then
+              echo "already has tag: Created PR to $branch Branch, return"
+              return 0
+            fi
+            if [[ "$label" == "Included in $branch Branch" ]];then
+              echo "already has tag: Included in $branch Branch, return"
+              return 0
+            fi
+            if [[ "$label" == "Cherry Pick Conflict_$branch" ]];then
+              echo "already has tag: Cherry Pick Conflict_$branch, return"
+              return 0
+            fi
+          done <<< "$labels"
+
+          if [[ "$create_pr" != "1" ]];then
+            echo "Didn't find 'Approved for $branch Branch' tag."
+            return 0
+          fi
+          # Begin to cherry-pick PR
+          git cherry-pick --abort 2>/dev/null || true
+          git clean -xdff 2>/dev/null || true
+          git reset HEAD --hard || true
+          git checkout -b $branch --track origin/$branch
+          git status | grep "working tree clean"
+
+          if ! git cherry-pick $sha;then
+            echo 'cherry-pick failed.'
+            git cherry-pick --abort
+            git status | grep "working tree clean"
+            # Add label
+            gh pr edit $pr_url --add-label "Cherry Pick Conflict_$branch"
+            echo 'Add label "Cherry Pick Conflict_$branch" success'
+            gh pr comment $pr_url --body "@${author} PR conflicts with $branch branch"
+            echo 'Add commnet "@${author} PR conflicts with $branch branch"'
+          else
+            # Create PR to release branch
+            git push mssonicbld HEAD:$branch-${pr_id} -f
+            result=$(gh pr create -R ${repository} -H mssonicbld:$branch-${pr_id} -B $branch -t "[action] [PR:$pr_id] $title" -b '' 2>&1)
+            echo $result | grep "already exists" && { echo $result; return 0; }
+            echo $result | grep github.com || { echo $result; return 1; }
+            new_pr_rul=$(echo $result | grep github.com)
+            echo new_pr_rul:    $new_pr_rul
+
+            # Add label to old PR
+            gh pr edit $pr_url --add-label "Created PR to $branch Branch"
+            echo Add label Created PR to $branch Branch
+            # Add comment to old PR
+            gh pr comment $pr_url --body "Cherry-pick PR to $branch: ${new_pr_rul}"
+            echo Add comment to old PR
+
+            # Add label to new PR
+            gh pr edit $new_pr_rul --add-label "automerge"
+            echo Add label automerge to new PR
+            # Add comment to new PR
+            gh pr comment $new_pr_rul --body "Original PR: ${pr_url}"
+            echo Add comment to new PR
+          fi
+        }
+
+        for branch in $branches
+        do
+          echo -------------------------------------------
+          echo Begin to parse Branch: $branch
+          cherry_pick
+        done
+

.gitignore

@@ -93,3 +93,6 @@ htmlcov/
 .vscode/
 .idea/
 
+# Debian mirror Sources
+sources.list.*
+!sources.list*.j2

.gitmodules

@@ -1,15 +1,15 @@
 [submodule "sonic-swss-common"]
 	path = src/sonic-swss-common
-	url = https://github.com/Azure/sonic-swss-common
+	url = https://github.com/sonic-net/sonic-swss-common
 [submodule "sonic-linux-kernel"]
 	path = src/sonic-linux-kernel
-	url = https://github.com/Azure/sonic-linux-kernel
+	url = https://github.com/sonic-net/sonic-linux-kernel
 [submodule "sonic-sairedis"]
 	path = src/sonic-sairedis
-	url = https://github.com/Azure/sonic-sairedis
+	url = https://github.com/sonic-net/sonic-sairedis
 [submodule "sonic-swss"]
 	path = src/sonic-swss
-	url = https://github.com/Azure/sonic-swss
+	url = https://github.com/sonic-net/sonic-swss
 [submodule "src/p4c-bm/p4c-bm"]
 	path = platform/p4/p4c-bm/p4c-bm
 	url = https://github.com/krambn/p4c-bm
@@ -18,34 +18,34 @@
 	url = https://github.com/p4lang/p4-hlir
 [submodule "sonic-dbsyncd"]
 	path = src/sonic-dbsyncd
-	url = https://github.com/Azure/sonic-dbsyncd
+	url = https://github.com/sonic-net/sonic-dbsyncd
 [submodule "src/sonic-py-swsssdk"]
 	path = src/sonic-py-swsssdk
-	url = https://github.com/Azure/sonic-py-swsssdk.git
+	url = https://github.com/sonic-net/sonic-py-swsssdk.git
 [submodule "src/sonic-snmpagent"]
 	path = src/sonic-snmpagent
-	url = https://github.com/Azure/sonic-snmpagent
+	url = https://github.com/sonic-net/sonic-snmpagent
 [submodule "src/ptf"]
 	path = src/ptf
 	url = https://github.com/p4lang/ptf.git
 [submodule "src/sonic-utilities"]
 	path = src/sonic-utilities
-	url = https://github.com/Azure/sonic-utilities
+	url = https://github.com/sonic-net/sonic-utilities
 [submodule "platform/broadcom/sonic-platform-modules-arista"]
 	path = platform/broadcom/sonic-platform-modules-arista
 	url = https://github.com/aristanetworks/sonic
 [submodule "src/sonic-platform-common"]
 	path = src/sonic-platform-common
-	url = https://github.com/Azure/sonic-platform-common
+	url = https://github.com/sonic-net/sonic-platform-common
 [submodule "src/sonic-platform-daemons"]
 	path = src/sonic-platform-daemons
-	url = https://github.com/Azure/sonic-platform-daemons
+	url = https://github.com/sonic-net/sonic-platform-daemons
 [submodule "src/sonic-platform-pde"]
 	path = src/sonic-platform-pde
-	url = https://github.com/Azure/sonic-platform-pdk-pde
+	url = https://github.com/sonic-net/sonic-platform-pdk-pde
 [submodule "src/sonic-frr/frr"]
 	path = src/sonic-frr/frr
-	url = https://github.com/Azure/sonic-frr.git
+	url = https://github.com/sonic-net/sonic-frr.git
 	branch = frr/7.5
 [submodule "platform/p4/p4-hlir/p4-hlir-v1.1"]
 	path = platform/p4/p4-hlir/p4-hlir-v1.1
@@ -62,38 +62,44 @@
 [submodule "src/redis-dump-load"]
 	path = src/redis-dump-load
 	url = https://github.com/p/redis-dump-load.git
+[submodule "src/scapy"]
+	path = src/scapy
+	url = https://github.com/secdev/scapy.git
 [submodule "platform/mellanox/mlnx-sai/SAI-Implementation"]
 	path = platform/mellanox/mlnx-sai/SAI-Implementation
 	url = https://github.com/Mellanox/SAI-Implementation
 [submodule "src/sonic-mgmt-framework"]
 	path = src/sonic-mgmt-framework
-	url = https://github.com/Azure/sonic-mgmt-framework
+	url = https://github.com/sonic-net/sonic-mgmt-framework
 [submodule "src/sonic-telemetry"]
 	path = src/sonic-telemetry
-	url = https://github.com/Azure/sonic-telemetry
+	url = https://github.com/sonic-net/sonic-telemetry
 [submodule "Switch-SDK-drivers"]
 	path = platform/mellanox/sdk-src/sx-kernel/Switch-SDK-drivers
 	url = https://github.com/Mellanox/Switch-SDK-drivers
 [submodule "src/sonic-ztp"]
 	path = src/sonic-ztp
-	url = https://github.com/Azure/sonic-ztp
+	url = https://github.com/sonic-net/sonic-ztp
 [submodule "src/sonic-restapi"]
 	path = src/sonic-restapi
-	url = https://github.com/Azure/sonic-restapi.git
+	url = https://github.com/sonic-net/sonic-restapi.git
 	branch = master
 [submodule "src/sonic-mgmt-common"]
 	path = src/sonic-mgmt-common
-	url = https://github.com/Azure/sonic-mgmt-common.git
+	url = https://github.com/sonic-net/sonic-mgmt-common.git
 [submodule "src/wpasupplicant/sonic-wpa-supplicant"]
 	path = src/wpasupplicant/sonic-wpa-supplicant
-	url = https://github.com/Azure/sonic-wpa-supplicant.git
+	url = https://github.com/sonic-net/sonic-wpa-supplicant.git
 [submodule "platform/broadcom/saibcm-modules-dnx"]
 	path = platform/broadcom/saibcm-modules-dnx
-	url = https://github.com/Azure/saibcm-modules.git
+	url = https://github.com/sonic-net/saibcm-modules.git
 	branch =  sdk-6.5.22-gpl-dnx
 [submodule "platform/broadcom/sonic-platform-modules-nokia"]
 	path = platform/broadcom/sonic-platform-modules-nokia
 	url = https://github.com/nokia/sonic-platform.git
 [submodule "src/linkmgrd"]
 	path = src/linkmgrd
-	url = https://github.com/Azure/sonic-linkmgrd.git
+	url = https://github.com/sonic-net/sonic-linkmgrd.git
+[submodule "src/sonic-p4rt/sonic-pins"]
+	path = src/sonic-p4rt/sonic-pins
+	url = https://github.com/sonic-net/sonic-pins.git

Makefile

@@ -25,20 +25,21 @@ PLATFORM_PATH := platform/$(if $(PLATFORM),$(PLATFORM),$(CONFIGURED_PLATFORM))
 PLATFORM_CHECKOUT := platform/checkout
 PLATFORM_CHECKOUT_FILE := $(PLATFORM_CHECKOUT)/$(PLATFORM).ini
 PLATFORM_CHECKOUT_CMD := $(shell if [ -f $(PLATFORM_CHECKOUT_FILE) ]; then PLATFORM_PATH=$(PLATFORM_PATH) j2 $(PLATFORM_CHECKOUT)/template.j2 $(PLATFORM_CHECKOUT_FILE); fi)
+MAKE_WITH_RETRY := ./scripts/run_with_retry $(MAKE)
 
 %::
 	@echo "+++ --- Making $@ --- +++"
 ifeq ($(NOJESSIE), 0)
-	EXTRA_DOCKER_TARGETS=$(notdir $@) make -f Makefile.work jessie
+	$(MAKE_WITH_RETRY) EXTRA_DOCKER_TARGETS=$(notdir $@) -f Makefile.work jessie
 endif
 ifeq ($(NOSTRETCH), 0)
-	EXTRA_DOCKER_TARGETS=$(notdir $@) BLDENV=stretch make -f Makefile.work stretch
+	$(MAKE_WITH_RETRY) EXTRA_DOCKER_TARGETS=$(notdir $@) BLDENV=stretch -f Makefile.work stretch
 endif
 ifeq ($(NOBUSTER), 0)
-	EXTRA_DOCKER_TARGETS=$(notdir $@) BLDENV=buster make -f Makefile.work buster
+	$(MAKE_WITH_RETRY) EXTRA_DOCKER_TARGETS=$(notdir $@) BLDENV=buster -f Makefile.work buster
 endif
 ifeq ($(NOBULLSEYE), 0)
-	BLDENV=bullseye make -f Makefile.work $@
+	$(MAKE_WITH_RETRY) BLDENV=bullseye -f Makefile.work $@
 endif
 
 jessie:

Makefile.cache

@@ -68,6 +68,7 @@
 # Run the 'touch cache.skip.common' command in the base directory to exclude the common files from caching
 SONIC_COMMON_FILES_LIST :=  $(if $(wildcard cache.skip.common),, .platform slave.mk rules/functions Makefile.cache)
 SONIC_COMMON_FLAGS_LIST :=  $(CONFIGURED_PLATFORM) \
+                            $(BLDENV) \
                             $(SONIC_DEBUGGING_ON) \
                             $(SONIC_PROFILING_ON) $(SONIC_ENABLE_SYNCD_RPC)
 SONIC_COMMON_DPKG_LIST  :=  debian/control debian/changelog debian/rules \
@@ -184,7 +185,7 @@ define GET_MOD_DEP_SHA
 	$(if $($(1)_DEP_FILES_MISSING), $(warning "[ DPKG ] Dependecy file(s) are not found for $(1) : $($(1)_DEP_FILES_MISSING)))
 
 	# Include package dependencies hash values into package hash calculation
-	$(eval $(1)_DEP_PKGS_SHA := $(foreach dfile,$(1)_MOD_DEP_PKGS,$(dfile)_DEP_MOD_SHA $(dfile)_MOD_HASH))
+	$(eval $(1)_DEP_PKGS_SHA := $(foreach dfile,$($(1)_MOD_DEP_PKGS),$($(dfile)_DEP_MOD_SHA) $($(dfile)_MOD_HASH)))
 
 	$(eval $(1)_DEP_MOD_SHA := $(shell bash -c "git hash-object  $($(1)_DEP_MOD_SHA_FILES) && echo $($(1)_DEP_PKGS_SHA)" \
                             | sha1sum | awk '{print substr($$1,0,23);}'))
@@ -559,6 +560,12 @@ define SHA_DEP_RULES
 ALL_DEP_FILES_LIST += $(foreach pkg,$(2), $($(filter none,$($(1)_CACHE_MODE)), \
                       $(addsuffix .$(3),$(addprefix $(pkg)/, $(1))) \
                       $(addsuffix .$(3).sha,$(addprefix $(pkg)/, $(1)))))
+$(foreach docker, $(filter $(SONIC_DOCKER_IMAGES), $(1)), \
+	$(eval $(docker)_DEP_FILES+=$(wildcard files/build/versions/default/*) \
+	$(wildcard files/build/versions/dockers/$(basename $(docker))/*)))
+$(foreach docker, $(filter $(SONIC_DOCKER_DBG_IMAGES), $(1)), \
+	$(eval $(docker)_DEP_FILES+=$(wildcard files/build/versions/default/*) \
+	$(wildcard files/build/versions/dockers/$(patsubst %-$(DBG_IMAGE_MARK).gz,%,$(docker))/*)))
 $(addsuffix .$(3),$(addprefix $(2)/, $(1))) : $(2)/%.$(3) : \
 	$(2)/%.flags $$$$($$$$*_DEP_FILES) $$$$(if $$$$($$$$*_SMDEP_FILES), $(2)/%.smdep)
 	@$$(eval $$*_DEP_FILES_MODIFIED := $$? )

Makefile.work

@@ -115,6 +115,10 @@ rules/config.user:
 include rules/config
 -include rules/config.user
 
+ifneq ($(DEFAULT_CONTAINER_REGISTRY),)
+override DEFAULT_CONTAINER_REGISTRY := $(DEFAULT_CONTAINER_REGISTRY)/
+endif
+
 ifeq ($(ENABLE_DOCKER_BASE_PULL),)
 	override ENABLE_DOCKER_BASE_PULL = n
 endif
@@ -136,12 +140,13 @@ SLAVE_IMAGE = $(SLAVE_BASE_IMAGE)-$(USER_LC)
 # Generate the version control build info
 $(shell SONIC_VERSION_CONTROL_COMPONENTS=$(SONIC_VERSION_CONTROL_COMPONENTS) \
     TRUSTED_GPG_URLS=$(TRUSTED_GPG_URLS) PACKAGE_URL_PREFIX=$(PACKAGE_URL_PREFIX) \
+    MIRROR_SNAPSHOT=$(MIRROR_SNAPSHOT) \
     scripts/generate_buildinfo_config.sh)
 
 # Generate the slave Dockerfile, and prepare build info for it
-$(shell CONFIGURED_ARCH=$(CONFIGURED_ARCH) MULTIARCH_QEMU_ENVIRON=$(MULTIARCH_QEMU_ENVIRON) DOCKER_EXTRA_OPTS=$(DOCKER_EXTRA_OPTS) j2 $(SLAVE_DIR)/Dockerfile.j2 > $(SLAVE_DIR)/Dockerfile)
+$(shell CONFIGURED_ARCH=$(CONFIGURED_ARCH) MULTIARCH_QEMU_ENVIRON=$(MULTIARCH_QEMU_ENVIRON) DOCKER_EXTRA_OPTS=$(DOCKER_EXTRA_OPTS) DEFAULT_CONTAINER_REGISTRY=$(DEFAULT_CONTAINER_REGISTRY) j2 $(SLAVE_DIR)/Dockerfile.j2 > $(SLAVE_DIR)/Dockerfile)
 $(shell CONFIGURED_ARCH=$(CONFIGURED_ARCH) MULTIARCH_QEMU_ENVIRON=$(MULTIARCH_QEMU_ENVIRON) j2 $(SLAVE_DIR)/Dockerfile.user.j2 > $(SLAVE_DIR)/Dockerfile.user)
-$(shell BUILD_SLAVE=y scripts/prepare_docker_buildinfo.sh $(SLAVE_BASE_IMAGE) $(SLAVE_DIR)/Dockerfile $(CONFIGURED_ARCH) "" $(BLDENV))
+$(shell BUILD_SLAVE=y DEFAULT_CONTAINER_REGISTRY=$(DEFAULT_CONTAINER_REGISTRY) 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);}')
@@ -184,9 +189,22 @@ ifneq ($(SONIC_DPKG_CACHE_SOURCE),)
 	DOCKER_RUN += -v "$(SONIC_DPKG_CACHE_SOURCE):/dpkg_cache:rw"
 endif
 
+ifeq ($(SONIC_ENABLE_SECUREBOOT_SIGNATURE), y)
+ifneq ($(SIGNING_KEY),)
+	DOCKER_SIGNING_SOURCE := $(shell dirname $(SIGNING_KEY))
+	DOCKER_RUN += -v "$(DOCKER_SIGNING_SOURCE):$(DOCKER_SIGNING_SOURCE):ro"
+endif
+ifneq ($(SIGNING_CERT),)
+	DOCKER_SIGNING_SOURCE := $(shell dirname $(SIGNING_CERT))
+	DOCKER_RUN += -v "$(DOCKER_SIGNING_SOURCE):$(DOCKER_SIGNING_SOURCE):ro"
+endif
+endif
+
 ifeq ($(SONIC_CONFIG_USE_NATIVE_DOCKERD_FOR_BUILD), y)
+ifneq ($(MULTIARCH_QEMU_ENVIRON), y)
     DOCKER_RUN += -v /var/run/docker.sock:/var/run/docker.sock
 endif
+endif
 
 ifeq ($(MULTIARCH_QEMU_ENVIRON), y)
 ifeq ($(DOCKER_DATA_ROOT_FOR_MULTIARCH),)
@@ -206,7 +224,7 @@ endif
     #Override Native config to prevent docker service
     SONIC_CONFIG_USE_NATIVE_DOCKERD_FOR_BUILD=y
 
-    DOCKER_MULTIARCH_CHECK := docker inspect --type image multiarch/qemu-user-static:register &> /dev/null || (echo "multiarch docker not found ..."; docker run --rm --privileged multiarch/qemu-user-static:register --reset --credential yes)
+    DOCKER_MULTIARCH_CHECK := docker run --rm --privileged multiarch/qemu-user-static --reset -p yes --credential yes
 
     DOCKER_SERVICE_SAFE_KILLER :=  (MARCH_PID=`ps -eo pid,cmd | grep "[0-9] dockerd.*march" | awk '{print $$1}'`; echo "Killing march docker $$MARCH_PID"; [ -z "$$MARCH_PID" ] || sudo kill -9 "$$MARCH_PID";)
     DOCKER_SERVICE_MULTIARCH_CHECK := ($(DOCKER_SERVICE_SAFE_KILLER); sudo rm -fr /var/run/march/; (echo "Starting docker march service..."; sudo $(SONIC_NATIVE_DOCKERD_FOR_MUTLIARCH) &) &>/dev/null ; sleep 2; sudo $(SONIC_USERFACL_DOCKERD_FOR_MUTLIARCH);)
@@ -263,6 +281,7 @@ SONIC_BUILD_INSTRUCTION :=  make \
                            SONIC_ENABLE_PFCWD_ON_START=$(ENABLE_PFCWD_ON_START) \
                            SONIC_ENABLE_SYNCD_RPC=$(ENABLE_SYNCD_RPC) \
                            SONIC_INSTALL_DEBUG_TOOLS=$(INSTALL_DEBUG_TOOLS) \
+                           SONIC_SAITHRIFT_V2=$(SAITHRIFT_V2) \
                            MDEBUG=$(MDEBUG) \
                            PASSWORD=$(PASSWORD) \
                            USERNAME=$(USERNAME) \
@@ -283,17 +302,27 @@ SONIC_BUILD_INSTRUCTION :=  make \
                            EXTRA_DOCKER_TARGETS=$(EXTRA_DOCKER_TARGETS) \
                            BUILD_LOG_TIMESTAMP=$(BUILD_LOG_TIMESTAMP) \
                            SONIC_ENABLE_IMAGE_SIGNATURE=$(ENABLE_IMAGE_SIGNATURE) \
+                           SONIC_ENABLE_SECUREBOOT_SIGNATURE=$(SONIC_ENABLE_SECUREBOOT_SIGNATURE) \
+                           SONIC_DEFAULT_CONTAINER_REGISTRY=$(DEFAULT_CONTAINER_REGISTRY) \
                            ENABLE_HOST_SERVICE_ON_START=$(ENABLE_HOST_SERVICE_ON_START) \
                            SLAVE_DIR=$(SLAVE_DIR) \
                            ENABLE_AUTO_TECH_SUPPORT=$(ENABLE_AUTO_TECH_SUPPORT) \
                            BUILD_MULTIASIC_KVM=$(BUILD_MULTIASIC_KVM) \
+                           MIRROR_URLS=$(MIRROR_URLS) \
+                           MIRROR_SECURITY_URLS=$(MIRROR_SECURITY_URLS) \
+                           MIRROR_SNAPSHOT=$(MIRROR_SNAPSHOT) \
+                           SONIC_VERSION_CONTROL_COMPONENTS=$(SONIC_VERSION_CONTROL_COMPONENTS) \
                            $(SONIC_OVERRIDE_BUILD_VARS)
 
 .PHONY: sonic-slave-build sonic-slave-bash init reset
 
 .DEFAULT_GOAL :=  all
 
-%::
+export MIRROR_URLS
+export MIRROR_SECURITY_URLS
+export SONIC_VERSION_CONTROL_COMPONENTS
+
+%:: | sonic-build-hooks
 ifeq ($(MULTIARCH_QEMU_ENVIRON), y)
 	@$(DOCKER_MULTIARCH_CHECK)
 ifneq ($(BLDENV), )
@@ -303,8 +332,6 @@ endif
 endif
 	@$(OVERLAY_MODULE_CHECK)
 
-	@pushd src/sonic-build-hooks; TRUSTED_GPG_URLS=$(TRUSTED_GPG_URLS) make all; popd
-	@cp src/sonic-build-hooks/buildinfo/sonic-build-hooks* $(SLAVE_DIR)/buildinfo
 	@docker inspect --type image $(SLAVE_BASE_IMAGE):$(SLAVE_BASE_TAG) &> /dev/null || \
 	    { [ $(ENABLE_DOCKER_BASE_PULL) == y ] && { echo Image $(SLAVE_BASE_IMAGE):$(SLAVE_BASE_TAG) not found. Pulling...; } && \
 	      $(DOCKER_BASE_PULL) && \
@@ -329,8 +356,13 @@ endif
 sonic-build-hooks:
 	@pushd src/sonic-build-hooks; TRUSTED_GPG_URLS=$(TRUSTED_GPG_URLS) make all; popd
 	@cp src/sonic-build-hooks/buildinfo/sonic-build-hooks* $(SLAVE_DIR)/buildinfo
+	@[ "$(MULTIARCH_QEMU_ENVIRON)" == y ] && scripts/build_mirror_config.sh $(SLAVE_DIR) amd64 $(BLDENV)
+	@scripts/build_mirror_config.sh $(SLAVE_DIR) $(CONFIGURED_ARCH) $(BLDENV)
 
 sonic-slave-base-build : sonic-build-hooks
+ifeq ($(MULTIARCH_QEMU_ENVIRON), y)
+	@$(DOCKER_MULTIARCH_CHECK)
+endif
 	@$(OVERLAY_MODULE_CHECK)
 	@echo Checking sonic-slave-base image: $(SLAVE_BASE_IMAGE):$(SLAVE_BASE_TAG)
 	@docker inspect --type image $(SLAVE_BASE_IMAGE):$(SLAVE_BASE_TAG) &> /dev/null || \

azure-pipelines.yml

@@ -16,7 +16,7 @@ pr:
   branches:
     include:
       - master
-      - 202012
+      - 202111
       - bullseye
   paths:
     exclude:
@@ -28,28 +28,51 @@ resources:
   repositories:
   - repository: sonic-mgmt
     type: github
-    name: Azure/sonic-mgmt
-    endpoint: build
+    name: sonic-net/sonic-mgmt
+    endpoint: sonic-net
+  - repository: buildimage
+    type: github
+    name: sonic-net/sonic-buildimage
+    endpoint: sonic-net
+    ref: master
+
+variables:
+- template: .azure-pipelines/azure-pipelines-repd-build-variables.yml@buildimage
+- template: .azure-pipelines/template-variables.yml@buildimage
+- name: CACHE_MODE
+  value: rcache 
 
 stages:
-- stage: Build
+- stage: BuildVS
   pool: sonicbld
-  variables:
-    CACHE_MODE: rcache
-    ${{ if eq(variables['Build.SourceBranchName'], '202012') }}:
-      VERSION_CONTROL_OPTIONS: 'SONIC_VERSION_CONTROL_COMPONENTS=deb,py2,py3,web,git,docker'
   jobs:
   - template: .azure-pipelines/azure-pipelines-build.yml
     parameters:
       buildOptions: 'USERNAME=admin SONIC_BUILD_JOBS=$(nproc) ${{ variables.VERSION_CONTROL_OPTIONS }}'
       jobGroups:
       - name: vs
+
+- stage: Build
+  pool: sonicbld
+  dependsOn: []
+  jobs:
+  - template: .azure-pipelines/azure-pipelines-build.yml
+    parameters:
+      buildOptions: 'USERNAME=admin SONIC_BUILD_JOBS=$(nproc) ${{ variables.VERSION_CONTROL_OPTIONS }}'
+      jobGroups:
       - name: broadcom
         variables:
           swi_image: yes
       - name: mellanox
+      - name: marvell-armhf
+        pool: sonicbld-armhf
+        timeoutInMinutes: 1200
+        variables:
+          PLATFORM_ARCH: armhf
 
 - stage: Test
+  dependsOn: BuildVS
+  condition: and(ne(stageDependencies.BuildVS.outputs['vs.SetVar.SKIP_VSTEST'], 'YES'), in(dependencies.BuildVS.result, 'Succeeded', 'SucceededWithIssues'))
   variables:
   - name: inventory
     value: veos_vtb

build_debian.sh

@@ -67,6 +67,9 @@ mkdir -p $FILESYSTEM_ROOT/$PLATFORM_DIR
 mkdir -p $FILESYSTEM_ROOT/$PLATFORM_DIR/x86_64-grub
 touch $FILESYSTEM_ROOT/$PLATFORM_DIR/firsttime
 
+## ensure proc is mounted
+sudo mount proc /proc -t proc || true
+
 ## make / as a mountpoint in chroot env, needed by dockerd
 pushd $FILESYSTEM_ROOT
 sudo mount --bind . .
@@ -104,6 +107,7 @@ sudo LANG=C chroot $FILESYSTEM_ROOT mount
 [ -d $TRUSTED_GPG_DIR ] && [ ! -z "$(ls $TRUSTED_GPG_DIR)" ] && sudo cp $TRUSTED_GPG_DIR/* ${FILESYSTEM_ROOT}/etc/apt/trusted.gpg.d/
 
 ## Pointing apt to public apt mirrors and getting latest packages, needed for latest security updates
+scripts/build_mirror_config.sh files/apt $CONFIGURED_ARCH $IMAGE_DISTRO 
 sudo cp files/apt/sources.list.$CONFIGURED_ARCH $FILESYSTEM_ROOT/etc/apt/sources.list
 sudo cp files/apt/apt.conf.d/{81norecommends,apt-{clean,gzip-indexes,no-languages},no-check-valid-until} $FILESYSTEM_ROOT/etc/apt/apt.conf.d/
 
@@ -140,6 +144,23 @@ if [[ $CONFIGURED_ARCH == amd64 ]]; then
     sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y install dmidecode hdparm
 fi
 
+## Sign the Linux kernel
+if [ "$SONIC_ENABLE_SECUREBOOT_SIGNATURE" = "y" ]; then
+    if [ ! -f $SIGNING_KEY ]; then
+       echo "Error: SONiC linux kernel signing key missing"
+       exit 1
+    fi
+    if [ ! -f $SIGNING_CERT ]; then
+       echo "Error: SONiC linux kernel signing certificate missing"
+       exit 1
+    fi
+
+    echo '[INFO] Signing SONiC linux kernel image'
+    K=$FILESYSTEM_ROOT/boot/vmlinuz-${LINUX_KERNEL_VERSION}-amd64
+    sbsign --key $SIGNING_KEY --cert $SIGNING_CERT --output /tmp/${K##*/} ${K}
+    sudo cp -f /tmp/${K##*/} ${K}
+fi
+
 ## Update initramfs for booting with squashfs+overlay
 cat files/initramfs-tools/modules | sudo tee -a $FILESYSTEM_ROOT/etc/initramfs-tools/modules > /dev/null
 
@@ -190,7 +211,7 @@ if [ -f platform/$CONFIGURED_PLATFORM/modules ]; then
 fi
 
 ## Add mtd and uboot firmware tools package
-sudo LANG=C chroot $FILESYSTEM_ROOT apt-get -y install u-boot-tools mtd-utils device-tree-compiler
+sudo LANG=C chroot $FILESYSTEM_ROOT apt-get -y install u-boot-tools libubootenv-tool mtd-utils device-tree-compiler
 
 ## Install docker
 echo '[INFO] Install docker'
@@ -327,6 +348,14 @@ sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y in
     jq                      \
     auditd
 
+# Have systemd create the auditd log directory
+sudo mkdir -p ${FILESYSTEM_ROOT}/etc/systemd/system/auditd.service.d
+sudo tee ${FILESYSTEM_ROOT}/etc/systemd/system/auditd.service.d/log-directory.conf >/dev/null <<EOF
+[Service]
+LogsDirectory=audit
+LogsDirectoryMode=0750
+EOF
+
 if [[ $CONFIGURED_ARCH == amd64 ]]; then
 ## Pre-install the fundamental packages for amd64 (x86)
 sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y install      \
@@ -372,7 +401,8 @@ sudo sed -i 's/LOAD_KEXEC=true/LOAD_KEXEC=false/' $FILESYSTEM_ROOT/etc/default/k
 ## Remove sshd host keys, and will regenerate on first sshd start
 sudo rm -f $FILESYSTEM_ROOT/etc/ssh/ssh_host_*_key*
 sudo cp files/sshd/host-ssh-keygen.sh $FILESYSTEM_ROOT/usr/local/bin/
-sudo cp -f files/sshd/sshd.service $FILESYSTEM_ROOT/lib/systemd/system/ssh.service
+sudo mkdir $FILESYSTEM_ROOT/etc/systemd/system/ssh.service.d
+sudo cp files/sshd/override.conf $FILESYSTEM_ROOT/etc/systemd/system/ssh.service.d/override.conf
 # Config sshd
 # 1. Set 'UseDNS' to 'no'
 # 2. Configure sshd to close all SSH connetions after 15 minutes of inactivity
@@ -435,11 +465,14 @@ sudo https_proxy=$https_proxy LANG=C chroot $FILESYSTEM_ROOT pip3 install 'setup
 sudo https_proxy=$https_proxy LANG=C chroot $FILESYSTEM_ROOT pip3 install 'wheel==0.35.1'
 
 # docker Python API package is needed by Ansible docker module as well as some SONiC applications
-sudo https_proxy=$https_proxy LANG=C chroot $FILESYSTEM_ROOT pip3 install 'docker==4.3.1'
+sudo https_proxy=$https_proxy LANG=C chroot $FILESYSTEM_ROOT pip3 install 'docker==6.1.1'
 
 # Install scapy
 sudo https_proxy=$https_proxy LANG=C chroot $FILESYSTEM_ROOT pip3 install 'scapy==2.4.4'
 
+# The option --no-build-isolation can be removed when upgrading PyYAML to 6.0.1
+sudo https_proxy=$https_proxy LANG=C chroot $FILESYSTEM_ROOT pip3 install 'PyYAML==5.4.1' --no-build-isolation
+
 ## Note: keep pip installed for maintainance purpose
 
 # Install GCC, needed for building/installing some Python packages
@@ -582,6 +615,7 @@ sudo rm -f $ONIE_INSTALLER_PAYLOAD $FILESYSTEM_SQUASHFS
 sudo du -hsx $FILESYSTEM_ROOT
 sudo mkdir -p $FILESYSTEM_ROOT/var/lib/docker
 scripts/collect_host_image_version_files.sh $TARGET_PATH $FILESYSTEM_ROOT
+sudo cp files/image_config/resolv-config/resolv.conf $FILESYSTEM_ROOT/etc/resolv.conf
 sudo mksquashfs $FILESYSTEM_ROOT $FILESYSTEM_SQUASHFS -e boot -e var/lib/docker -e $PLATFORM_DIR
 
 # Ensure admin gid is 1000

build_image.sh

@@ -68,6 +68,8 @@ generate_kvm_image()
 
 generate_onie_installer_image()
 {
+    output_file=$OUTPUT_ONIE_IMAGE
+    [ -n "$1" ] && output_file=$1
     # Copy platform-specific ONIE installer config files where onie-mk-demo.sh expects them
     rm -rf ./installer/x86_64/platforms/
     mkdir -p ./installer/x86_64/platforms/
@@ -83,7 +85,7 @@ generate_onie_installer_image()
     ## Generate an ONIE installer image
     ## Note: Don't leave blank between lines. It is single line command.
     ./onie-mk-demo.sh $TARGET_PLATFORM $TARGET_MACHINE $TARGET_PLATFORM-$TARGET_MACHINE-$ONIEIMAGE_VERSION \
-          installer platform/$TARGET_MACHINE/platform.conf $OUTPUT_ONIE_IMAGE OS $IMAGE_VERSION $ONIE_IMAGE_PART_SIZE \
+          installer platform/$TARGET_MACHINE/platform.conf $output_file OS $IMAGE_VERSION $ONIE_IMAGE_PART_SIZE \
           $ONIE_INSTALLER_PAYLOAD
 }
 
@@ -97,7 +99,7 @@ generate_device_list()
 
     for d in `find -L ./device  -maxdepth 2 -mindepth 2 -type d`; do
         if [ -f $d/platform_asic ]; then
-            if [ "$CONFIGURED_PLATFORM" = "generic" ] || grep -Fxq "$CONFIGURED_PLATFORM" $d/platform_asic; then
+            if [ "$TARGET_MACHINE" = "generic" ] || grep -Fxq "$TARGET_MACHINE" $d/platform_asic; then
                 echo "${d##*/}" >> "$platforms_asic";
             fi;
         fi;
@@ -119,12 +121,13 @@ if [ "$IMAGE_TYPE" = "onie" ]; then
 elif [ "$IMAGE_TYPE" = "raw" ]; then
 
     echo "Build RAW image"
+    tmp_output_onie_image=${OUTPUT_ONIE_IMAGE}.tmp
     mkdir -p `dirname $OUTPUT_RAW_IMAGE`
     sudo rm -f $OUTPUT_RAW_IMAGE
 
     generate_device_list "./installer/$TARGET_PLATFORM/platforms_asic"
 
-    generate_onie_installer_image
+    generate_onie_installer_image "$tmp_output_onie_image"
 
     echo "Creating SONiC raw partition : $OUTPUT_RAW_IMAGE of size $RAW_IMAGE_DISK_SIZE MB"
     fallocate -l "$RAW_IMAGE_DISK_SIZE"M $OUTPUT_RAW_IMAGE
@@ -135,8 +138,9 @@ elif [ "$IMAGE_TYPE" = "raw" ]; then
     ## Generate a partition dump that can be used to 'dd' in-lieu of using the onie-nos-installer
     ## Run the installer
     ## The 'build' install mode of the installer is used to generate this dump.
-    sudo chmod a+x $OUTPUT_ONIE_IMAGE
-    sudo ./$OUTPUT_ONIE_IMAGE
+    sudo chmod a+x $tmp_output_onie_image
+    sudo ./$tmp_output_onie_image
+    rm $tmp_output_onie_image
 
     [ -r $OUTPUT_RAW_IMAGE ] || {
         echo "Error : $OUTPUT_RAW_IMAGE not generated!"

device/accton/x86_64-accton_as7326_56x-r0/Accton-AS7326-56X/td3-as7326-48x25G+8x100G.config.bcm

@@ -1,4 +1,4 @@
-sai_load_hw_config=/etc/bcm/flex/bcm56870_a0_issu/b870.6.4.1/
+sai_load_hw_config=/etc/bcm/flex/bcm56870_a0_premium_issu/b870.6.4.1/
 #polarity/lanemap is using TH2 style.
 core_clock_frequency=1525
 dpp_clock_ratio=2:3

device/accton/x86_64-accton_as7726_32x-r0/Accton-AS7726-32X/td3-as7726-32x100G.config.bcm

@@ -1,4 +1,4 @@
-sai_load_hw_config=/etc/bcm/flex/bcm56870_a0_issu/b870.6.4.1/
+sai_load_hw_config=/etc/bcm/flex/bcm56870_a0_premium_issu/b870.6.4.1/
 #polarity/lanemap is using TH2 style.
 core_clock_frequency=1525
 dpp_clock_ratio=2:3

device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/td3-a7050cx3-32s-32x100G.config.bcm

@@ -1,4 +1,4 @@
-sai_load_hw_config=/etc/bcm/flex/bcm56870_a0_issu/b870.6.4.1/
+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
 host_as_route_disable=1

device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/td3-a7050cx3-32s-48x50G+8x100G.config.bcm

@@ -1,4 +1,4 @@
-sai_load_hw_config=/etc/bcm/flex/bcm56870_a0_issu/b870.6.4.1/
+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
 host_as_route_disable=1

device/arista/x86_64-arista_7050cx3_32s/td3-a7050cx3-32s-flex.config.bcm

@@ -395,7 +395,7 @@ port_phy_addr=0xff
 robust_hash_disable_egress_vlan=1
 robust_hash_disable_mpls=1
 robust_hash_disable_vlan=1
-sai_load_hw_config=/etc/bcm/flex/bcm56870_a0_issu/b870.6.4.1/
+sai_load_hw_config=/etc/bcm/flex/bcm56870_a0_premium_issu/b870.6.4.1/
 sai_tunnel_support=1
 serdes_core_rx_polarity_flip_physical{1}=0x8
 serdes_core_rx_polarity_flip_physical{5}=0x2

device/arista/x86_64-arista_7170_32c/Arista-7170-32C-C32/switch-sai.conf

@@ -1,33 +0,0 @@
-{
-    "chip_list": [
-        {
-            "id": "asic-0",
-            "chip_family": "Tofino",
-            "instance": 0,
-            "pcie_sysfs_prefix": "/sys/devices/pci0000:00/0000:00:1c.4/0000:07:00.0",
-            "pcie_domain": 0,
-            "pcie_bus": 7,
-            "pcie_fn": 0,
-            "pcie_dev": 0,
-            "pcie_int_mode": 1,
-            "sds_fw_path": "share/tofino_sds_fw/avago/firmware"
-        }
-    ],
-    "instance": 0,
-    "p4_program_list": [
-        {
-            "id": "pgm-0",
-            "instance": 0,
-            "path": "switch",
-            "program-name": "switch",
-            "pd": "lib/tofinopd/switch/libpd.so",
-            "pd-thrift": "lib/tofinopd/switch/libpdthrift.so",
-            "table-config": "share/tofinopd/switch/context.json",
-            "tofino-bin": "share/tofinopd/switch/tofino.bin",
-            "switchapi": "lib/libswitchapi.so",
-            "sai": "lib/libsai.so",
-            "switchapi_port_add": false,
-            "non_default_port_ppgs": 5
-        }
-    ]
-}

device/arista/x86_64-arista_7170_32c/Arista-7170-32C-C32/switch-tna-sai.conf

@@ -1,16 +1,8 @@
 {
-    "instance": 0,
     "chip_list": [
         {
-            "id": "asic-0",
             "chip_family": "Tofino",
             "instance": 0,
-            "pcie_sysfs_prefix": "/sys/devices/pci0000:00/0000:00:03.0/0000:05:00.0",
-            "pcie_domain": 0,
-            "pcie_bus": 5,
-            "pcie_fn": 0,
-            "pcie_dev": 0,
-            "pcie_int_mode": 1,
             "sds_fw_path": "share/tofino_sds_fw/avago/firmware"
         }
     ],
@@ -27,7 +19,6 @@
                         }
                     ],
                     "program-name": "switch",
-                    "sai": "lib/libsai.so",
                     "bfrt-config": "share/switch/bf-rt.json",
                     "model_json_path" : "share/switch/aug_model.json",
                     "switchapi_port_add": false,
@@ -35,5 +26,13 @@
                 }
             ]
         }
+    ],
+    "switch_options": [
+        {
+            "device-id": 0,
+            "model_json_path": "share/switch/aug_model.json",
+            "non_default_port_ppgs": 5,
+            "switchapi_port_add": false
+        }
     ]
 }

device/arista/x86_64-arista_7170_32cd/Arista-7170-32CD-C32/switch-sai.conf

@@ -1,33 +0,0 @@
-{
-    "chip_list": [
-        {
-            "id": "asic-0",
-            "chip_family": "Tofino",
-            "instance": 0,
-            "pcie_sysfs_prefix": "/sys/devices/pci0000:00/0000:00:1c.4/0000:07:00.0",
-            "pcie_domain": 0,
-            "pcie_bus": 7,
-            "pcie_fn": 0,
-            "pcie_dev": 0,
-            "pcie_int_mode": 1,
-            "sds_fw_path": "share/tofino_sds_fw/avago/firmware"
-        }
-    ],
-    "instance": 0,
-    "p4_program_list": [
-        {
-            "id": "pgm-0",
-            "instance": 0,
-            "path": "switch",
-            "program-name": "switch",
-            "pd": "lib/tofinopd/switch/libpd.so",
-            "pd-thrift": "lib/tofinopd/switch/libpdthrift.so",
-            "table-config": "share/tofinopd/switch/context.json",
-            "tofino-bin": "share/tofinopd/switch/tofino.bin",
-            "switchapi": "lib/libswitchapi.so",
-            "sai": "lib/libsai.so",
-            "switchapi_port_add": false,
-            "non_default_port_ppgs": 5
-        }
-    ]
-}

device/arista/x86_64-arista_7170_32cd/Arista-7170-32CD-C32/switch-tna-sai.conf

@@ -1,16 +1,8 @@
 {
-    "instance": 0,
     "chip_list": [
         {
-            "id": "asic-0",
             "chip_family": "Tofino",
             "instance": 0,
-            "pcie_sysfs_prefix": "/sys/devices/pci0000:00/0000:00:03.0/0000:05:00.0",
-            "pcie_domain": 0,
-            "pcie_bus": 5,
-            "pcie_fn": 0,
-            "pcie_dev": 0,
-            "pcie_int_mode": 1,
             "sds_fw_path": "share/tofino_sds_fw/avago/firmware"
         }
     ],
@@ -27,7 +19,6 @@
                         }
                     ],
                     "program-name": "switch",
-                    "sai": "lib/libsai.so",
                     "bfrt-config": "share/switch/bf-rt.json",
                     "model_json_path" : "share/switch/aug_model.json",
                     "switchapi_port_add": false,
@@ -35,5 +26,13 @@
                 }
             ]
         }
+    ],
+    "switch_options": [
+        {
+            "device-id": 0,
+            "model_json_path": "share/switch/aug_model.json",
+            "non_default_port_ppgs": 5,
+            "switchapi_port_add": false
+        }
     ]
 }

device/arista/x86_64-arista_7170_64c/Arista-7170-64C/switch-sai.conf

@@ -1,33 +0,0 @@
-{
-    "chip_list": [
-        {
-            "id": "asic-0",
-            "chip_family": "Tofino",
-            "instance": 0,
-            "pcie_sysfs_prefix": "/sys/devices/pci0000:00/0000:00:1c.4/0000:07:00.0",
-            "pcie_domain": 0,
-            "pcie_bus": 7,
-            "pcie_fn": 0,
-            "pcie_dev": 0,
-            "pcie_int_mode": 1,
-            "sds_fw_path": "share/tofino_sds_fw/avago/firmware"
-        }
-    ],
-    "instance": 0,
-    "p4_program_list": [
-        {
-            "id": "pgm-0",
-            "instance": 0,
-            "path": "switch",
-            "program-name": "switch",
-            "pd": "lib/tofinopd/switch/libpd.so",
-            "pd-thrift": "lib/tofinopd/switch/libpdthrift.so",
-            "table-config": "share/tofinopd/switch/context.json",
-            "tofino-bin": "share/tofinopd/switch/tofino.bin",
-            "switchapi": "lib/libswitchapi.so",
-            "sai": "lib/libsai.so",
-            "switchapi_port_add": false,
-            "non_default_port_ppgs": 5
-        }
-    ]
-}

device/arista/x86_64-arista_7170_64c/Arista-7170-64C/switch-tna-sai.conf

@@ -1,16 +1,8 @@
 {
-    "instance": 0,
     "chip_list": [
         {
-            "id": "asic-0",
             "chip_family": "Tofino",
             "instance": 0,
-            "pcie_sysfs_prefix": "/sys/devices/pci0000:00/0000:00:03.0/0000:05:00.0",
-            "pcie_domain": 0,
-            "pcie_bus": 5,
-            "pcie_fn": 0,
-            "pcie_dev": 0,
-            "pcie_int_mode": 1,
             "sds_fw_path": "share/tofino_sds_fw/avago/firmware"
         }
     ],
@@ -27,7 +19,6 @@
                         }
                     ],
                     "program-name": "switch",
-                    "sai": "lib/libsai.so",
                     "bfrt-config": "share/switch/bf-rt.json",
                     "model_json_path" : "share/switch/aug_model.json",
                     "switchapi_port_add": false,
@@ -35,5 +26,13 @@
                 }
             ]
         }
+    ],
+    "switch_options": [
+        {
+            "device-id": 0,
+            "model_json_path": "share/switch/aug_model.json",
+            "non_default_port_ppgs": 5,
+            "switchapi_port_add": false
+        }
     ]
 }

device/arista/x86_64-arista_7170_64c/Arista-7170-Q59S20/switch-sai.conf

@@ -1,33 +0,0 @@
-{
-    "chip_list": [
-        {
-            "id": "asic-0",
-            "chip_family": "Tofino",
-            "instance": 0,
-            "pcie_sysfs_prefix": "/sys/devices/pci0000:00/0000:00:1c.4/0000:07:00.0",
-            "pcie_domain": 0,
-            "pcie_bus": 7,
-            "pcie_fn": 0,
-            "pcie_dev": 0,
-            "pcie_int_mode": 1,
-            "sds_fw_path": "share/tofino_sds_fw/avago/firmware"
-        }
-    ],
-    "instance": 0,
-    "p4_program_list": [
-        {
-            "id": "pgm-0",
-            "instance": 0,
-            "path": "switch",
-            "program-name": "switch",
-            "pd": "lib/tofinopd/switch/libpd.so",
-            "pd-thrift": "lib/tofinopd/switch/libpdthrift.so",
-            "table-config": "share/tofinopd/switch/context.json",
-            "tofino-bin": "share/tofinopd/switch/tofino.bin",
-            "switchapi": "lib/libswitchapi.so",
-            "sai": "lib/libsai.so",
-            "switchapi_port_add": false,
-            "non_default_port_ppgs": 5
-        }
-    ]
-}

device/arista/x86_64-arista_7170_64c/Arista-7170-Q59S20/switch-tna-sai.conf

@@ -1,16 +1,8 @@
 {
-    "instance": 0,
     "chip_list": [
         {
-            "id": "asic-0",
             "chip_family": "Tofino",
             "instance": 0,
-            "pcie_sysfs_prefix": "/sys/devices/pci0000:00/0000:00:03.0/0000:05:00.0",
-            "pcie_domain": 0,
-            "pcie_bus": 5,
-            "pcie_fn": 0,
-            "pcie_dev": 0,
-            "pcie_int_mode": 1,
             "sds_fw_path": "share/tofino_sds_fw/avago/firmware"
         }
     ],
@@ -27,7 +19,6 @@
                         }
                     ],
                     "program-name": "switch",
-                    "sai": "lib/libsai.so",
                     "bfrt-config": "share/switch/bf-rt.json",
                     "model_json_path" : "share/switch/aug_model.json",
                     "switchapi_port_add": false,
@@ -35,5 +26,13 @@
                 }
             ]
         }
+    ],
+    "switch_options": [
+        {
+            "device-id": 0,
+            "model_json_path": "share/switch/aug_model.json",
+            "non_default_port_ppgs": 5,
+            "switchapi_port_add": false
+        }
     ]
 }

device/arista/x86_64-arista_7170b_64c/Arista-7170B-64C/hwsku.json

@@ -25,28 +25,16 @@
             "default_brkout_mode": "1x100G[50G,40G,25G,10G]"
         },
         "Ethernet32": {
-            "default_brkout_mode": "2x50G[25G,10G]"
-        },
-        "Ethernet34": {
-            "default_brkout_mode": "2x50G[25G,10G]"
+            "default_brkout_mode": "1x100G[50G,40G,25G,10G]"
         },
         "Ethernet36": {
-            "default_brkout_mode": "2x50G[25G,10G]"
-        },
-        "Ethernet38": {
-            "default_brkout_mode": "2x50G[25G,10G]"
+            "default_brkout_mode": "1x100G[50G,40G,25G,10G]"
         },
         "Ethernet40": {
-            "default_brkout_mode": "2x50G[25G,10G]"
-        },
-        "Ethernet42": {
-            "default_brkout_mode": "2x50G[25G,10G]"
+            "default_brkout_mode": "1x100G[50G,40G,25G,10G]"
         },
         "Ethernet44": {
-            "default_brkout_mode": "2x50G[25G,10G]"
-        },
-        "Ethernet46": {
-            "default_brkout_mode": "2x50G[25G,10G]"
+            "default_brkout_mode": "1x100G[50G,40G,25G,10G]"
         },
         "Ethernet48": {
             "default_brkout_mode": "1x100G[50G,40G,25G,10G]"
@@ -91,16 +79,10 @@
             "default_brkout_mode": "1x100G[50G,40G,25G,10G]"
         },
         "Ethernet104": {
-            "default_brkout_mode": "2x50G[25G,10G]"
-        },
-        "Ethernet106": {
-            "default_brkout_mode": "2x50G[25G,10G]"
+            "default_brkout_mode": "1x100G[50G,40G,25G,10G]"
         },
         "Ethernet108": {
-            "default_brkout_mode": "2x50G[25G,10G]"
-        },
-        "Ethernet110": {
-            "default_brkout_mode": "2x50G[25G,10G]"
+            "default_brkout_mode": "1x100G[50G,40G,25G,10G]"
         },
         "Ethernet112": {
             "default_brkout_mode": "1x100G[50G,40G,25G,10G]"
@@ -151,28 +133,16 @@
             "default_brkout_mode": "1x100G[50G,40G,25G,10G]"
         },
         "Ethernet176": {
-            "default_brkout_mode": "2x50G[25G,10G]"
-        },
-        "Ethernet178": {
-            "default_brkout_mode": "2x50G[25G,10G]"
+            "default_brkout_mode": "1x100G[50G,40G,25G,10G]"
         },
         "Ethernet180": {
-            "default_brkout_mode": "2x50G[25G,10G]"
-        },
-        "Ethernet182": {
-            "default_brkout_mode": "2x50G[25G,10G]"
+            "default_brkout_mode": "1x100G[50G,40G,25G,10G]"
         },
         "Ethernet184": {
-            "default_brkout_mode": "2x50G[25G,10G]"
-        },
-        "Ethernet186": {
-            "default_brkout_mode": "2x50G[25G,10G]"
+            "default_brkout_mode": "1x100G[50G,40G,25G,10G]"
         },
         "Ethernet188": {
-            "default_brkout_mode": "2x50G[25G,10G]"
-        },
-        "Ethernet190": {
-            "default_brkout_mode": "2x50G[25G,10G]"
+            "default_brkout_mode": "1x100G[50G,40G,25G,10G]"
         },
         "Ethernet192": {
             "default_brkout_mode": "1x100G[50G,40G,25G,10G]"
@@ -211,22 +181,22 @@
             "default_brkout_mode": "1x100G[50G,40G,25G,10G]"
         },
         "Ethernet240": {
-            "default_brkout_mode": "2x50G[25G,10G]"
-        },
-        "Ethernet242": {
-            "default_brkout_mode": "2x50G[25G,10G]"
+            "default_brkout_mode": "1x100G[50G,40G,25G,10G]"
         },
         "Ethernet244": {
-            "default_brkout_mode": "2x50G[25G,10G]"
-        },
-        "Ethernet246": {
-            "default_brkout_mode": "2x50G[25G,10G]"
+            "default_brkout_mode": "1x100G[50G,40G,25G,10G]"
         },
         "Ethernet248": {
             "default_brkout_mode": "1x100G[50G,40G,25G,10G]"
         },
         "Ethernet252": {
             "default_brkout_mode": "1x100G[50G,40G,25G,10G]"
+        },
+        "Ethernet256": {
+            "default_brkout_mode": "1x10G"
+        },
+        "Ethernet257": {
+            "default_brkout_mode": "1x10G"
         }
     }
-}
+}

device/arista/x86_64-arista_7170b_64c/default_sku

@@ -0,0 +1 @@
+Arista-7170B-64C t1

device/arista/x86_64-arista_7170b_64c/platform_asic

@@ -0,0 +1 @@
+barefoot

device/arista/x86_64-arista_7170b_64c/platform_reboot

@@ -0,0 +1 @@
+../x86_64-arista_common/platform_reboot

device/arista/x86_64-arista_7170b_64c/plugins

@@ -0,0 +1 @@
+../x86_64-arista_common/plugins

device/arista/x86_64-arista_7170b_64c/pmon_daemon_control.json

@@ -0,0 +1 @@
+../x86_64-arista_common/pmon_daemon_control.json

device/arista/x86_64-arista_7170b_64c/system_health_monitoring_config.json

@@ -0,0 +1 @@
+../x86_64-arista_common/system_health_monitoring_config.json

device/arista/x86_64-arista_7170b_64c/thermal_policy.json

@@ -0,0 +1 @@
+../x86_64-arista_common/thermal_policy.json

device/arista/x86_64-arista_7800_sup/platform.json

@@ -0,0 +1,12 @@
+{
+    "chassis": {
+        "name": "DCS-7800A-SUP1A",
+        "components": [],
+        "fans": [],
+        "fan_drawers": [],
+        "psus": [],
+        "thermals": [],
+        "sfps": []
+    },
+    "interfaces": {}
+}

device/arista/x86_64-arista_7800r3_48cq2_lc/platform.json

@@ -0,0 +1,173 @@
+{
+    "chassis": {
+        "name": "7800R3-48CQ2-LC",
+        "components": [],
+        "fans": [],
+        "fan_drawers": [],
+        "psus": [],
+        "thermals": [
+            {
+                "name": "Cpu temp sensor"
+            },
+            {
+                "name": "Center back"
+            },
+            {
+                "name": "Fap0 core0"
+            },
+            {
+                "name": "Fap0 core1"
+            },
+            {
+                "name": "PCIE"
+            }
+        ],
+        "sfps": [
+            {
+                "name": "qsfp1"
+            },
+            {
+                "name": "qsfp2"
+            },
+            {
+                "name": "qsfp3"
+            },
+            {
+                "name": "qsfp4"
+            },
+            {
+                "name": "qsfp5"
+            },
+            {
+                "name": "qsfp6"
+            },
+            {
+                "name": "qsfp7"
+            },
+            {
+                "name": "qsfp8"
+            },
+            {
+                "name": "qsfp9"
+            },
+            {
+                "name": "qsfp10"
+            },
+            {
+                "name": "qsfp11"
+            },
+            {
+                "name": "qsfp12"
+            },
+            {
+                "name": "qsfp13"
+            },
+            {
+                "name": "qsfp14"
+            },
+            {
+                "name": "qsfp15"
+            },
+            {
+                "name": "qsfp16"
+            },
+            {
+                "name": "qsfp17"
+            },
+            {
+                "name": "qsfp18"
+            },
+            {
+                "name": "qsfp19"
+            },
+            {
+                "name": "qsfp20"
+            },
+            {
+                "name": "qsfp21"
+            },
+            {
+                "name": "qsfp22"
+            },
+            {
+                "name": "qsfp23"
+            },
+            {
+                "name": "qsfp24"
+            },
+            {
+                "name": "qsfp25"
+            },
+            {
+                "name": "qsfp26"
+            },
+            {
+                "name": "qsfp27"
+            },
+            {
+                "name": "qsfp28"
+            },
+            {
+                "name": "qsfp29"
+            },
+            {
+                "name": "qsfp30"
+            },
+            {
+                "name": "qsfp31"
+            },
+            {
+                "name": "qsfp32"
+            },
+            {
+                "name": "qsfp33"
+            },
+            {
+                "name": "qsfp34"
+            },
+            {
+                "name": "qsfp35"
+            },
+            {
+                "name": "qsfp36"
+            },
+            {
+                "name": "qsfp37"
+            },
+            {
+                "name": "qsfp38"
+            },
+            {
+                "name": "qsfp39"
+            },
+            {
+                "name": "qsfp40"
+            },
+            {
+                "name": "qsfp41"
+            },
+            {
+                "name": "qsfp42"
+            },
+            {
+                "name": "qsfp43"
+            },
+            {
+                "name": "qsfp44"
+            },
+            {
+                "name": "qsfp45"
+            },
+            {
+                "name": "qsfp46"
+            },
+            {
+                "name": "qsfp47"
+            },
+            {
+                "name": "qsfp48"
+            }
+        ]
+    },
+    "interfaces": {}
+}

device/arista/x86_64-arista_7800r3_48cqm2_lc/platform.json

@@ -0,0 +1 @@
+../x86_64-arista_7800r3_48cq2_lc/platform.json

device/barefoot/x86_64-accton_as9516_32d-r0/newport/switch-tna-sai.conf

@@ -1,17 +1,9 @@
 {
-    "instance": 0,
     "chip_list": [
         {
-            "id": "asic-0",
             "chip_family": "Tofino2",
-            "instance": 0,
-            "pcie_sysfs_prefix": "/sys/devices/pci0000:00/0000:00:03.0/0000:05:00.0",
-            "pcie_domain": 0,
-            "pcie_bus": 5,
-            "pcie_fn": 0,
-            "pcie_dev": 0,
-            "pcie_int_mode": 1,
-            "sds_fw_path": "share/tofino_sds_fw/avago/firmware"
+            "sds_fw_path": "share/tofino_sds_fw/avago/firmware",
+            "instance": 0
         }
     ],
     "p4_devices": [
@@ -20,21 +12,28 @@
             "agent0": "lib/platform/x86_64-accton_as9516bf_32d-r0/libpltfm_mgr.so",
             "p4_programs": [
                 {
+                    "program-name": "switch",
+                    "bfrt-config": "share/switch/bf-rt.json",
                     "p4_pipelines": [
                         {
                             "p4_pipeline_name": "pipe",
                             "config": "share/switch/pipe/tofino2.bin",
                             "context": "share/switch/pipe/context.json"
                         }
-                    ],
-                    "program-name": "switch",
-                    "sai": "lib/libsai.so",
-                    "bfrt-config": "share/switch/bf-rt.json",
+                    ],                   
                     "model_json_path" : "share/switch/aug_model.json",
                     "switchapi_port_add": false,
                     "non_default_port_ppgs": 5
                 }
             ]
         }
+    ],
+    "switch_options": [
+        {
+            "device-id": 0,
+            "model_json_path": "share/switch/aug_model.json",
+            "non_default_port_ppgs": 5,
+            "switchapi_port_add": false
+        }
     ]
 }

device/barefoot/x86_64-accton_as9516_32d-r0/platform.json

@@ -1,69 +1,190 @@
 {
     "chassis": {
         "name": "Newport",
-        "fans": [
+        "components": [
             {
-                "name": "counter-rotating-fan-1"
+                "name": "BIOS"
             },
             {
-                "name": "counter-rotating-fan-2"
-            },
-            {
-                "name": "counter-rotating-fan-3"
-            },
-            {
-                "name": "counter-rotating-fan-4"
-            },
-            {
-                "name": "counter-rotating-fan-5"
-            },
-            {
-                "name": "counter-rotating-fan-6"
+                "name": "BMC"
             }
         ],
-        "fan_drawers":[
+        "thermal_manager": false,
+        "fans": [
             {
-                "name": "fantray",
-                "num_fans" : 6,
+                "name": "counter-rotating-fan-1",
+                "status_led": {
+                    "controllable": false
+                },
+                "speed": {
+                    "controllable": false
+                }
+            },
+            {
+                "name": "counter-rotating-fan-2",
+                "status_led": {
+                    "controllable": false
+                },
+                "speed": {
+                    "controllable": false
+                }
+            },
+            {
+                "name": "counter-rotating-fan-3",
+                "status_led": {
+                    "controllable": false
+                },
+                "speed": {
+                    "controllable": false
+                }
+            },
+            {
+                "name": "counter-rotating-fan-4",
+                "status_led": {
+                    "controllable": false
+                },
+                "speed": {
+                    "controllable": false
+                }
+            },
+            {
+                "name": "counter-rotating-fan-5",
+                "status_led": {
+                    "controllable": false
+                },
+                "speed": {
+                    "controllable": false
+                }
+            },
+            {
+                "name": "counter-rotating-fan-6",
+                "status_led": {
+                    "controllable": false
+                },
+                "speed": {
+                    "controllable": false
+                }
+            }
+        ],
+        "fan_drawers": [
+            {
+                "name": "fantray-1",
+                "status_led": {
+                    "controllable": false
+                },
                 "fans": [
                     {
-                        "name": "counter-rotating-fan-1"
+                        "name": "counter-rotating-fan-1",
+                        "status_led": {
+                            "controllable": false
+                        },
+                        "speed": {
+                            "controllable": false
+                        }
                     },
                     {
-                        "name": "counter-rotating-fan-2"
+                        "name": "counter-rotating-fan-2",
+                        "status_led": {
+                            "controllable": false
+                        },
+                        "speed": {
+                            "controllable": false
+                        }
                     },
                     {
-                        "name": "counter-rotating-fan-3"
+                        "name": "counter-rotating-fan-3",
+                        "status_led": {
+                            "controllable": false
+                        },
+                        "speed": {
+                            "controllable": false
+                        }
                     },
                     {
-                        "name": "counter-rotating-fan-4"
+                        "name": "counter-rotating-fan-4",
+                        "status_led": {
+                            "controllable": false
+                        },
+                        "speed": {
+                            "controllable": false
+                        }
                     },
                     {
-                        "name": "counter-rotating-fan-5"
+                        "name": "counter-rotating-fan-5",
+                        "status_led": {
+                            "controllable": false
+                        },
+                        "speed": {
+                            "controllable": false
+                        }
                     },
                     {
-                        "name": "counter-rotating-fan-6"
+                        "name": "counter-rotating-fan-6",
+                        "status_led": {
+                            "controllable": false
+                        },
+                        "speed": {
+                            "controllable": false
+                        }
                     }
                 ]
             }
         ],
         "psus": [
             {
-                "name": "psu-1"
+                "name": "psu-1",
+                "temperature": false
             },
             {
-                "name": "psu-2"
+                "name": "psu-2",
+                "temperature": false
             }
         ],
         "thermals": [
             {
-                "name": "tmp75-i2c-3-4b:switch-temp"
+                "name": "com_e_driver-i2c-4-33:cpu-temp"
             },
             {
                 "name": "com_e_driver-i2c-4-33:memory-temp"
             },
             {
-                "name": "com_e_driver-i2c-4-33:cpu-temp"
+                "name": "psu_driver-i2c-7-59:psu2-temp1"
+            },
+            {
+                "name": "psu_driver-i2c-7-59:psu2-temp2"
+            },
+            {
+                "name": "psu_driver-i2c-7-59:psu2-temp3"
+            },
+            {
+                "name": "psu_driver-i2c-7-5a:psu1-temp1"
+            },
+            {
+                "name": "psu_driver-i2c-7-5a:psu1-temp2"
+            },
+            {
+                "name": "psu_driver-i2c-7-5a:psu1-temp3"
+            },
+            {
+                "name": "tmp75-i2c-3-48:chip-temp"
+            },
+            {
+                "name": "tmp75-i2c-3-49:exhaust2-temp"
+            },
+            {
+                "name": "tmp75-i2c-3-4a:exhaust-temp"
+            },
+            {
+                "name": "tmp75-i2c-3-4b:intake-temp"
+            },
+            {
+                "name": "tmp75-i2c-3-4c:tofino-temp"
+            },
+            {
+                "name": "tmp75-i2c-3-4d:intake2-temp"
+            },
+            {
+                "name": "coretemp-isa-0000:package-id-0"
             },
             {
                 "name": "coretemp-isa-0000:core-0"
@@ -76,128 +197,104 @@
             },
             {
                 "name": "coretemp-isa-0000:core-3"
-            },
-            {
-                "name": "coretemp-isa-0000:package-id-0"
-            },
-            {
-                "name": "psu_driver-i2c-7-5a:psu1-temp1"
-            },
-            {
-                "name": "psu_driver-i2c-7-5a:psu1-temp2"
-            },
-            {
-                "name": "psu_driver-i2c-7-5a:psu1-temp3"
-            },
-            {
-                "name": "tmp75-i2c-3-4a:inlet-left-temp"
-            },
-            {
-                "name": "tmp75-i2c-3-4c:inlet-right-temp"
-            },
-            {
-                "name": "tmp75-i2c-3-4d:temp1"
-            },
-            {
-                "name": "tmp75-i2c-3-48:outlet-middle-temp"
-            },
-            {
-                "name": "tmp75-i2c-3-49:inlet-middle-temp"
             }
         ],
         "sfps": [
             {
-                "name": "Ethernet0"
+                "name": "sfp1"
             },
             {
-                "name": "Ethernet8"
+                "name": "sfp2"
             },
             {
-                "name": "Ethernet16"
+                "name": "sfp3"
             },
             {
-                "name": "Ethernet32"
+                "name": "sfp4"
             },
             {
-                "name": "Ethernet40"
+                "name": "sfp5"
             },
             {
-                "name": "Ethernet48"
+                "name": "sfp6"
             },
             {
-                "name": "Ethernet56"
+                "name": "sfp7"
             },
             {
-                "name": "Ethernet64"
+                "name": "sfp8"
             },
             {
-                "name": "Ethernet72"
+                "name": "sfp9"
             },
             {
-                "name": "Ethernet80"
+                "name": "sfp10"
             },
             {
-                "name": "Ethernet88"
+                "name": "sfp11"
             },
             {
-                "name": "Ethernet96"
+                "name": "sfp12"
             },
             {
-                "name": "Ethernet104"
+                "name": "sfp13"
             },
             {
-                "name": "Ethernet112"
+                "name": "sfp14"
             },
             {
-                "name": "Ethernet120"
+                "name": "sfp15"
             },
             {
-                "name": "Ethernet128"
+                "name": "sfp16"
             },
             {
-                "name": "Ethernet136"
+                "name": "sfp17"
             },
             {
-                "name": "Ethernet144"
+                "name": "sfp18"
             },
             {
-                "name": "Ethernet152"
+                "name": "sfp19"
             },
             {
-                "name": "Ethernet160"
+                "name": "sfp20"
             },
             {
-                "name": "Ethernet168"
+                "name": "sfp21"
             },
             {
-                "name": "Ethernet176"
+                "name": "sfp22"
             },
             {
-                "name": "Ethernet184"
+                "name": "sfp23"
             },
             {
-                "name": "Ethernet192"
+                "name": "sfp24"
             },
             {
-                "name": "Ethernet200"
+                "name": "sfp25"
             },
             {
-                "name": "Ethernet208"
+                "name": "sfp26"
             },
             {
-                "name": "Ethernet216"
+                "name": "sfp27"
             },
             {
-                "name": "Ethernet224"
+                "name": "sfp28"
             },
             {
-                "name": "Ethernet232"
+                "name": "sfp29"
             },
             {
-                "name": "Ethernet240"
+                "name": "sfp30"
             },
             {
-                "name": "Ethernet248"
+                "name": "sfp31"
+            },
+            {
+                "name": "sfp32"
             }
         ]
     },
@@ -207,7 +304,7 @@
             "lanes": "0,1,2,3,4,5,6,7",
             "breakout_modes": {
                 "1x400G[200G]": ["Ethernet0"],
-                "2x200G[100G,40G]": ["Ethernet0, Ethernet4"],
+                "2x200G[100G,40G]": ["Ethernet0", "Ethernet4"],
                 "4x100G[50G]": ["Ethernet0", "Ethernet2", "Ethernet4", "Ethernet6"],
                 "8x50G[25G,10G]": ["Ethernet0", "Ethernet1", "Ethernet2", "Ethernet3", "Ethernet4", "Ethernet5", "Ethernet6", "Ethernet7"],
                 "1x200G[100G,40G](4)+4x50G[25G,10G](4)": ["Ethernet0", "Ethernet4", "Ethernet5", "Ethernet6", "Ethernet7"],
@@ -587,4 +684,4 @@
             }
         }
     }
-}
+}

device/barefoot/x86_64-accton_as9516_32d-r0/platform_components.json

@@ -1,8 +1,10 @@
-{
-    "chassis": {
-        "Newport": {
-            "component": {
-            }
-        }
-    }
+{
+    "chassis": {
+        "Newport": {
+            "component": {
+                "BIOS": { },
+                "BMC": { }
+            }
+        }
+    }
 }

device/barefoot/x86_64-accton_as9516_32d-r0/pmon_daemon_control.json

@@ -4,6 +4,6 @@
     "skip_thermalctld": false,
     "skip_ledd": true,
     "skip_xcvrd": false,
-    "skip_psud": true,
+    "skip_psud": false,
     "skip_syseepromd": false 
 }

device/barefoot/x86_64-accton_as9516_32d-r0/system_health_monitoring_config.json

@@ -0,0 +1,11 @@
+{
+    "services_to_ignore": [],
+    "devices_to_ignore": [],
+    "user_defined_checkers": [],
+    "polling_interval": 60,
+    "led_color": {
+        "fault": "amber",
+        "normal": "green",
+        "booting": "orange_blink"
+    }
+}

device/barefoot/x86_64-accton_as9516_32d-r0/thermal_thresholds.json

@@ -0,0 +1,61 @@
+{
+    "thermals": [
+        {
+            "com_e_driver-i2c-4-33:cpu-temp" : [99.0, 89.0, 11.0, 1.0]
+        },
+        {
+            "com_e_driver-i2c-4-33:memory-temp" : [85.0, 75.0, 11.0, 1.0]
+        },
+        {
+            "tmp75-i2c-3-48:chip-temp" : [90.0, 80.0, 11.0, 1.0]
+        },
+        {
+            "tmp75-i2c-3-49:exhaust2-temp" : [80.0, 70.0, 11.0, 1.0]
+        },
+        {
+            "tmp75-i2c-3-4a:exhaust-temp" : [60.0, 50.0, 11.0, 1.0]
+        },
+        {
+            "tmp75-i2c-3-4b:intake-temp" : [60.0, 50.0, 11.0, 1.0]
+        },
+        {
+            "tmp75-i2c-3-4c:tofino-temp" : [99.0, 89.0, 11.0, 1.0]
+        },
+        {
+            "tmp75-i2c-3-4d:intake2-temp" : [60.0, 50.0, 11.0, 1.0]
+        },
+        {
+            "coretemp-isa-0000:package-id-0" : [80.0, 70.0, 11.0, 1.0]
+        },
+        {
+            "coretemp-isa-0000:core-0" : [99.0, 89.0, 11.0, 1.0]
+        },
+        {
+            "coretemp-isa-0000:core-1" : [99.0, 89.0, 11.0, 1.0]
+        },
+        {
+            "coretemp-isa-0000:core-2" : [99.0, 89.0, 11.0, 1.0]
+        },
+        {
+            "coretemp-isa-0000:core-3" : [99.0, 89.0, 11.0, 1.0]
+        },
+        {
+            "psu_driver-i2c-7-59:psu2-temp1" : [60.0, 50.0, 11.0, 1.0]
+        },
+        {
+            "psu_driver-i2c-7-59:psu2-temp2" : [60.0, 50.0, 11.0, 1.0]
+        },
+        {
+            "psu_driver-i2c-7-59:psu2-temp3" : [60.0, 50.0, 11.0, 1.0]
+        },
+        {
+            "psu_driver-i2c-7-5a:psu1-temp1" : [60.0, 50.0, 11.0, 1.0]
+        },
+        {
+            "psu_driver-i2c-7-5a:psu1-temp2" : [60.0, 50.0, 11.0, 1.0]
+        },
+        {
+            "psu_driver-i2c-7-5a:psu1-temp3" : [60.0, 50.0, 11.0, 1.0]
+        }
+    ]
+}

device/barefoot/x86_64-accton_wedge100bf_32x-r0/montara/switch-sai.conf

@@ -1,34 +0,0 @@
-{
-    "chip_list": [
-        {
-            "id": "asic-0",
-            "chip_family": "Tofino",
-            "instance": 0,
-            "pcie_sysfs_prefix": "/sys/devices/pci0000:00/0000:00:03.0/0000:05:00.0",
-            "pcie_domain": 0,
-            "pcie_bus": 5,
-            "pcie_fn": 0,
-            "pcie_dev": 0,
-            "pcie_int_mode": 1,
-            "sds_fw_path": "share/tofino_sds_fw/avago/firmware"
-        }
-    ],
-    "instance": 0,
-    "p4_program_list": [
-        {
-            "id": "pgm-0",
-            "instance": 0,
-            "path": "switch",
-            "program-name": "switch",
-            "pd": "lib/tofinopd/switch/libpd.so",
-            "pd-thrift": "lib/tofinopd/switch/libpdthrift.so",
-            "table-config": "share/tofinopd/switch/context.json",
-            "tofino-bin": "share/tofinopd/switch/tofino.bin",
-            "switchapi": "lib/libswitchapi.so",
-            "sai": "lib/libsai.so",
-            "agent0": "lib/platform/x86_64-accton_wedge100bf_32x-r0/libpltfm_mgr.so",
-            "switchapi_port_add": false,
-            "non_default_port_ppgs": 5
-        }
-    ]
-}

device/barefoot/x86_64-accton_wedge100bf_32x-r0/montara/switch-tna-sai.conf

@@ -1,17 +1,9 @@
 {
-    "instance": 0,
     "chip_list": [
         {
-            "id": "asic-0",
             "chip_family": "Tofino",
-            "instance": 0,
-            "pcie_sysfs_prefix": "/sys/devices/pci0000:00/0000:00:03.0/0000:05:00.0",
-            "pcie_domain": 0,
-            "pcie_bus": 5,
-            "pcie_fn": 0,
-            "pcie_dev": 0,
-            "pcie_int_mode": 1,
-            "sds_fw_path": "share/tofino_sds_fw/avago/firmware"
+            "sds_fw_path": "share/tofino_sds_fw/avago/firmware",
+            "instance": 0
         }
     ],
     "p4_devices": [
@@ -28,7 +20,6 @@
                         }
                     ],
                     "program-name": "switch",
-                    "sai": "lib/libsai.so",
                     "bfrt-config": "share/switch/bf-rt.json",
                     "model_json_path" : "share/switch/aug_model.json",
                     "switchapi_port_add": false,
@@ -36,5 +27,13 @@
                 }
             ]
         }
+    ],
+    "switch_options": [
+        {
+            "device-id": 0,
+            "model_json_path": "share/switch/aug_model.json",
+            "non_default_port_ppgs": 5,
+            "switchapi_port_add": false
+        }
     ]
 }

device/barefoot/x86_64-accton_wedge100bf_32x-r0/platform.json

@@ -1,6 +1,14 @@
 {
     "chassis": {
         "name": "Wedge100BF-32X-O-AC-F-BF",
+        "components": [
+            {
+                "name": "BIOS"
+            },
+            {
+                "name": "BMC"
+            }
+        ],
         "fans": [
             {
                 "name": "counter-rotating-fan-1"
@@ -18,10 +26,9 @@
                 "name": "counter-rotating-fan-5"
             }
         ],
-        "fan_drawers":[
+        "fan_drawers": [
             {
-                "name": "fantray",
-                "num_fans" : 5,
+                "name": "fantray-1",
                 "fans": [
                     {
                         "name": "counter-rotating-fan-1"
@@ -50,38 +57,41 @@
             }
         ],
         "thermals": [
-            {
-                "name": "com_e_driver-i2c-4-33:memory-temp"
-            },
             {
                 "name": "com_e_driver-i2c-4-33:cpu-temp"
             },
             {
-                "name": "pfe1100-i2c-7-59:temp1"
+                "name": "com_e_driver-i2c-4-33:memory-temp"
             },
             {
-                "name": "pfe1100-i2c-7-59:temp2"
+                "name": "psu_driver-i2c-7-59:psu2-temp1"
             },
             {
-                "name": "pfe1100-i2c-7-5a:temp1"
+                "name": "psu_driver-i2c-7-59:psu2-temp2"
             },
             {
-                "name": "pfe1100-i2c-7-5a:temp2"
+                "name": "psu_driver-i2c-7-5a:psu1-temp1"
             },
             {
-                "name": "tmp75-i2c-3-48:outlet-middle-temp"
+                "name": "psu_driver-i2c-7-5a:psu1-temp2"
             },
             {
-                "name": "tmp75-i2c-3-49:inlet-middle-temp"
+                "name": "tmp75-i2c-3-48:chip-temp"
             },
             {
-                "name": "tmp75-i2c-3-4a:inlet-left-temp"
+                "name": "tmp75-i2c-3-49:exhaust2-temp"
             },
             {
-                "name": "tmp75-i2c-3-4b:switch-temp"
+                "name": "tmp75-i2c-3-4a:exhaust-temp"
             },
             {
-                "name": "tmp75-i2c-3-4c:inlet-right-temp"
+                "name": "tmp75-i2c-3-4b:intake-temp"
+            },
+            {
+                "name": "tmp75-i2c-3-4c:tofino-temp"
+            },
+            {
+                "name": "tmp75-i2c-3-4d:intake2-temp"
             },
             {
                 "name": "tmp75-i2c-8-48:outlet-right-temp"
@@ -89,6 +99,9 @@
             {
                 "name": "tmp75-i2c-8-49:outlet-left-temp"
             },
+            {
+                "name": "pch_haswell-virtual-0:temp1"
+            },
             {
                 "name": "coretemp-isa-0000:package-id-0"
             },
@@ -103,107 +116,104 @@
             },
             {
                 "name": "coretemp-isa-0000:core-3"
-            },
-            {
-                "name": "pch_haswell-virtual-0:temp1"
             }
         ],
         "sfps": [
             {
-                "name": "Ethernet0"
+                "name": "sfp1"
             },
             {
-                "name": "Ethernet4"
+                "name": "sfp2"
             },
             {
-                "name": "Ethernet8"
+                "name": "sfp3"
             },
             {
-                "name": "Ethernet12"
+                "name": "sfp4"
             },
             {
-                "name": "Ethernet16"
+                "name": "sfp5"
             },
             {
-                "name": "Ethernet20"
+                "name": "sfp6"
             },
             {
-                "name": "Ethernet24"
+                "name": "sfp7"
             },
             {
-                "name": "Ethernet28"
+                "name": "sfp8"
             },
             {
-                "name": "Ethernet32"
+                "name": "sfp9"
             },
             {
-                "name": "Ethernet36"
+                "name": "sfp10"
             },
             {
-                "name": "Ethernet40"
+                "name": "sfp11"
             },
             {
-                "name": "Ethernet44"
+                "name": "sfp12"
             },
             {
-                "name": "Ethernet48"
+                "name": "sfp13"
             },
             {
-                "name": "Ethernet52"
+                "name": "sfp14"
             },
             {
-                "name": "Ethernet56"
+                "name": "sfp15"
             },
             {
-                "name": "Ethernet60"
+                "name": "sfp16"
             },
             {
-                "name": "Ethernet64"
+                "name": "sfp17"
             },
             {
-                "name": "Ethernet68"
+                "name": "sfp18"
             },
             {
-                "name": "Ethernet72"
+                "name": "sfp19"
             },
             {
-                "name": "Ethernet76"
+                "name": "sfp20"
             },
             {
-                "name": "Ethernet80"
+                "name": "sfp21"
             },
             {
-                "name": "Ethernet84"
+                "name": "sfp22"
             },
             {
-                "name": "Ethernet88"
+                "name": "sfp23"
             },
             {
-                "name": "Ethernet92"
+                "name": "sfp24"
             },
             {
-                "name": "Ethernet96"
+                "name": "sfp25"
             },
             {
-                "name": "Ethernet100"
+                "name": "sfp26"
             },
             {
-                "name": "Ethernet104"
+                "name": "sfp27"
             },
             {
-                "name": "Ethernet108"
+                "name": "sfp28"
             },
             {
-                "name": "Ethernet112"
+                "name": "sfp29"
             },
             {
-                "name": "Ethernet116"
+                "name": "sfp30"
             },
             {
-                "name": "Ethernet120"
+                "name": "sfp31"
             },
             {
-                "name": "Ethernet124"
+                "name": "sfp32"
             }
         ]
     },

device/barefoot/x86_64-accton_wedge100bf_32x-r0/platform_components.json

@@ -1,8 +1,10 @@
-{
-    "chassis": {
-        "Wedge100BF-32X-O-AC-F-BF": {
-            "component": {
-            }
-        }
-    }
+{
+    "chassis": {
+        "Wedge100BF-32X-O-AC-F-BF": {
+            "component": {
+                "BIOS": { },
+                "BMC": { }
+            }
+        }
+    }
 }

device/barefoot/x86_64-accton_wedge100bf_32x-r0/system_health_monitoring_config.json

@@ -0,0 +1,11 @@
+{
+    "services_to_ignore": [],
+    "devices_to_ignore": [],
+    "user_defined_checkers": [],
+    "polling_interval": 60,
+    "led_color": {
+        "fault": "amber",
+        "normal": "green",
+        "booting": "orange_blink"
+    }
+}

device/barefoot/x86_64-accton_wedge100bf_32x-r0/thermal_thresholds.json

@@ -0,0 +1,64 @@
+{
+    "thermals": [
+        {
+            "com_e_driver-i2c-4-33:cpu-temp" : [99.0, 89.0, 11.0, 1.0]
+        },
+        {
+            "com_e_driver-i2c-4-33:memory-temp" : [85.0, 75.0, 11.0, 1.0]
+        },
+        {
+            "psu_driver-i2c-7-59:psu2-temp1" : [50.0, 40.0, 11.0, 1.0]
+        },
+        {
+            "psu_driver-i2c-7-59:psu2-temp2" : [90.0, 80.0, 11.0, 1.0]
+        },
+        {
+            "psu_driver-i2c-7-5a:psu1-temp1" : [50.0, 40.0, 11.0, 1.0]
+        },
+        {
+            "psu_driver-i2c-7-5a:psu1-temp2" : [90.0, 80.0, 11.0, 1.0]
+        },
+        {
+            "tmp75-i2c-3-48:chip-temp" : [90.0, 80.0, 11.0, 1.0]
+        },
+        {
+            "tmp75-i2c-3-49:exhaust2-temp" : [80.0, 70.0, 11.0, 1.0]
+        },
+        {
+            "tmp75-i2c-3-4a:exhaust-temp" : [60.0, 50.0, 11.0, 1.0]
+        },
+        {
+            "tmp75-i2c-3-4b:intake-temp" : [60.0, 50.0, 11.0, 1.0]
+        },
+        {
+            "tmp75-i2c-3-4c:tofino-temp" : [99.0, 89.0, 11.0, 1.0]
+        },
+        {
+            "tmp75-i2c-3-4d:intake2-temp" : [60.0, 50.0, 11.0, 1.0]
+        },
+        {
+            "tmp75-i2c-8-48:outlet-right-temp" : [60.0, 50.0, 11.0, 1.0]
+        },
+        {
+            "tmp75-i2c-8-49:outlet-left-temp" : [60.0, 50.0, 11.0, 1.0]
+        },
+        {
+            "pch_haswell-virtual-0:temp1" : [60.0, 50.0, 11.0, 1.0]
+        },
+        {
+            "coretemp-isa-0000:package-id-0" : [80.0, 70.0, 11.0, 1.0]
+        },
+        {
+            "coretemp-isa-0000:core-0" : [99.0, 89.0, 11.0, 1.0]
+        },
+        {
+            "coretemp-isa-0000:core-1" : [99.0, 89.0, 11.0, 1.0]
+        },
+        {
+            "coretemp-isa-0000:core-2" : [99.0, 89.0, 11.0, 1.0]
+        },
+        {
+            "coretemp-isa-0000:core-3" : [99.0, 89.0, 11.0, 1.0]
+        }
+    ]
+}

device/barefoot/x86_64-accton_wedge100bf_65x-r0/mavericks/switch-sai.conf

@@ -1,34 +0,0 @@
-{
-    "chip_list": [
-        {
-            "id": "asic-0",
-            "chip_family": "Tofino",
-            "instance": 0,
-            "pcie_sysfs_prefix": "/sys/devices/pci0000:00/0000:00:03.0/0000:05:00.0",
-            "pcie_domain": 0,
-            "pcie_bus": 5,
-            "pcie_fn": 0,
-            "pcie_dev": 0,
-            "pcie_int_mode": 1,
-            "sds_fw_path": "share/tofino_sds_fw/avago/firmware"
-        }
-    ],
-    "instance": 0,
-    "p4_program_list": [
-        {
-            "id": "pgm-0",
-            "instance": 0,
-            "path": "switch",
-            "program-name": "switch",
-            "pd": "lib/tofinopd/switch/libpd.so",
-            "pd-thrift": "lib/tofinopd/switch/libpdthrift.so",
-            "table-config": "share/tofinopd/switch/context.json",
-            "tofino-bin": "share/tofinopd/switch/tofino.bin",
-            "switchapi": "lib/libswitchapi.so",
-            "sai": "lib/libsai.so",
-            "agent0": "lib/platform/x86_64-accton_wedge100bf_65x-r0/libpltfm_mgr.so",
-            "switchapi_port_add": false,
-            "non_default_port_ppgs": 5
-        }
-    ]
-}

device/barefoot/x86_64-accton_wedge100bf_65x-r0/mavericks/switch-tna-sai.conf

@@ -1,17 +1,9 @@
 {
-    "instance": 0,
     "chip_list": [
         {
-            "id": "asic-0",
             "chip_family": "Tofino",
-            "instance": 0,
-            "pcie_sysfs_prefix": "/sys/devices/pci0000:00/0000:00:03.0/0000:05:00.0",
-            "pcie_domain": 0,
-            "pcie_bus": 5,
-            "pcie_fn": 0,
-            "pcie_dev": 0,
-            "pcie_int_mode": 1,
-            "sds_fw_path": "share/tofino_sds_fw/avago/firmware"
+            "sds_fw_path": "share/tofino_sds_fw/avago/firmware",
+            "instance": 0
         }
     ],
     "p4_devices": [
@@ -28,7 +20,6 @@
                         }
                     ],
                     "program-name": "switch",
-                    "sai": "lib/libsai.so",
                     "bfrt-config": "share/switch/bf-rt.json",
                     "model_json_path" : "share/switch/aug_model.json",
                     "switchapi_port_add": false,
@@ -36,5 +27,13 @@
                 }
             ]
         }
+    ],
+    "switch_options": [
+        {
+            "device-id": 0,
+            "model_json_path": "share/switch/aug_model.json",
+            "non_default_port_ppgs": 5,
+            "switchapi_port_add": false
+        }
     ]
 }

device/barefoot/x86_64-accton_wedge100bf_65x-r0/platform.json

@@ -1,4 +1,89 @@
 {
+    "chassis": {
+        "name": "Mavericks",
+        "fans": [
+            {
+                "name": "counter-rotating-fan-1"
+            },
+            {
+                "name": "counter-rotating-fan-2"
+            },
+            {
+                "name": "counter-rotating-fan-3"
+            },
+            {
+                "name": "counter-rotating-fan-4"
+            },
+            {
+                "name": "counter-rotating-fan-5"
+            },
+            {
+                "name": "counter-rotating-fan-6"
+            },
+            {
+                "name": "counter-rotating-fan-7"
+            },
+            {
+                "name": "counter-rotating-fan-8"
+            },
+            {
+                "name": "counter-rotating-fan-9"
+            },
+            {
+                "name": "counter-rotating-fan-10"
+            }
+        ],
+        "fan_drawers": [
+            {
+                "name": "fantray-1",
+                "fans": [
+                    {
+                        "name": "counter-rotating-fan-1"
+                    },
+                    {
+                        "name": "counter-rotating-fan-2"
+                    },
+                    {
+                        "name": "counter-rotating-fan-3"
+                    },
+                    {
+                        "name": "counter-rotating-fan-4"
+                    },
+                    {
+                        "name": "counter-rotating-fan-5"
+                    }
+                ]
+            },
+            {
+                "name": "fantray-2",
+                "fans": [
+                    {
+                        "name": "counter-rotating-fan-6"
+                    },
+                    {
+                        "name": "counter-rotating-fan-7"
+                    },
+                    {
+                        "name": "counter-rotating-fan-8"
+                    },
+                    {
+                        "name": "counter-rotating-fan-9"
+                    },
+                    {
+                        "name": "counter-rotating-fan-10"
+                    }
+                ]
+            }
+        ]
+    },
+    "psus": [
+        {
+            "name": "psu-1"
+        },
+        {
+            "name": "psu-2"
+        }
+    ],
     "interfaces": {
         "Ethernet0": {
             "index": "1,1,1,1",

device/barefoot/x86_64-accton_wedge100bf_65x-r0/system_health_monitoring_config.json

@@ -0,0 +1,11 @@
+{
+    "services_to_ignore": [],
+    "devices_to_ignore": [],
+    "user_defined_checkers": [],
+    "polling_interval": 60,
+    "led_color": {
+        "fault": "amber",
+        "normal": "green",
+        "booting": "orange_blink"
+    }
+}

device/celestica/x86_64-cel_midstone-r0/Midstone-200i/buffers.json.j2

@@ -1,6 +1,5 @@
 {# Default values which will be used if no actual configura available #}
-{% set default_cable = '300m' %}
-{% set default_ports_num = 64 -%}
+{% set default_cable = '40m' %}
 
 {# Port configuration to cable length look-up table #}
 {# Each record describes mapping of DUT (DUT port) role and neighbor role to cable length #}
@@ -12,44 +11,53 @@
         }
 %}
 
-{%- macro cable_length(port_name) -%}
-    {%- set cable_len = [] -%}
-    {%- for local_port in DEVICE_NEIGHBOR -%}
-        {%- if local_port == port_name -%}
-            {%- if DEVICE_NEIGHBOR_METADATA[DEVICE_NEIGHBOR[local_port].name] -%}
-                {%- set neighbor = DEVICE_NEIGHBOR_METADATA[DEVICE_NEIGHBOR[local_port].name] -%}
-                {%- set neighbor_role = neighbor.type -%}
+{%- macro cable_length(port_name) %}
+    {%- set cable_len = [] %}
+    {%- for local_port in DEVICE_NEIGHBOR %}
+        {%- if local_port == port_name %}
+            {%- 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 %}
                 {%- set roles1 = switch_role + '_' + neighbor_role %}
-                {%- set roles2 = neighbor_role + '_' + switch_role -%}
-                {%- set roles1 = roles1 | lower -%}
-                {%- set roles2 = roles2 | lower -%}
-                {%- if roles1 in ports2cable -%}
-                    {%- if cable_len.append(ports2cable[roles1]) -%}{%- endif -%}
-                {%- elif roles2 in ports2cable -%}
-                    {%- if cable_len.append(ports2cable[roles2]) -%}{%- endif -%}
-                {%- endif -%}
-            {%- endif -%}
-        {%- endif -%}
-    {%- endfor -%}
+                {%- set roles2 = neighbor_role + '_' + switch_role %}
+                {%- set roles1 = roles1 | lower %}
+                {%- set roles2 = roles2 | lower %}
+                {%- if roles1 in ports2cable %}
+                    {%- if cable_len.append(ports2cable[roles1]) %}{% endif %}
+                {%- elif roles2 in ports2cable %}
+                    {%- if cable_len.append(ports2cable[roles2]) %}{% endif %}
+                {%- endif %}
+            {%- endif %}
+        {%- endif %}
+    {%- endfor %}
     {%- if cable_len -%}
         {{ cable_len.0 }}
-    {%- else -%}
-        {{ default_cable }}
-    {%- endif -%}
-{% endmacro %}
+    {%- else %}
+        {%- if switch_role.lower() == 'torrouter' %}
+            {%- for local_port in VLAN_MEMBER %}
+                {%- if local_port[1] == port_name %}
+                    {%- set roles3 = switch_role + '_' + 'server' %}
+                    {%- set roles3 = roles3 | lower %}
+                    {%- if roles3 in ports2cable %}
+                        {%- if cable_len.append(ports2cable[roles3]) %}{% endif %}
+                    {%- endif %}
+                {%- endif %}
+            {%- endfor %}
+            {%- if cable_len -%}
+                {{ cable_len.0 }}
+            {%- else -%}
+                {{ default_cable }}
+            {%- endif %}
+        {%- else -%}
+            {{ default_cable }}
+        {%- endif %}
+    {%- endif %}
+{%- endmacro %}
 
 {%- if DEVICE_METADATA is defined %}
 {%- set switch_role = DEVICE_METADATA['localhost']['type'] %}
 {%- endif -%}
 
-{# Generate list of ports if not defined #}
-{% if PORT is not defined %}
-    {% set PORT = [] %}
-    {% for port_idx in range(0,default_ports_num) %}
-        {% if PORT.append("Ethernet%d" % (port_idx*4)) %}{% endif %}
-    {% endfor %}
-{% endif -%}
-
 {% set port_names_list = [] %}
 {% for port in PORT %}
     {%- if port_names_list.append(port) %}{% endif %}
@@ -57,6 +65,15 @@
 {% set port_names = port_names_list | join(',') -%}
 
 {
+    "CABLE_LENGTH": {
+        "AZURE": {
+    {% for port in PORT %}
+        {% set cable = cable_length(port) -%}
+        "{{ port }}": "{{ cable }}"{%- if not loop.last -%},{% endif %}
+
+    {% endfor %}
+    }
+    },
     "BUFFER_POOL": {
         "ingress_lossless_pool": {
             "size": "47218432",
@@ -64,57 +81,81 @@
             "mode": "dynamic",
             "xoff": "17708800"
         },
-        "egress_lossy_pool": {
+        "lossy_pool": {
             "size": "18874368",
             "type": "egress",
             "mode": "dynamic",
             "xoff": "0"
+        },
+        "egress_lossless_pool": {
+            "size": "66092800",
+            "type": "egress"
         }
     },
     "BUFFER_PROFILE": {
         "ingress_lossless_profile": {
-            "pool":"ingress_lossless_pool",
-            "xoff":"1433600",
+            "pool":"[BUFFER_POOL|ingress_lossless_pool]",
+            "xoff":"38816",
             "size":"1518",
-            "dynamic_th":"-4",
-            "xon_offset":"6272"
-        },
-        "ingress_lossy_profile": {
-            "pool":"ingress_lossless_pool",
-            "size":"0",
-            "static_th":"9721600"
+            "dynamic_th":"1",
+            "xon_offset":"9408"
         },
         "egress_lossless_profile": {
-            "pool":"egress_lossy_pool",
+            "pool":"[BUFFER_POOL|ingress_lossless_pool]",
             "size":"0",
-            "static_th":"9721600"
+            "static_th":"9497600"
+        },
+        "ingress_lossy_profile": {
+            "pool":"[BUFFER_POOL|lossy_pool]",
+            "size":"0",
+            "static_th":"9497600"
         },
         "egress_lossy_profile": {
-            "pool":"egress_lossy_pool",
+            "pool":"[BUFFER_POOL|lossy_pool]",
             "size":"1518",
-            "dynamic_th":"3"
+            "dynamic_th":"2"
         }
     },
     "BUFFER_PG": {
-        "{{ port_names }}|0-3": {
-            "profile" : "egress_lossless_profile"
-        },
-        "{{ port_names }}|4-5": {
-            "profile" : "ingress_lossless_profile"
-        },
-        "{{ port_names }}|6-7": {
-            "profile" : "egress_lossless_profile"
-        }
+{% for port in port_names_list %}
+                "{{ port }}|3-4": {
+                     "profile" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+                },
+{% endfor %}
+{% for port in port_names_list %}
+                "{{ port }}|0": {
+                    "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+                },
+{% endfor %}
+{% for port in port_names_list %}
+                "{{ port }}|1-2": {
+                    "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+                },
+{% endfor %}
+{% for port in port_names_list %}
+                "{{ port }}|5-7": {
+                    "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+                }{% if not loop.last %},{% endif %}
+
+{% endfor %}
     },
+
     "BUFFER_QUEUE": {
-        "{{ port_names }}|4-5": {
-            "profile" : "ingress_lossy_profile"
+{% for port in port_names_list %}
+        "{{ port }}|3-4": {
+             "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
         },
-        "{{ port_names }}|0-3": {
-            "profile" : "egress_lossy_profile"
+{% endfor %}
+{% for port in port_names_list %}
+        "{{ port }}|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
         },
-        "{{ port_names }}|6-7": {
-            "profile" : "egress_lossy_profile"
-        }
+{% endfor %}
+{% for port in port_names_list %}
+        "{{ port }}|5-7": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        }{% if not loop.last %},{% endif %}
+
+{% endfor %}
     }
 }

device/celestica/x86_64-cel_midstone-r0/Midstone-200i/buffers_defaults_def_lossy.j2

@@ -0,0 +1,42 @@
+{% set port_names_list = [] %}
+{% for port in PORT %}
+    {%- if port_names_list.append(port) %}{% endif %}
+{% endfor %}
+{% set port_names = port_names_list | join(',') -%}
+
+{
+    "BUFFER_POOL": {
+        "lossy_pool": {
+            "size": "56985600",
+            "type": "egress",
+            "mode": "dynamic",
+            "xoff": "0"
+        }
+    },
+    "BUFFER_PROFILE": {
+        "ingress_lossy_profile": {
+            "pool":"[BUFFER_POOL|lossy_pool]",
+            "size":"0",
+            "static_th":"9497600"
+        },
+        "egress_lossy_profile": {
+            "pool":"[BUFFER_POOL|lossy_pool]",
+            "size":"1518",
+            "dynamic_th":"2"
+        }
+    },
+    "BUFFER_PG": {
+{% for port in port_names_list %}
+        "{{ port }}|0-7": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        }{% if not loop.last %},{% endif %}
+{% endfor %}
+    },
+    "BUFFER_QUEUE": {
+{% for port in port_names_list %}
+        "{{ port }}|0-7": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        }{% if not loop.last %},{% endif %}
+{% endfor %}
+    }
+}

device/celestica/x86_64-cel_midstone-r0/Midstone-200i/buffers_defaults_t1.j2

@@ -0,0 +1,161 @@
+{# Default values which will be used if no actual configura available #}
+{% set default_cable = '40m' %}
+
+{# Port configuration to cable length look-up table #}
+{# Each record describes mapping of DUT (DUT port) role and neighbor role to cable length #}
+{# Roles described in the minigraph #}
+{% set ports2cable = {
+        'torrouter_server'       : '5m',
+        'leafrouter_torrouter'   : '40m',
+        'spinerouter_leafrouter' : '300m'
+        }
+%}
+
+{%- macro cable_length(port_name) %}
+    {%- set cable_len = [] %}
+    {%- for local_port in DEVICE_NEIGHBOR %}
+        {%- if local_port == port_name %}
+            {%- 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 %}
+                {%- set roles1 = switch_role + '_' + neighbor_role %}
+                {%- set roles2 = neighbor_role + '_' + switch_role %}
+                {%- set roles1 = roles1 | lower %}
+                {%- set roles2 = roles2 | lower %}
+                {%- if roles1 in ports2cable %}
+                    {%- if cable_len.append(ports2cable[roles1]) %}{% endif %}
+                {%- elif roles2 in ports2cable %}
+                    {%- if cable_len.append(ports2cable[roles2]) %}{% endif %}
+                {%- endif %}
+            {%- endif %}
+        {%- endif %}
+    {%- endfor %}
+    {%- if cable_len -%}
+        {{ cable_len.0 }}
+    {%- else %}
+        {%- if switch_role.lower() == 'torrouter' %}
+            {%- for local_port in VLAN_MEMBER %}
+                {%- if local_port[1] == port_name %}
+                    {%- set roles3 = switch_role + '_' + 'server' %}
+                    {%- set roles3 = roles3 | lower %}
+                    {%- if roles3 in ports2cable %}
+                        {%- if cable_len.append(ports2cable[roles3]) %}{% endif %}
+                    {%- endif %}
+                {%- endif %}
+            {%- endfor %}
+            {%- if cable_len -%}
+                {{ cable_len.0 }}
+            {%- else -%}
+                {{ default_cable }}
+            {%- endif %}
+        {%- else -%}
+            {{ default_cable }}
+        {%- endif %}
+    {%- endif %}
+{%- endmacro %}
+
+{%- if DEVICE_METADATA is defined %}
+{%- set switch_role = DEVICE_METADATA['localhost']['type'] %}
+{%- endif -%}
+
+{% set port_names_list = [] %}
+{% for port in PORT %}
+    {%- if port_names_list.append(port) %}{% endif %}
+{% endfor %}
+{% set port_names = port_names_list | join(',') -%}
+
+{
+    "CABLE_LENGTH": {
+        "AZURE": {
+    {% for port in PORT %}
+        {% set cable = cable_length(port) -%}
+        "{{ port }}": "{{ cable }}"{%- if not loop.last -%},{% endif %}
+
+    {% endfor %}
+    }
+    },
+    "BUFFER_POOL": {
+        "ingress_lossless_pool": {
+            "size": "47218432",
+            "type": "ingress",
+            "mode": "dynamic",
+            "xoff": "17708800"
+        },
+        "lossy_pool": {
+            "size": "18874368",
+            "type": "egress",
+            "mode": "dynamic",
+            "xoff": "0"
+        },
+        "egress_lossless_pool": {
+            "size": "66092800",
+            "type": "egress"
+        }
+    },
+    "BUFFER_PROFILE": {
+        "ingress_lossless_profile": {
+            "pool":"ingress_lossless_pool",
+            "xoff":"38816",
+            "size":"1518",
+            "dynamic_th":"1",
+            "xon_offset":"9408"
+        },
+        "egress_lossless_profile": {
+            "pool":"ingress_lossless_pool",
+            "size":"0",
+            "static_th":"9497600"
+        },
+        "ingress_lossy_profile": {
+            "pool":"lossy_pool",
+            "size":"0",
+            "static_th":"9497600"
+        },
+        "egress_lossy_profile": {
+            "pool":"lossy_pool",
+            "size":"1518",
+            "dynamic_th":"2"
+        }
+    },
+    "BUFFER_PG": {
+{% for port in port_names_list %}
+                "{{ port }}|3-4": {
+                     "profile" : "ingress_lossless_profile"
+                },
+{% endfor %}
+{% for port in port_names_list %}
+                "{{ port }}|0": {
+                    "profile" : "ingress_lossy_profile"
+                },
+{% endfor %}
+{% for port in port_names_list %}
+                "{{ port }}|1-2": {
+                    "profile" : "ingress_lossy_profile"
+                },
+{% endfor %}
+{% for port in port_names_list %}
+                "{{ port }}|5-7": {
+                    "profile" : "ingress_lossy_profile"
+                }{% if not loop.last %},{% endif %}
+
+{% endfor %}
+    },
+
+    "BUFFER_QUEUE": {
+{% for port in port_names_list %}
+        "{{ port }}|3-4": {
+             "profile" : "egress_lossless_profile"
+        },
+{% endfor %}
+{% for port in port_names_list %}
+        "{{ port }}|0-2": {
+            "profile" : "egress_lossy_profile"
+        },
+{% endfor %}
+{% for port in port_names_list %}
+        "{{ port }}|5-7": {
+            "profile" : "egress_lossy_profile"
+        }{% if not loop.last %},{% endif %}
+
+{% endfor %}
+    }
+}

device/celestica/x86_64-cel_midstone-r0/Midstone-200i/config_64x100G_midstone200i.yaml

@@ -4,12 +4,20 @@ ifcs:
 nodes:
 - node_id: "0"
   options:
+    sd_low_power_mode_global_default: "true"
     sku: "innovium.77700_B"
     netdev:
     - auto_create: "no"
       multi_interface: "yes"
     buffer_management_mode: "api_driven"
+    wred_cr_ip_proto_list: "17"
+    cr_assignment_mode: "1"
     max_lossless_tc: "2"
+    pcie_attn: "14"
+    pcie_post: "18"
+    pcie_pre1: "0"
+    ilpm_enable: "1"
+    forward_profile: "IFCS_FORWARD_PROFILE_ID_PROFILE_E"
     txring:
     - txring_id: "0"
       desc_count: "1024"
@@ -57,452 +65,452 @@ nodes:
     sysport: "128"
     type: "cpu"
   - fec: "KRFEC"
-    id: "1"
+    id: "249"
     lanes: "0:4"
     serdes_group: "31"
     speed: "100G"
-    sysport: "1"
+    sysport: "249"
     type: "eth"
   - fec: "KRFEC"
-    id: "2"
+    id: "253"
     lanes: "4:4"
     serdes_group: "31"
     speed: "100G"
-    sysport: "2"
+    sysport: "253"
     type: "eth"
   - fec: "KRFEC"
-    id: "3"
+    id: "245"
     lanes: "4:4"
     serdes_group: "30"
     speed: "100G"
-    sysport: "3"
+    sysport: "245"
     type: "eth"
   - fec: "KRFEC"
-    id: "4"
+    id: "241"
     lanes: "0:4"
     serdes_group: "30"
     speed: "100G"
-    sysport: "4"
+    sysport: "241"
     type: "eth"
   - fec: "KRFEC"
-    id: "5"
+    id: "233"
     lanes: "0:4"
     serdes_group: "29"
     speed: "100G"
-    sysport: "5"
+    sysport: "233"
     type: "eth"
   - fec: "KRFEC"
-    id: "6"
+    id: "237"
     lanes: "4:4"
     serdes_group: "29"
     speed: "100G"
-    sysport: "6"
+    sysport: "237"
     type: "eth"
   - fec: "KRFEC"
-    id: "7"
+    id: "229"
     lanes: "4:4"
     serdes_group: "28"
     speed: "100G"
-    sysport: "7"
+    sysport: "229"
     type: "eth"
   - fec: "KRFEC"
-    id: "8"
+    id: "225"
     lanes: "0:4"
     serdes_group: "28"
     speed: "100G"
-    sysport: "8"
+    sysport: "225"
     type: "eth"
   - fec: "KRFEC"
-    id: "9"
+    id: "217"
     lanes: "0:4"
     serdes_group: "27"
     speed: "100G"
-    sysport: "9"
+    sysport: "217"
     type: "eth"
   - fec: "KRFEC"
-    id: "10"
+    id: "221"
     lanes: "4:4"
     serdes_group: "27"
     speed: "100G"
-    sysport: "10"
+    sysport: "221"
     type: "eth"
   - fec: "KRFEC"
-    id: "11"
+    id: "213"
     lanes: "4:4"
     serdes_group: "26"
     speed: "100G"
-    sysport: "11"
+    sysport: "213"
     type: "eth"
   - fec: "KRFEC"
-    id: "12"
+    id: "209"
     lanes: "0:4"
     serdes_group: "26"
     speed: "100G"
-    sysport: "12"
+    sysport: "209"
     type: "eth"
   - fec: "KRFEC"
-    id: "13"
+    id: "201"
     lanes: "0:4"
     serdes_group: "25"
     speed: "100G"
-    sysport: "13"
+    sysport: "201"
     type: "eth"
   - fec: "KRFEC"
-    id: "14"
+    id: "205"
     lanes: "4:4"
     serdes_group: "25"
     speed: "100G"
-    sysport: "14"
+    sysport: "205"
     type: "eth"
   - fec: "KRFEC"
-    id: "15"
+    id: "197"
     lanes: "4:4"
     serdes_group: "24"
     speed: "100G"
-    sysport: "15"
+    sysport: "197"
     type: "eth"
   - fec: "KRFEC"
-    id: "16"
+    id: "193"
     lanes: "0:4"
     serdes_group: "24"
     speed: "100G"
-    sysport: "16"
+    sysport: "193"
     type: "eth"
   - fec: "KRFEC"
-    id: "17"
+    id: "185"
     lanes: "0:4"
     serdes_group: "23"
     speed: "100G"
-    sysport: "17"
+    sysport: "185"
     type: "eth"
   - fec: "KRFEC"
-    id: "18"
+    id: "189"
     lanes: "4:4"
     serdes_group: "23"
     speed: "100G"
-    sysport: "18"
+    sysport: "189"
     type: "eth"
   - fec: "KRFEC"
-    id: "19"
+    id: "181"
     lanes: "4:4"
     serdes_group: "22"
     speed: "100G"
-    sysport: "19"
+    sysport: "181"
     type: "eth"
   - fec: "KRFEC"
-    id: "20"
+    id: "177"
     lanes: "0:4"
     serdes_group: "22"
     speed: "100G"
-    sysport: "20"
+    sysport: "177"
     type: "eth"
   - fec: "KRFEC"
-    id: "21"
+    id: "169"
     lanes: "0:4"
     serdes_group: "21"
     speed: "100G"
-    sysport: "21"
+    sysport: "169"
     type: "eth"
   - fec: "KRFEC"
-    id: "22"
+    id: "173"
     lanes: "4:4"
     serdes_group: "21"
     speed: "100G"
-    sysport: "22"
+    sysport: "173"
     type: "eth"
   - fec: "KRFEC"
-    id: "23"
+    id: "165"
     lanes: "4:4"
     serdes_group: "20"
     speed: "100G"
-    sysport: "23"
+    sysport: "165"
     type: "eth"
   - fec: "KRFEC"
-    id: "24"
+    id: "161"
     lanes: "0:4"
     serdes_group: "20"
     speed: "100G"
-    sysport: "24"
+    sysport: "161"
     type: "eth"
   - fec: "KRFEC"
-    id: "25"
+    id: "153"
     lanes: "0:4"
     serdes_group: "19"
     speed: "100G"
-    sysport: "25"
+    sysport: "153"
     type: "eth"
   - fec: "KRFEC"
-    id: "26"
+    id: "157"
     lanes: "4:4"
     serdes_group: "19"
     speed: "100G"
-    sysport: "26"
+    sysport: "157"
     type: "eth"
   - fec: "KRFEC"
-    id: "27"
+    id: "149"
     lanes: "4:4"
     serdes_group: "18"
     speed: "100G"
-    sysport: "27"
+    sysport: "149"
     type: "eth"
   - fec: "KRFEC"
-    id: "28"
+    id: "145"
     lanes: "0:4"
     serdes_group: "18"
     speed: "100G"
-    sysport: "28"
+    sysport: "145"
     type: "eth"
   - fec: "KRFEC"
-    id: "29"
+    id: "137"
     lanes: "0:4"
     serdes_group: "17"
     speed: "100G"
-    sysport: "29"
+    sysport: "137"
     type: "eth"
   - fec: "KRFEC"
-    id: "30"
+    id: "141"
     lanes: "4:4"
     serdes_group: "17"
     speed: "100G"
-    sysport: "30"
+    sysport: "141"
     type: "eth"
   - fec: "KRFEC"
-    id: "31"
+    id: "133"
     lanes: "4:4"
     serdes_group: "16"
     speed: "100G"
-    sysport: "31"
+    sysport: "133"
     type: "eth"
   - fec: "KRFEC"
-    id: "32"
+    id: "129"
     lanes: "0:4"
     serdes_group: "16"
     speed: "100G"
-    sysport: "32"
+    sysport: "129"
     type: "eth"
   - fec: "KRFEC"
-    id: "33"
+    id: "121"
     lanes: "0:4"
     serdes_group: "15"
     speed: "100G"
-    sysport: "33"
+    sysport: "121"
     type: "eth"
   - fec: "KRFEC"
-    id: "34"
+    id: "125"
     lanes: "4:4"
     serdes_group: "15"
     speed: "100G"
-    sysport: "34"
+    sysport: "125"
     type: "eth"
   - fec: "KRFEC"
-    id: "35"
+    id: "117"
     lanes: "4:4"
     serdes_group: "14"
     speed: "100G"
-    sysport: "35"
+    sysport: "117"
     type: "eth"
   - fec: "KRFEC"
-    id: "36"
+    id: "113"
     lanes: "0:4"
     serdes_group: "14"
     speed: "100G"
-    sysport: "36"
+    sysport: "113"
     type: "eth"
   - fec: "KRFEC"
-    id: "37"
+    id: "105"
     lanes: "0:4"
     serdes_group: "13"
     speed: "100G"
-    sysport: "37"
+    sysport: "105"
     type: "eth"
   - fec: "KRFEC"
-    id: "38"
+    id: "109"
     lanes: "4:4"
     serdes_group: "13"
     speed: "100G"
-    sysport: "38"
+    sysport: "109"
     type: "eth"
   - fec: "KRFEC"
-    id: "39"
+    id: "101"
     lanes: "4:4"
     serdes_group: "12"
     speed: "100G"
-    sysport: "39"
+    sysport: "101"
     type: "eth"
   - fec: "KRFEC"
-    id: "40"
+    id: "97"
     lanes: "0:4"
     serdes_group: "12"
     speed: "100G"
-    sysport: "40"
+    sysport: "97"
     type: "eth"
   - fec: "KRFEC"
-    id: "41"
+    id: "89"
     lanes: "0:4"
     serdes_group: "11"
     speed: "100G"
-    sysport: "41"
+    sysport: "89"
     type: "eth"
   - fec: "KRFEC"
-    id: "42"
+    id: "93"
     lanes: "4:4"
     serdes_group: "11"
     speed: "100G"
-    sysport: "42"
+    sysport: "93"
     type: "eth"
   - fec: "KRFEC"
-    id: "43"
+    id: "85"
     lanes: "4:4"
     serdes_group: "10"
     speed: "100G"
-    sysport: "43"
+    sysport: "85"
     type: "eth"
   - fec: "KRFEC"
-    id: "44"
+    id: "81"
     lanes: "0:4"
     serdes_group: "10"
     speed: "100G"
-    sysport: "44"
+    sysport: "81"
     type: "eth"
   - fec: "KRFEC"
-    id: "45"
+    id: "73"
     lanes: "0:4"
     serdes_group: "9"
     speed: "100G"
-    sysport: "45"
+    sysport: "73"
     type: "eth"
   - fec: "KRFEC"
-    id: "46"
+    id: "77"
     lanes: "4:4"
     serdes_group: "9"
     speed: "100G"
-    sysport: "46"
+    sysport: "77"
     type: "eth"
   - fec: "KRFEC"
-    id: "47"
+    id: "69"
     lanes: "4:4"
     serdes_group: "8"
     speed: "100G"
-    sysport: "47"
+    sysport: "69"
     type: "eth"
   - fec: "KRFEC"
-    id: "48"
+    id: "65"
     lanes: "0:4"
     serdes_group: "8"
     speed: "100G"
-    sysport: "48"
-    type: "eth"
-  - fec: "KRFEC"
-    id: "49"
-    lanes: "0:4"
-    serdes_group: "7"
-    speed: "100G"
-    sysport: "49"
-    type: "eth"
-  - fec: "KRFEC"
-    id: "50"
-    lanes: "4:4"
-    serdes_group: "7"
-    speed: "100G"
-    sysport: "50"
-    type: "eth"
-  - fec: "KRFEC"
-    id: "51"
-    lanes: "4:4"
-    serdes_group: "6"
-    speed: "100G"
-    sysport: "51"
-    type: "eth"
-  - fec: "KRFEC"
-    id: "52"
-    lanes: "0:4"
-    serdes_group: "6"
-    speed: "100G"
-    sysport: "52"
-    type: "eth"
-  - fec: "KRFEC"
-    id: "53"
-    lanes: "0:4"
-    serdes_group: "5"
-    speed: "100G"
-    sysport: "53"
-    type: "eth"
-  - fec: "KRFEC"
-    id: "54"
-    lanes: "4:4"
-    serdes_group: "5"
-    speed: "100G"
-    sysport: "54"
-    type: "eth"
-  - fec: "KRFEC"
-    id: "55"
-    lanes: "4:4"
-    serdes_group: "4"
-    speed: "100G"
-    sysport: "55"
-    type: "eth"
-  - fec: "KRFEC"
-    id: "56"
-    lanes: "0:4"
-    serdes_group: "4"
-    speed: "100G"
-    sysport: "56"
+    sysport: "65"
     type: "eth"
   - fec: "KRFEC"
     id: "57"
     lanes: "0:4"
-    serdes_group: "3"
+    serdes_group: "7"
     speed: "100G"
     sysport: "57"
     type: "eth"
-  - fec: "KRFEC"
-    id: "58"
-    lanes: "4:4"
-    serdes_group: "3"
-    speed: "100G"
-    sysport: "58"
-    type: "eth"
-  - fec: "KRFEC"
-    id: "59"
-    lanes: "4:4"
-    serdes_group: "2"
-    speed: "100G"
-    sysport: "59"
-    type: "eth"
-  - fec: "KRFEC"
-    id: "60"
-    lanes: "0:4"
-    serdes_group: "2"
-    speed: "100G"
-    sysport: "60"
-    type: "eth"
   - fec: "KRFEC"
     id: "61"
-    lanes: "0:4"
-    serdes_group: "1"
+    lanes: "4:4"
+    serdes_group: "7"
     speed: "100G"
     sysport: "61"
     type: "eth"
   - fec: "KRFEC"
-    id: "62"
+    id: "53"
+    lanes: "4:4"
+    serdes_group: "6"
+    speed: "100G"
+    sysport: "53"
+    type: "eth"
+  - fec: "KRFEC"
+    id: "49"
+    lanes: "0:4"
+    serdes_group: "6"
+    speed: "100G"
+    sysport: "49"
+    type: "eth"
+  - fec: "KRFEC"
+    id: "41"
+    lanes: "0:4"
+    serdes_group: "5"
+    speed: "100G"
+    sysport: "41"
+    type: "eth"
+  - fec: "KRFEC"
+    id: "45"
+    lanes: "4:4"
+    serdes_group: "5"
+    speed: "100G"
+    sysport: "45"
+    type: "eth"
+  - fec: "KRFEC"
+    id: "37"
+    lanes: "4:4"
+    serdes_group: "4"
+    speed: "100G"
+    sysport: "37"
+    type: "eth"
+  - fec: "KRFEC"
+    id: "33"
+    lanes: "0:4"
+    serdes_group: "4"
+    speed: "100G"
+    sysport: "33"
+    type: "eth"
+  - fec: "KRFEC"
+    id: "25"
+    lanes: "0:4"
+    serdes_group: "3"
+    speed: "100G"
+    sysport: "25"
+    type: "eth"
+  - fec: "KRFEC"
+    id: "29"
+    lanes: "4:4"
+    serdes_group: "3"
+    speed: "100G"
+    sysport: "29"
+    type: "eth"
+  - fec: "KRFEC"
+    id: "21"
+    lanes: "4:4"
+    serdes_group: "2"
+    speed: "100G"
+    sysport: "21"
+    type: "eth"
+  - fec: "KRFEC"
+    id: "17"
+    lanes: "0:4"
+    serdes_group: "2"
+    speed: "100G"
+    sysport: "17"
+    type: "eth"
+  - fec: "KRFEC"
+    id: "9"
+    lanes: "0:4"
+    serdes_group: "1"
+    speed: "100G"
+    sysport: "9"
+    type: "eth"
+  - fec: "KRFEC"
+    id: "13"
     lanes: "4:4"
     serdes_group: "1"
     speed: "100G"
-    sysport: "62"
+    sysport: "13"
     type: "eth"
   - fec: "KRFEC"
-    id: "63"
+    id: "5"
     lanes: "4:4"
     serdes_group: "0"
     speed: "100G"
-    sysport: "63"
+    sysport: "5"
     type: "eth"
   - fec: "KRFEC"
-    id: "64"
+    id: "1"
     lanes: "0:4"
     serdes_group: "0"
     speed: "100G"
-    sysport: "64"
+    sysport: "1"
     type: "eth"
   isg:
   - id: "0"

device/celestica/x86_64-cel_midstone-r0/Midstone-200i/innovium.77700_B

@@ -5,6 +5,7 @@ device_id:         0x1b58
 # Hardware constraint information
 hardware:
         num_ibs:           6
+        ib_active:         0,1,2,3,4,5
 
         ports_per_ib:      32, 32, 32, 32, 20, 20
         recirc_port_num:   32, 32, 32, 32, 32, 32

device/celestica/x86_64-cel_midstone-r0/Midstone-200i/ivm.sai.config.yaml

@@ -0,0 +1,8 @@
+IFCS_INIT_FILE : "/usr/share/sonic/hwsku/config_64x100G_midstone200i.yaml"
+IFCS_SKU_FILE : "/usr/share/sonic/hwsku/innovium.77700_B"
+IFCS_INNO_CLI_PORT : "9999"
+IFCS_TARGET : "device"
+INNOVIUM_DIR : "/innovium"
+PYTHONPATH : "$INNOVIUM_DIR:$INNOVIUM_DIR/cmds:$INNOVIUM_DIR/scripts:$INNOVIUM_DIR/test/:$INNOVIUM_DIR/test/utils:$INNOVIUM_DIR/utils:$INNOVIUM_DIR/pyctypes:$INNOVIUM_DIR/ifcs_cmds:$INNOVIUM_DIR/testutil"
+IVM_SAI_DATAPATH_CONFIG_FILE: "/usr/share/sonic/hwsku/ivm.sai.datapath.config.yaml"
+IVM_SAI_PARAM_A0008: "32"

device/celestica/x86_64-cel_midstone-r0/Midstone-200i/ivm.sai.datapath.config.yaml

@@ -0,0 +1,9 @@
+ISAI_PARAM_P0_0_LS : "4608 4608 4608 4608 2880 2880"
+ISAI_PARAM_P0_1_LS : "2226 1946 1946 1890 1218 1218"
+ISAI_PARAM_P0_1_ALS : "434 154 154 98 98 98"
+ISAI_PARAM_P1_0_LS : "1536 1536 1536 1536 960 960"
+ISAI_PARAM_P1_0_LL : "3072 3072 3072 3072 1920 1920"
+ISAI_PARAM_P1_1_LS : "1778 1498 1498 1442 938 938"
+ISAI_PARAM_P1_1_LL : "2478 2478 2478 2478 2478 2478"
+ISAI_PARAM_P1_1_ALS : "434 154 154 98 98 98"
+ISAI_PARAM_P1_1_ALL : "126 126 126 126 126 126"

device/celestica/x86_64-cel_midstone-r0/Midstone-200i/pg_profile_lookup.ini

@@ -0,0 +1,22 @@
+# PG lossless profiles.
+# speed   cable size  xon  xoff  threshold xon_offset
+  25000   5m    1518  0    15680   1       9408
+  50000   5m    1518  0    21248   1       9408
+  100000  5m    1518  0    34624   1       9408
+  200000  5m    1518  0    62368   1       9408
+  400000  5m    1518  0    117536  1       9408
+  25000   40m   1518  0    16928   1       9408
+  50000   40m   1518  0    23392   1       9408
+  100000  40m   1518  0    38816   1       9408
+  200000  40m   1518  0    71904   1       9408
+  400000  40m   1518  0    135520  1       9408
+  25000   100m  1518  0    18848   1       9408
+  50000   100m  1518  0    27264   1       9408
+  100000  100m  1518  0    46496   1       9408
+  200000  100m  1518  0    87168   1       9408
+  400000  100m  1518  0    166688  1       9408
+  25000   300m  1518  0    25184   1       9408
+  50000   300m  1518  0    40128   1       9408
+  100000  300m  1518  0    72384   1       9408
+  200000  300m  1518  0    138112  1       9408
+  400000  300m  1518  0    268640  1       9408

device/celestica/x86_64-cel_midstone-r0/Midstone-200i/port_config.ini

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

device/celestica/x86_64-cel_midstone-r0/Midstone-200i/qos.json.j2

@@ -1,14 +1,3 @@
-{# Default values which will be used if no actual configura available #}
-
-{% set default_ports_num = 64 -%}
-{# Generate list of ports if not defined #}
-{% if PORT is not defined %}
-    {% set PORT = [] %}
-    {% for port_idx in range(0,default_ports_num) %}
-        {% if PORT.append("Ethernet%d" % (port_idx*4)) %}{% endif %}
-    {% endfor %}
-{% endif -%}
-
 {% set port_names_list = [] %}
 {% for port in PORT %}
     {%- if port_names_list.append(port) %}{% endif %}
@@ -19,102 +8,122 @@
 {
    "TC_TO_QUEUE_MAP":{
         "AZURE":{
-            "1":"1",
             "0":"0",
-            "3":"3",
+            "1":"1",
             "2":"2",
-            "5":"5",
+            "3":"3",
             "4":"4",
-            "7":"7",
-            "6":"6"
+            "5":"5",
+            "6":"6",
+            "7":"7"
         }
     },
     "TC_TO_PRIORITY_GROUP_MAP": {
     "AZURE": {
-        "1": "0",
         "0": "0",
-        "3": "0",
+        "1": "0",
         "2": "0",
-        "4": "1",
-        "5": "2",
+        "3": "3",
+        "4": "4",
+        "5": "0",
         "6": "0",
         "7": "0"
     }
     },
        "DSCP_TO_TC_MAP": {
         "AZURE": {
-            "0":"0",
-            "1":"0",
-            "2":"0",
-            "3":"0",
-            "4":"4",
-            "5":"5",
-            "6":"0",
-            "7":"0",
-            "8":"1",
-            "9":"0",
-            "10":"0",
-            "11":"0",
-            "12":"0",
-            "13":"0",
-            "14":"0",
-            "15":"0",
-            "16":"0",
-            "17":"0",
-            "18":"0",
-            "19":"0",
-            "20":"0",
-            "21":"0",
-            "22":"0",
-            "23":"0",
-            "24":"0",
-            "25":"0",
-            "26":"0",
-            "27":"0",
-            "28":"0",
-            "29":"0",
-            "30":"0",
-            "31":"0",
-            "32":"0",
-            "33":"0",
-            "34":"0",
-            "35":"0",
-            "36":"0",
-            "37":"0",
-            "38":"0",
-            "39":"0",
-            "40":"0",
-            "41":"0",
-            "42":"0",
-            "43":"0",
-            "44":"0",
-            "45":"0",
-            "46":"0",
-            "47":"0",
-            "48":"0",
-            "49":"0",
-            "50":"0",
-            "51":"0",
-            "52":"0",
-            "53":"0",
-            "54":"0",
-            "55":"0",
-            "56":"0",
-            "57":"0",
-            "58":"0",
-            "59":"0",
-            "60":"0",
-            "61":"0",
-            "62":"0",
-            "63":"0"
+            "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"
         }
     },
     "PORT_QOS_MAP": {
-       "{{ port_names }}": {
-            "tc_to_pg_map": "AZURE",
-            "tc_to_queue_map": "AZURE",
-            "dscp_to_tc_map": "AZURE",
-            "pfc_enable": "4,5"
+{% for port in port_names_list %}
+       "{{ port }}": {
+            "tc_to_pg_map": "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "tc_to_queue_map": "[TC_TO_QUEUE_MAP|AZURE]",
+            "dscp_to_tc_map": "[DSCP_TO_TC_MAP|AZURE]",
+            "pfc_enable": "3,4"
+        }{% if not loop.last %},{% endif %}
+
+{% endfor %}
+    },
+    "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"
         }
     }
 }

device/celestica/x86_64-cel_midstone-r0/Midstone-200i/qos_defaults_def_lossy.j2

@@ -0,0 +1,121 @@
+{% set port_names_list = [] %}
+{% for port in PORT %}
+    {%- if port_names_list.append(port) %}{% endif %}
+{% endfor %}
+{% set port_names = port_names_list | join(',') -%}
+
+
+{
+   "TC_TO_QUEUE_MAP":{
+        "AZURE":{
+            "0":"0",
+            "1":"1",
+            "2":"2",
+            "3":"3",
+            "4":"4",
+            "5":"5",
+            "6":"6",
+            "7":"7"
+        }
+    },
+    "TC_TO_PRIORITY_GROUP_MAP": {
+    "AZURE": {
+        "0": "0",
+        "1": "0",
+        "2": "0",
+        "3": "1",
+        "4": "2",
+        "5": "0",
+        "6": "0",
+        "7": "0"
+    }
+    },
+       "DSCP_TO_TC_MAP": {
+        "AZURE": {
+            "0":"0",
+            "1":"0",
+            "2":"0",
+            "3":"0",
+            "4":"0",
+            "5":"0",
+            "6":"0",
+            "7":"0",
+            "8":"0",
+            "9":"0",
+            "10":"0",
+            "11":"0",
+            "12":"0",
+            "13":"0",
+            "14":"0",
+            "15":"0",
+            "16":"0",
+            "17":"0",
+            "18":"0",
+            "19":"0",
+            "20":"0",
+            "21":"0",
+            "22":"0",
+            "23":"0",
+            "24":"0",
+            "25":"0",
+            "26":"0",
+            "27":"0",
+            "28":"0",
+            "29":"0",
+            "30":"0",
+            "31":"0",
+            "32":"0",
+            "33":"0",
+            "34":"0",
+            "35":"0",
+            "36":"0",
+            "37":"0",
+            "38":"0",
+            "39":"0",
+            "40":"0",
+            "41":"0",
+            "42":"0",
+            "43":"0",
+            "44":"0",
+            "45":"0",
+            "46":"0",
+            "47":"0",
+            "48":"0",
+            "49":"0",
+            "50":"0",
+            "51":"0",
+            "52":"0",
+            "53":"0",
+            "54":"0",
+            "55":"0",
+            "56":"0",
+            "57":"0",
+            "58":"0",
+            "59":"0",
+            "60":"0",
+            "61":"0",
+            "62":"0",
+            "63":"0"
+        }
+    },
+    "PORT_QOS_MAP": {
+{% for port in port_names_list %}
+       "{{ port }}": {
+            "tc_to_pg_map": "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "tc_to_queue_map": "[TC_TO_QUEUE_MAP|AZURE]",
+            "dscp_to_tc_map": "[DSCP_TO_TC_MAP|AZURE]"
+        }{% if not loop.last %},{% endif %}
+
+{% endfor %}
+    },
+    "SCHEDULER": {
+        "scheduler.7": {
+            "type": "STRICT"
+        }
+    },
+    "QUEUE": {
+        "{{ port_names }}|7": {
+            "scheduler": "[SCHEDULER|scheduler.7]"
+        }
+    }
+}

device/celestica/x86_64-cel_midstone-r0/Midstone-200i/qos_defaults_t1.j2

@@ -0,0 +1,129 @@
+{% set port_names_list = [] %}
+{% for port in PORT %}
+    {%- if port_names_list.append(port) %}{% endif %}
+{% endfor %}
+{% set port_names = port_names_list | join(',') -%}
+
+
+{
+   "TC_TO_QUEUE_MAP":{
+        "AZURE":{
+            "0":"0",
+            "1":"1",
+            "2":"2",
+            "3":"3",
+            "4":"4",
+            "5":"5",
+            "6":"6",
+            "7":"7"
+        }
+    },
+    "TC_TO_PRIORITY_GROUP_MAP": {
+    "AZURE": {
+        "0": "0",
+        "1": "0",
+        "2": "0",
+        "3": "3",
+        "4": "4",
+        "5": "0",
+        "6": "0",
+        "7": "0"
+    }
+    },
+       "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"
+        }
+    },
+    "PORT_QOS_MAP": {
+{% for port in port_names_list %}
+       "{{ port }}": {
+            "tc_to_pg_map": "AZURE",
+            "tc_to_queue_map": "AZURE",
+            "dscp_to_tc_map": "AZURE",
+            "pfc_enable": "3,4"
+        }{% if not loop.last %},{% endif %}
+
+{% endfor %}
+    },
+    "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"
+        }
+    }
+}

device/celestica/x86_64-cel_midstone-r0/Midstone-200i/sai.profile

@@ -1 +1 @@
-SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/inno.config.yaml
+SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/ivm.sai.config.yaml

device/celestica/x86_64-cel_midstone-r0/Midstone-200i_128x100/buffers.json.j2

@@ -1,6 +1,5 @@
 {# Default values which will be used if no actual configura available #}
-{% set default_cable = '300m' %}
-{% set default_ports_num = 128 -%}
+{% set default_cable = '40m' %}
 
 {# Port configuration to cable length look-up table #}
 {# Each record describes mapping of DUT (DUT port) role and neighbor role to cable length #}
@@ -12,44 +11,53 @@
         }
 %}
 
-{%- macro cable_length(port_name) -%}
-    {%- set cable_len = [] -%}
-    {%- for local_port in DEVICE_NEIGHBOR -%}
-        {%- if local_port == port_name -%}
-            {%- if DEVICE_NEIGHBOR_METADATA[DEVICE_NEIGHBOR[local_port].name] -%}
-                {%- set neighbor = DEVICE_NEIGHBOR_METADATA[DEVICE_NEIGHBOR[local_port].name] -%}
-                {%- set neighbor_role = neighbor.type -%}
+{%- macro cable_length(port_name) %}
+    {%- set cable_len = [] %}
+    {%- for local_port in DEVICE_NEIGHBOR %}
+        {%- if local_port == port_name %}
+            {%- 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 %}
                 {%- set roles1 = switch_role + '_' + neighbor_role %}
-                {%- set roles2 = neighbor_role + '_' + switch_role -%}
-                {%- set roles1 = roles1 | lower -%}
-                {%- set roles2 = roles2 | lower -%}
-                {%- if roles1 in ports2cable -%}
-                    {%- if cable_len.append(ports2cable[roles1]) -%}{%- endif -%}
-                {%- elif roles2 in ports2cable -%}
-                    {%- if cable_len.append(ports2cable[roles2]) -%}{%- endif -%}
-                {%- endif -%}
-            {%- endif -%}
-        {%- endif -%}
-    {%- endfor -%}
+                {%- set roles2 = neighbor_role + '_' + switch_role %}
+                {%- set roles1 = roles1 | lower %}
+                {%- set roles2 = roles2 | lower %}
+                {%- if roles1 in ports2cable %}
+                    {%- if cable_len.append(ports2cable[roles1]) %}{% endif %}
+                {%- elif roles2 in ports2cable %}
+                    {%- if cable_len.append(ports2cable[roles2]) %}{% endif %}
+                {%- endif %}
+            {%- endif %}
+        {%- endif %}
+    {%- endfor %}
     {%- if cable_len -%}
         {{ cable_len.0 }}
-    {%- else -%}
-        {{ default_cable }}
-    {%- endif -%}
-{% endmacro %}
+    {%- else %}
+        {%- if switch_role.lower() == 'torrouter' %}
+            {%- for local_port in VLAN_MEMBER %}
+                {%- if local_port[1] == port_name %}
+                    {%- set roles3 = switch_role + '_' + 'server' %}
+                    {%- set roles3 = roles3 | lower %}
+                    {%- if roles3 in ports2cable %}
+                        {%- if cable_len.append(ports2cable[roles3]) %}{% endif %}
+                    {%- endif %}
+                {%- endif %}
+            {%- endfor %}
+            {%- if cable_len -%}
+                {{ cable_len.0 }}
+            {%- else -%}
+                {{ default_cable }}
+            {%- endif %}
+        {%- else -%}
+            {{ default_cable }}
+        {%- endif %}
+    {%- endif %}
+{%- endmacro %}
 
 {%- if DEVICE_METADATA is defined %}
 {%- set switch_role = DEVICE_METADATA['localhost']['type'] %}
 {%- endif -%}
 
-{# Generate list of ports if not defined #}
-{% if PORT is not defined %}
-    {% set PORT = [] %}
-    {% for port_idx in range(0,default_ports_num) %}
-        {% if PORT.append("Ethernet%d" % (port_idx*2)) %}{% endif %}
-    {% endfor %}
-{% endif -%}
-
 {% set port_names_list = [] %}
 {% for port in PORT %}
     {%- if port_names_list.append(port) %}{% endif %}
@@ -57,6 +65,15 @@
 {% set port_names = port_names_list | join(',') -%}
 
 {
+    "CABLE_LENGTH": {
+        "AZURE": {
+    {% for port in PORT %}
+        {% set cable = cable_length(port) -%}
+        "{{ port }}": "{{ cable }}"{%- if not loop.last -%},{% endif %}
+
+    {% endfor %}
+    }
+    },
     "BUFFER_POOL": {
         "ingress_lossless_pool": {
             "size": "47218432",
@@ -64,57 +81,81 @@
             "mode": "dynamic",
             "xoff": "17708800"
         },
-        "egress_lossy_pool": {
+        "lossy_pool": {
             "size": "18874368",
             "type": "egress",
             "mode": "dynamic",
             "xoff": "0"
+        },
+        "egress_lossless_pool": {
+            "size": "66092800",
+            "type": "egress"
         }
     },
     "BUFFER_PROFILE": {
         "ingress_lossless_profile": {
-            "pool":"ingress_lossless_pool",
-            "xoff":"1433600",
+            "pool":"[BUFFER_POOL|ingress_lossless_pool]",
+            "xoff":"38816",
             "size":"1518",
-            "dynamic_th":"-4",
-            "xon_offset":"6272"
-        },
-        "ingress_lossy_profile": {
-            "pool":"ingress_lossless_pool",
-            "size":"0",
-            "static_th":"9721600"
+            "dynamic_th":"1",
+            "xon_offset":"9408"
         },
         "egress_lossless_profile": {
-            "pool":"egress_lossy_pool",
+            "pool":"[BUFFER_POOL|ingress_lossless_pool]",
             "size":"0",
-            "static_th":"9721600"
+            "static_th":"9497600"
+        },
+        "ingress_lossy_profile": {
+            "pool":"[BUFFER_POOL|lossy_pool]",
+            "size":"0",
+            "static_th":"9497600"
         },
         "egress_lossy_profile": {
-            "pool":"egress_lossy_pool",
+            "pool":"[BUFFER_POOL|lossy_pool]",
             "size":"1518",
-            "dynamic_th":"3"
+            "dynamic_th":"2"
         }
     },
     "BUFFER_PG": {
-        "{{ port_names }}|0-3": {
-            "profile" : "egress_lossless_profile"
-        },
-        "{{ port_names }}|4-5": {
-            "profile" : "ingress_lossless_profile"
-        },
-        "{{ port_names }}|6-7": {
-            "profile" : "egress_lossless_profile"
-        }
+{% for port in port_names_list %}
+                "{{ port }}|3-4": {
+                     "profile" : "[BUFFER_PROFILE|ingress_lossless_profile]"
+                },
+{% endfor %}
+{% for port in port_names_list %}
+                "{{ port }}|0": {
+                    "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+                },
+{% endfor %}
+{% for port in port_names_list %}
+                "{{ port }}|1-2": {
+                    "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+                },
+{% endfor %}
+{% for port in port_names_list %}
+                "{{ port }}|5-7": {
+                    "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+                }{% if not loop.last %},{% endif %}
+
+{% endfor %}
     },
+
     "BUFFER_QUEUE": {
-        "{{ port_names }}|4-5": {
-            "profile" : "ingress_lossy_profile"
+{% for port in port_names_list %}
+        "{{ port }}|3-4": {
+             "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
         },
-        "{{ port_names }}|0-3": {
-            "profile" : "egress_lossy_profile"
+{% endfor %}
+{% for port in port_names_list %}
+        "{{ port }}|0-2": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
         },
-        "{{ port_names }}|6-7": {
-            "profile" : "egress_lossy_profile"
-        }
+{% endfor %}
+{% for port in port_names_list %}
+        "{{ port }}|5-7": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        }{% if not loop.last %},{% endif %}
+
+{% endfor %}
     }
 }

device/celestica/x86_64-cel_midstone-r0/Midstone-200i_128x100/buffers_defaults_def_lossy.j2

@@ -0,0 +1,42 @@
+{% set port_names_list = [] %}
+{% for port in PORT %}
+    {%- if port_names_list.append(port) %}{% endif %}
+{% endfor %}
+{% set port_names = port_names_list | join(',') -%}
+
+{
+    "BUFFER_POOL": {
+        "lossy_pool": {
+            "size": "56985600",
+            "type": "egress",
+            "mode": "dynamic",
+            "xoff": "0"
+        }
+    },
+    "BUFFER_PROFILE": {
+        "ingress_lossy_profile": {
+            "pool":"[BUFFER_POOL|lossy_pool]",
+            "size":"0",
+            "static_th":"9497600"
+        },
+        "egress_lossy_profile": {
+            "pool":"[BUFFER_POOL|lossy_pool]",
+            "size":"1518",
+            "dynamic_th":"2"
+        }
+    },
+    "BUFFER_PG": {
+{% for port in port_names_list %}
+        "{{ port }}|0-7": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        }{% if not loop.last %},{% endif %}
+{% endfor %}
+    },
+    "BUFFER_QUEUE": {
+{% for port in port_names_list %}
+        "{{ port }}|0-7": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        }{% if not loop.last %},{% endif %}
+{% endfor %}
+    }
+}

device/celestica/x86_64-cel_midstone-r0/Midstone-200i_128x100/buffers_defaults_t1.j2

@@ -0,0 +1,161 @@
+{# Default values which will be used if no actual configura available #}
+{% set default_cable = '40m' %}
+
+{# Port configuration to cable length look-up table #}
+{# Each record describes mapping of DUT (DUT port) role and neighbor role to cable length #}
+{# Roles described in the minigraph #}
+{% set ports2cable = {
+        'torrouter_server'       : '5m',
+        'leafrouter_torrouter'   : '40m',
+        'spinerouter_leafrouter' : '300m'
+        }
+%}
+
+{%- macro cable_length(port_name) %}
+    {%- set cable_len = [] %}
+    {%- for local_port in DEVICE_NEIGHBOR %}
+        {%- if local_port == port_name %}
+            {%- 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 %}
+                {%- set roles1 = switch_role + '_' + neighbor_role %}
+                {%- set roles2 = neighbor_role + '_' + switch_role %}
+                {%- set roles1 = roles1 | lower %}
+                {%- set roles2 = roles2 | lower %}
+                {%- if roles1 in ports2cable %}
+                    {%- if cable_len.append(ports2cable[roles1]) %}{% endif %}
+                {%- elif roles2 in ports2cable %}
+                    {%- if cable_len.append(ports2cable[roles2]) %}{% endif %}
+                {%- endif %}
+            {%- endif %}
+        {%- endif %}
+    {%- endfor %}
+    {%- if cable_len -%}
+        {{ cable_len.0 }}
+    {%- else %}
+        {%- if switch_role.lower() == 'torrouter' %}
+            {%- for local_port in VLAN_MEMBER %}
+                {%- if local_port[1] == port_name %}
+                    {%- set roles3 = switch_role + '_' + 'server' %}
+                    {%- set roles3 = roles3 | lower %}
+                    {%- if roles3 in ports2cable %}
+                        {%- if cable_len.append(ports2cable[roles3]) %}{% endif %}
+                    {%- endif %}
+                {%- endif %}
+            {%- endfor %}
+            {%- if cable_len -%}
+                {{ cable_len.0 }}
+            {%- else -%}
+                {{ default_cable }}
+            {%- endif %}
+        {%- else -%}
+            {{ default_cable }}
+        {%- endif %}
+    {%- endif %}
+{%- endmacro %}
+
+{%- if DEVICE_METADATA is defined %}
+{%- set switch_role = DEVICE_METADATA['localhost']['type'] %}
+{%- endif -%}
+
+{% set port_names_list = [] %}
+{% for port in PORT %}
+    {%- if port_names_list.append(port) %}{% endif %}
+{% endfor %}
+{% set port_names = port_names_list | join(',') -%}
+
+{
+    "CABLE_LENGTH": {
+        "AZURE": {
+    {% for port in PORT %}
+        {% set cable = cable_length(port) -%}
+        "{{ port }}": "{{ cable }}"{%- if not loop.last -%},{% endif %}
+
+    {% endfor %}
+    }
+    },
+    "BUFFER_POOL": {
+        "ingress_lossless_pool": {
+            "size": "47218432",
+            "type": "ingress",
+            "mode": "dynamic",
+            "xoff": "17708800"
+        },
+        "lossy_pool": {
+            "size": "18874368",
+            "type": "egress",
+            "mode": "dynamic",
+            "xoff": "0"
+        },
+        "egress_lossless_pool": {
+            "size": "66092800",
+            "type": "egress"
+        }
+    },
+    "BUFFER_PROFILE": {
+        "ingress_lossless_profile": {
+            "pool":"ingress_lossless_pool",
+            "xoff":"38816",
+            "size":"1518",
+            "dynamic_th":"1",
+            "xon_offset":"9408"
+        },
+        "egress_lossless_profile": {
+            "pool":"ingress_lossless_pool",
+            "size":"0",
+            "static_th":"9497600"
+        },
+        "ingress_lossy_profile": {
+            "pool":"lossy_pool",
+            "size":"0",
+            "static_th":"9497600"
+        },
+        "egress_lossy_profile": {
+            "pool":"lossy_pool",
+            "size":"1518",
+            "dynamic_th":"2"
+        }
+    },
+    "BUFFER_PG": {
+{% for port in port_names_list %}
+                "{{ port }}|3-4": {
+                     "profile" : "ingress_lossless_profile"
+                },
+{% endfor %}
+{% for port in port_names_list %}
+                "{{ port }}|0": {
+                    "profile" : "ingress_lossy_profile"
+                },
+{% endfor %}
+{% for port in port_names_list %}
+                "{{ port }}|1-2": {
+                    "profile" : "ingress_lossy_profile"
+                },
+{% endfor %}
+{% for port in port_names_list %}
+                "{{ port }}|5-7": {
+                    "profile" : "ingress_lossy_profile"
+                }{% if not loop.last %},{% endif %}
+
+{% endfor %}
+    },
+
+    "BUFFER_QUEUE": {
+{% for port in port_names_list %}
+        "{{ port }}|3-4": {
+             "profile" : "egress_lossless_profile"
+        },
+{% endfor %}
+{% for port in port_names_list %}
+        "{{ port }}|0-2": {
+            "profile" : "egress_lossy_profile"
+        },
+{% endfor %}
+{% for port in port_names_list %}
+        "{{ port }}|5-7": {
+            "profile" : "egress_lossy_profile"
+        }{% if not loop.last %},{% endif %}
+
+{% endfor %}
+    }
+}

device/celestica/x86_64-cel_midstone-r0/Midstone-200i_128x100/config_128x100G_midstone200i.yaml

@@ -4,12 +4,17 @@ ifcs:
 nodes:
 - node_id: "0"
   options:
+    sd_low_power_mode_global_default: "true"
     sku: "configs/sku/innovium.77700_B"
     netdev:
     - auto_create: "no"
       multi_interface: "yes"
     buffer_management_mode: "api_driven"
+    wred_cr_ip_proto_list: "17"
+    cr_assignment_mode: "1"
     max_lossless_tc: "2"
+    ilpm_enable: "1"
+    forward_profile: "IFCS_FORWARD_PROFILE_ID_PROFILE_E"
     txring:
     - txring_id: "0"
       desc_count: "1024"
@@ -951,20 +956,6 @@ nodes:
     speed: "100G"
     sysport: "3"
     type: "eth"
-  - fec: "NONE"
-    id: "257"
-    lanes: "0:1"
-    serdes_group: "32"
-    speed: "10G"
-    sysport: "257"
-    type: "mgmt 0"
-  - fec: "NONE"
-    id: "258"
-    lanes: "1:1"
-    serdes_group: "32"
-    speed: "10G"
-    sysport: "258"
-    type: "mgmt 1"
   isg:
   - id: "0"
     lane_swap: "01234567"

device/celestica/x86_64-cel_midstone-r0/Midstone-200i_128x100/innovium.77700_B

@@ -5,6 +5,7 @@ device_id:         0x1b58
 # Hardware constraint information
 hardware:
         num_ibs:           6
+        ib_active:         0,1,2,3,4,5
 
         ports_per_ib:      32, 32, 32, 32, 20, 20
         recirc_port_num:   32, 32, 32, 32, 32, 32

device/celestica/x86_64-cel_midstone-r0/Midstone-200i_128x100/ivm.sai.config.yaml

@@ -0,0 +1,8 @@
+IFCS_INIT_FILE : "/usr/share/sonic/hwsku/config_128x100G_midstone200i.yaml"
+IFCS_SKU_FILE : "/usr/share/sonic/hwsku/innovium.77700_B"
+IFCS_INNO_CLI_PORT : "9999"
+IFCS_TARGET : "device"
+INNOVIUM_DIR : "/innovium"
+PYTHONPATH : "$INNOVIUM_DIR:$INNOVIUM_DIR/cmds:$INNOVIUM_DIR/scripts:$INNOVIUM_DIR/test/:$INNOVIUM_DIR/test/utils:$INNOVIUM_DIR/utils:$INNOVIUM_DIR/pyctypes:$INNOVIUM_DIR/ifcs_cmds:$INNOVIUM_DIR/testutil"
+IVM_SAI_DATAPATH_CONFIG_FILE: "/usr/share/sonic/hwsku/ivm.sai.datapath.config.yaml"
+IVM_SAI_PARAM_A0008: "32"

device/celestica/x86_64-cel_midstone-r0/Midstone-200i_128x100/ivm.sai.datapath.config.yaml

@@ -0,0 +1,9 @@
+ISAI_PARAM_P0_0_LS : "4608 4608 4608 4608 2880 2880"
+ISAI_PARAM_P0_1_LS : "2226 1946 1946 1890 1218 1218"
+ISAI_PARAM_P0_1_ALS : "434 154 154 98 98 98"
+ISAI_PARAM_P1_0_LS : "1536 1536 1536 1536 960 960"
+ISAI_PARAM_P1_0_LL : "3072 3072 3072 3072 1920 1920"
+ISAI_PARAM_P1_1_LS : "1778 1498 1498 1442 938 938"
+ISAI_PARAM_P1_1_LL : "2478 2478 2478 2478 2478 2478"
+ISAI_PARAM_P1_1_ALS : "434 154 154 98 98 98"
+ISAI_PARAM_P1_1_ALL : "126 126 126 126 126 126"

device/celestica/x86_64-cel_midstone-r0/Midstone-200i_128x100/pg_profile_lookup.ini

@@ -0,0 +1,22 @@
+# PG lossless profiles.
+# speed   cable size  xon  xoff  threshold xon_offset
+  25000   5m    1518  0    15680   1       9408
+  50000   5m    1518  0    21248   1       9408
+  100000  5m    1518  0    34624   1       9408
+  200000  5m    1518  0    62368   1       9408
+  400000  5m    1518  0    117536  1       9408
+  25000   40m   1518  0    16928   1       9408
+  50000   40m   1518  0    23392   1       9408
+  100000  40m   1518  0    38816   1       9408
+  200000  40m   1518  0    71904   1       9408
+  400000  40m   1518  0    135520  1       9408
+  25000   100m  1518  0    18848   1       9408
+  50000   100m  1518  0    27264   1       9408
+  100000  100m  1518  0    46496   1       9408
+  200000  100m  1518  0    87168   1       9408
+  400000  100m  1518  0    166688  1       9408
+  25000   300m  1518  0    25184   1       9408
+  50000   300m  1518  0    40128   1       9408
+  100000  300m  1518  0    72384   1       9408
+  200000  300m  1518  0    138112  1       9408
+  400000  300m  1518  0    268640  1       9408

device/celestica/x86_64-cel_midstone-r0/Midstone-200i_128x100/port_config.ini

@@ -1,131 +1,129 @@
-# name              lanes           speed       index   mtu  
-Ethernet0           249,250         100000      0       9126
-Ethernet2           251,252         100000      0       9126
-Ethernet4           253,254         100000      1       9126
-Ethernet6           255,256         100000      1       9126
-Ethernet8           245,246         100000      2       9126
-Ethernet10          247,248         100000      2       9126
-Ethernet12          241,242         100000      3       9126
-Ethernet14          243,244         100000      3       9126
-Ethernet16          233,234         100000      4       9126
-Ethernet18          235,236         100000      4       9126
-Ethernet20          237,238         100000      5       9126
-Ethernet22          239,240         100000      5       9126
-Ethernet24          229,230         100000      6       9126
-Ethernet26          231,232         100000      6       9126
-Ethernet28          225,226         100000      7       9126
-Ethernet30          227,228         100000      7       9126
-Ethernet32          217,218         100000      8       9126
-Ethernet34          219,220         100000      8       9126
-Ethernet36          221,222         100000      9       9126
-Ethernet38          223,224         100000      9       9126
-Ethernet40          213,214         100000      10      9126
-Ethernet42          215,216         100000      10      9126
-Ethernet44          209,210         100000      11      9126
-Ethernet46          211,212         100000      11      9126
-Ethernet48          201,202         100000      12      9126
-Ethernet50          203,204         100000      12      9126
-Ethernet52          205,206         100000      13      9126
-Ethernet54          207,208         100000      13      9126
-Ethernet56          197,198         100000      14      9126
-Ethernet58          199,200         100000      14      9126
-Ethernet60          193,194         100000      15      9126
-Ethernet62          195,196         100000      15      9126
-Ethernet64          185,186         100000      16      9126
-Ethernet66          187,188         100000      16      9126
-Ethernet68          189,190         100000      17      9126
-Ethernet70          191,192         100000      17      9126
-Ethernet72          181,182         100000      18      9126
-Ethernet74          183,184         100000      18      9126
-Ethernet76          177,178         100000      19      9126
-Ethernet78          179,180         100000      19      9126
-Ethernet80          169,170         100000      20      9126
-Ethernet82          171,172         100000      20      9126
-Ethernet84          173,174         100000      21      9126
-Ethernet86          175,176         100000      21      9126
-Ethernet88          165,166         100000      22      9126
-Ethernet90          167,168         100000      22      9126
-Ethernet92          161,162         100000      23      9126
-Ethernet94          163,164         100000      23      9126
-Ethernet96          153,154         100000      24      9126
-Ethernet98          155,156         100000      24      9126
-Ethernet100         157,158         100000      25      9126
-Ethernet102         159,160         100000      25      9126
-Ethernet104         149,150         100000      26      9126
-Ethernet106         151,152         100000      26      9126
-Ethernet108         145,146         100000      27      9126
-Ethernet110         147,148         100000      27      9126
-Ethernet112         137,138         100000      28      9126
-Ethernet114         139,140         100000      28      9126
-Ethernet116         141,142         100000      29      9126
-Ethernet118         143,144         100000      29      9126
-Ethernet120         133,134         100000      30      9126
-Ethernet122         135,136         100000      30      9126
-Ethernet124         129,130         100000      31      9126
-Ethernet126         131,132         100000      31      9126
-Ethernet128         121,122         100000      32      9126
-Ethernet130         123,124         100000      32      9126
-Ethernet132         125,126         100000      33      9126
-Ethernet134         127,128         100000      33      9126
-Ethernet136         117,118         100000      34      9126
-Ethernet138         119,120         100000      34      9126
-Ethernet140         113,114         100000      35      9126
-Ethernet142         115,116         100000      35      9126
-Ethernet144         105,106         100000      36      9126
-Ethernet146         107,108         100000      36      9126
-Ethernet148         109,110         100000      37      9126
-Ethernet150         111,112         100000      37      9126
-Ethernet152         101,102         100000      38      9126
-Ethernet154         103,104         100000      38      9126
-Ethernet156         97,98           100000      39      9126
-Ethernet158         99,100          100000      39      9126
-Ethernet160         89,90           100000      40      9126
-Ethernet162         91,92           100000      40      9126
-Ethernet164         93,94           100000      41      9126
-Ethernet166         95,96           100000      41      9126
-Ethernet168         85,86           100000      42      9126
-Ethernet170         87,88           100000      42      9126
-Ethernet172         81,82           100000      43      9126
-Ethernet174         83,84           100000      43      9126
-Ethernet176         73,74           100000      44      9126
-Ethernet178         75,76           100000      44      9126
-Ethernet180         77,78           100000      45      9126
-Ethernet182         79,80           100000      45      9126
-Ethernet184         69,70           100000      46      9126
-Ethernet186         71,72           100000      46      9126
-Ethernet188         65,66           100000      47      9126
-Ethernet190         67,68           100000      47      9126
-Ethernet192         57,58           100000      48      9126
-Ethernet194         59,60           100000      48      9126
-Ethernet196         61,62           100000      49      9126
-Ethernet198         63,64           100000      49      9126
-Ethernet200         53,54           100000      50      9126
-Ethernet202         55,56           100000      50      9126
-Ethernet204         49,50           100000      51      9126
-Ethernet206         51,52           100000      51      9126
-Ethernet208         41,42           100000      52      9126
-Ethernet210         43,44           100000      52      9126
-Ethernet212         45,46           100000      53      9126
-Ethernet214         47,48           100000      53      9126
-Ethernet216         37,38           100000      54      9126
-Ethernet218         39,40           100000      54      9126
-Ethernet220         33,34           100000      55      9126
-Ethernet222         35,36           100000      55      9126
-Ethernet224         25,26           100000      56      9126
-Ethernet226         27,28           100000      56      9126
-Ethernet228         29,30           100000      57      9126
-Ethernet230         31,32           100000      57      9126
-Ethernet232         21,22           100000      58      9126
-Ethernet234         23,24           100000      58      9126
-Ethernet236         17,18           100000      59      9126
-Ethernet238         19,20           100000      59      9126
-Ethernet240         9,10            100000      60      9126
-Ethernet242         11,12           100000      60      9126
-Ethernet244         13,14           100000      61      9126
-Ethernet246         15,16           100000      61      9126
-Ethernet248         5,6             100000      62      9126
-Ethernet250         7,8             100000      62      9126
-Ethernet252         1,2             100000      63      9126
-Ethernet254         3,4             100000      63      9126
-Ethernet256         257              10000      64      9126
-Ethernet257         258              10000      65      9126
+# name              lanes       alias       speed       index   mtu  
+Ethernet0           249,250     Eth1/1      100000      0       9126
+Ethernet2           251,252     Eth1/2      100000      0       9126
+Ethernet4           253,254     Eth2/1      100000      1       9126
+Ethernet6           255,256     Eth2/2      100000      1       9126
+Ethernet8           245,246     Eth3/1      100000      2       9126
+Ethernet10          247,248     Eth3/2      100000      2       9126
+Ethernet12          241,242     Eth4/1      100000      3       9126
+Ethernet14          243,244     Eth4/2      100000      3       9126
+Ethernet16          233,234     Eth5/1      100000      4       9126
+Ethernet18          235,236     Eth5/2      100000      4       9126
+Ethernet20          237,238     Eth6/1      100000      5       9126
+Ethernet22          239,240     Eth6/2      100000      5       9126
+Ethernet24          229,230     Eth7/1      100000      6       9126
+Ethernet26          231,232     Eth7/2      100000      6       9126
+Ethernet28          225,226     Eth8/1      100000      7       9126
+Ethernet30          227,228     Eth8/2      100000      7       9126
+Ethernet32          217,218     Eth9/1      100000      8       9126
+Ethernet34          219,220     Eth9/2      100000      8       9126
+Ethernet36          221,222     Eth10/1     100000      9       9126
+Ethernet38          223,224     Eth10/2     100000      9       9126
+Ethernet40          213,214     Eth11/1     100000      10      9126
+Ethernet42          215,216     Eth11/2     100000      10      9126
+Ethernet44          209,210     Eth12/1     100000      11      9126
+Ethernet46          211,212     Eth12/2     100000      11      9126
+Ethernet48          201,202     Eth13/1     100000      12      9126
+Ethernet50          203,204     Eth13/2     100000      12      9126
+Ethernet52          205,206     Eth14/1     100000      13      9126
+Ethernet54          207,208     Eth14/2     100000      13      9126
+Ethernet56          197,198     Eth15/1     100000      14      9126
+Ethernet58          199,200     Eth15/2     100000      14      9126
+Ethernet60          193,194     Eth16/1     100000      15      9126
+Ethernet62          195,196     Eth16/2     100000      15      9126
+Ethernet64          185,186     Eth17/1     100000      16      9126
+Ethernet66          187,188     Eth17/2     100000      16      9126
+Ethernet68          189,190     Eth18/1     100000      17      9126
+Ethernet70          191,192     Eth18/2     100000      17      9126
+Ethernet72          181,182     Eth19/1     100000      18      9126
+Ethernet74          183,184     Eth19/2     100000      18      9126
+Ethernet76          177,178     Eth20/1     100000      19      9126
+Ethernet78          179,180     Eth20/2     100000      19      9126
+Ethernet80          169,170     Eth21/1     100000      20      9126
+Ethernet82          171,172     Eth21/2     100000      20      9126
+Ethernet84          173,174     Eth22/1     100000      21      9126
+Ethernet86          175,176     Eth22/2     100000      21      9126
+Ethernet88          165,166     Eth23/1     100000      22      9126
+Ethernet90          167,168     Eth23/2     100000      22      9126
+Ethernet92          161,162     Eth24/1     100000      23      9126
+Ethernet94          163,164     Eth24/2     100000      23      9126
+Ethernet96          153,154     Eth25/1     100000      24      9126
+Ethernet98          155,156     Eth25/2     100000      24      9126
+Ethernet100         157,158     Eth26/1     100000      25      9126
+Ethernet102         159,160     Eth26/2     100000      25      9126
+Ethernet104         149,150     Eth27/1     100000      26      9126
+Ethernet106         151,152     Eth27/2     100000      26      9126
+Ethernet108         145,146     Eth28/1     100000      27      9126
+Ethernet110         147,148     Eth28/2     100000      27      9126
+Ethernet112         137,138     Eth29/1     100000      28      9126
+Ethernet114         139,140     Eth29/2     100000      28      9126
+Ethernet116         141,142     Eth30/1     100000      29      9126
+Ethernet118         143,144     Eth30/2     100000      29      9126
+Ethernet120         133,134     Eth31/1     100000      30      9126
+Ethernet122         135,136     Eth31/2     100000      30      9126
+Ethernet124         129,130     Eth32/1     100000      31      9126
+Ethernet126         131,132     Eth32/2     100000      31      9126
+Ethernet128         121,122     Eth33/1     100000      32      9126
+Ethernet130         123,124     Eth33/2     100000      32      9126
+Ethernet132         125,126     Eth34/1     100000      33      9126
+Ethernet134         127,128     Eth34/2     100000      33      9126
+Ethernet136         117,118     Eth35/1     100000      34      9126
+Ethernet138         119,120     Eth35/2     100000      34      9126
+Ethernet140         113,114     Eth36/1     100000      35      9126
+Ethernet142         115,116     Eth36/2     100000      35      9126
+Ethernet144         105,106     Eth37/1     100000      36      9126
+Ethernet146         107,108     Eth37/2     100000      36      9126
+Ethernet148         109,110     Eth38/1     100000      37      9126
+Ethernet150         111,112     Eth38/2     100000      37      9126
+Ethernet152         101,102     Eth39/1     100000      38      9126
+Ethernet154         103,104     Eth39/2     100000      38      9126
+Ethernet156         97,98       Eth40/1     100000      39      9126
+Ethernet158         99,100      Eth40/2     100000      39      9126
+Ethernet160         89,90       Eth41/1     100000      40      9126
+Ethernet162         91,92       Eth41/2     100000      40      9126
+Ethernet164         93,94       Eth42/1     100000      41      9126
+Ethernet166         95,96       Eth42/2     100000      41      9126
+Ethernet168         85,86       Eth43/1     100000      42      9126
+Ethernet170         87,88       Eth43/2     100000      42      9126
+Ethernet172         81,82       Eth44/1     100000      43      9126
+Ethernet174         83,84       Eth44/2     100000      43      9126
+Ethernet176         73,74       Eth45/1     100000      44      9126
+Ethernet178         75,76       Eth45/2     100000      44      9126
+Ethernet180         77,78       Eth46/1     100000      45      9126
+Ethernet182         79,80       Eth46/2     100000      45      9126
+Ethernet184         69,70       Eth47/1     100000      46      9126
+Ethernet186         71,72       Eth47/2     100000      46      9126
+Ethernet188         65,66       Eth48/1     100000      47      9126
+Ethernet190         67,68       Eth48/2     100000      47      9126
+Ethernet192         57,58       Eth49/1     100000      48      9126
+Ethernet194         59,60       Eth49/2     100000      48      9126
+Ethernet196         61,62       Eth50/1     100000      49      9126
+Ethernet198         63,64       Eth50/2     100000      49      9126
+Ethernet200         53,54       Eth51/1     100000      50      9126
+Ethernet202         55,56       Eth51/2     100000      50      9126
+Ethernet204         49,50       Eth52/1     100000      51      9126
+Ethernet206         51,52       Eth52/2     100000      51      9126
+Ethernet208         41,42       Eth53/1     100000      52      9126
+Ethernet210         43,44       Eth53/2     100000      52      9126
+Ethernet212         45,46       Eth54/1     100000      53      9126
+Ethernet214         47,48       Eth54/2     100000      53      9126
+Ethernet216         37,38       Eth55/1     100000      54      9126
+Ethernet218         39,40       Eth55/2     100000      54      9126
+Ethernet220         33,34       Eth56/1     100000      55      9126
+Ethernet222         35,36       Eth56/2     100000      55      9126
+Ethernet224         25,26       Eth57/1     100000      56      9126
+Ethernet226         27,28       Eth57/2     100000      56      9126
+Ethernet228         29,30       Eth58/1     100000      57      9126
+Ethernet230         31,32       Eth58/2     100000      57      9126
+Ethernet232         21,22       Eth59/1     100000      58      9126
+Ethernet234         23,24       Eth59/2     100000      58      9126
+Ethernet236         17,18       Eth60/1     100000      59      9126
+Ethernet238         19,20       Eth60/2     100000      59      9126
+Ethernet240         9,10        Eth61/1     100000      60      9126
+Ethernet242         11,12       Eth61/2     100000      60      9126
+Ethernet244         13,14       Eth62/1     100000      61      9126
+Ethernet246         15,16       Eth62/2     100000      61      9126
+Ethernet248         5,6         Eth63/1     100000      62      9126
+Ethernet250         7,8         Eth63/2     100000      62      9126
+Ethernet252         1,2         Eth64/1     100000      63      9126
+Ethernet254         3,4         Eth64/2     100000      63      9126