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

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

.artifactignore

@@ -0,0 +1,5 @@
+**/*
+!target/*.bin
+!target/*.log
+!target/*.img.gz
+!target/docker-sonic-vs.gz

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

@@ -0,0 +1,127 @@
+# Starter pipeline
+# Start with a minimal pipeline that you can customize to build and deploy your code.
+# Add steps that build, run tests, deploy, and more:
+# https://aka.ms/yaml
+
+trigger: none
+pr: none
+
+schedules:
+- cron: "0 0 * * *"
+  displayName: Daily Build
+  branches:
+    include:
+    - 202012
+  always: true
+
+pool: sonicbld
+
+stages:
+- stage: Build
+  variables:
+    CACHE_MODE: none
+    VERSION_CONTROL_OPTIONS: 'SONIC_VERSION_CONTROL_COMPONENTS='
+  jobs:
+  - template: azure-pipelines-build.yml
+    parameters:
+      buildOptions: '${{ variables.VERSION_CONTROL_OPTIONS }} SONIC_BUILD_JOBS=$(nproc) ENABLE_IMAGE_SIGNATURE=y'
+      preSteps:
+      - script: |
+          containers=$(docker container ls | grep "sonic-slave" | awk '{ print $1 }')
+          if [ ! -z "$containers" ]; then
+            docker container kill $containers || true
+            sleep 5
+          fi
+          images=$(docker images 'sonic-slave-*' -a -q)
+          if [ ! -z "$images" ]; then
+            docker rmi -f $images
+          fi
+        displayName: 'Cleanup sonic slave'
+- stage: UpgradeVersions
+  jobs:
+  - job: UpgradeVersions
+    pool:
+      vmImage: 'ubuntu-20.04'
+    steps:
+    - script: |
+        if [ -z "$(which gh)" ]; then
+          sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-key C99B11DEB97541F0
+          sudo apt-add-repository https://cli.github.com/packages
+          sudo apt update
+          sudo apt install gh
+        fi
+      displayName: 'Install gh'
+    - checkout: self
+      displayName: 'Checkout code'
+    - download: current
+      patterns: '**/versions-*'
+    - script: |
+        mkdir -p target
+        default_platform=broadcom
+        artifacts=$(find $(Pipeline.Workspace) -maxdepth 1 -type d -name 'sonic-buildimage.*' | grep -v "sonic-buildimage.${default_platform}")
+        echo "artifacts$artifacts"
+        cp -r $(Pipeline.Workspace)/sonic-buildimage.${default_platform}/versions target/
+        make freeze FREEZE_VERSION_OPTIONS=-r
+        find files/build/versions 
+        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/
+          OPTIONS="-a -d"
+          [[ "$artifact" == *arm64* || "$artifact" == *armhf* ]] && OPTIONS="-d"
+          make freeze FREEZE_VERSION_OPTIONS="$OPTIONS"
+        done
+        git diff files/build/versions
+      displayName: 'Freeze Versions'
+    - script: |
+        if [ -z "$GIT_USER" ]; then
+          echo "Skipped to send the pull request, GIT_USER not set."
+          exit 0
+        fi
+        GIT_STATUS=$(git status  --porcelain files/build/versions)
+        if [ -z "$GIT_STATUS" ]; then
+          echo "Skipped to send the pull request, no version change in files/build/versions"
+          exit 0
+        fi
+        if [ ! -d "$HOME" ]; then
+          sudo mkdir -p $HOME
+          sudo chown -R $(id -un):$(id -gn) $HOME
+        fi
+        SOURCE_BRANCH=$(Build.SourceBranch)
+        REPO_NAME=$(Build.Repository.Name)
+        [ -z "$GIT_REPO" ] && GIT_REPO=${REPO_NAME#*/}
+        BRANCH_NAME=repd/versions/${SOURCE_BRANCH#refs/heads/}
+        echo '#!/bin/bash' > git_env_password.sh
+        echo 'echo $GIT_PASSWORD' >> git_env_password.sh
+        chmod a+x git_env_password.sh
+        export GIT_ASKPASS=./git_env_password.sh
+
+        git config user.name $GIT_USER
+        git config credential.https://github.com.username $GIT_USER
+        git add files/build/versions
+        git commit -m "[ci/build]: Upgrade SONiC package versions"
+        git checkout -b $BRANCH_NAME
+        git remote add remote https://github.com/$GIT_USER/$GIT_REPO
+        git push remote HEAD:refs/heads/$BRANCH_NAME -f
+        git branch -u remote/$BRANCH_NAME
+
+        echo $GIT_PASSWORD | gh auth login --with-token
+        TITLE="Upgrade SONiC Versions"
+        BODY="Upgrade SONiC Versions"
+        RET=0
+        if ! gh pr create -t "$TITLE" -b "$BODY" -B $(Build.SourceBranch) -R $(Build.Repository.Name) > pr.log 2>&1; then
+          if ! grep -q "already exists" pr.log; then
+            RET=1
+          fi
+        fi
+        cat pr.log
+        exit $RET
+      env:
+        GIT_USER: $(GIT_USER)
+        GIT_PASSWORD: $(GIT_PASSWORD)
+      displayName: 'Send Pull Request'
+    - publish: $(System.DefaultWorkingDirectory)/files/build/versions
+      artifact: 'sonic-buildimage.versions'
+      displayName: 'Archive SONiC versions'
+    

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

@@ -0,0 +1,110 @@
+# The azure pipeline template for Official build, and upgrade version build
+
+parameters:
+- name: 'jobFilters'
+  type: object
+  default: ''
+- name: 'buildOptions'
+  type: string
+  default: 'SONIC_CONFIG_BUILD_JOBS=1'
+- name: 'preSteps'
+  type: stepList
+  default: []
+- name: 'postSteps'
+  type: stepList
+  default: []
+- name: 'jobGroups'
+  type: object
+  default: ''
+
+jobs:
+- template: azure-pipelines-image-template.yml
+  parameters:
+    jobFilters: ${{ parameters.jobFilters }}
+    preSteps: ${{ parameters.preSteps }}
+    postSteps: ${{ parameters.postSteps }}
+    jobVariables:
+      PLATFORM_AZP: $(GROUP_NAME)
+      PLATFORM_ARCH: amd64
+      BUILD_NUMBER: $(Build.BuildId)
+      BUILD_OPTIONS: ${{ parameters.buildOptions }}
+      DOCKER_DATA_ROOT_FOR_MULTIARCH: /data/march/docker
+      dbg_image: no
+      swi_image: no
+      raw_image: no
+      sync_rpc_image: no
+      platform_rpc: no
+    ${{ if ne(parameters.jobGroups, '') }}:
+      jobGroups: ${{ parameters.jobGroups }}
+    ${{ if eq(parameters.jobGroups, '') }}:
+      jobGroups:
+        - name: vs
+          variables:
+            dbg_image: yes
+        - name: barefoot
+          variables:
+            swi_image: yes
+        - name: broadcom
+          variables:
+            dbg_image: yes
+            swi_image: yes
+            raw_image: yes
+            sync_rpc_image: yes
+            platform_rpc: brcm
+        - name: centec
+          variables:
+            dbg_image: yes
+            sync_rpc_image: yes
+            platform_rpc: centec
+        - name: centec-arm64
+          pool: sonicbld_8c
+          timeoutInMinutes: 1800
+          variables:
+            PLATFORM_ARCH: arm64
+        - name: generic
+          variables:
+            dbg_image: yes
+        - name: innovium
+          variables:
+            dbg_image: yes
+
+        - name: marvell-armhf
+          pool: sonicbld_8c
+          timeoutInMinutes: 1800
+          variables:
+            PLATFORM_ARCH: armhf
+        - name: mellanox
+          variables:
+            dbg_image: yes
+            sync_rpc_image: yes
+            platform_rpc: mlnx
+        - name: nephos
+          variables:
+            dbg_image: yes
+            sync_rpc_image: yes
+            platform_rpc: nephos
+    buildSteps:
+      - bash: |
+          if [ $(GROUP_NAME) == vs ]; then
+            if [ $(dbg_image) == yes ]; then
+              make $BUILD_OPTIONS INSTALL_DEBUG_TOOLS=y target/sonic-vs.img.gz
+              mv target/sonic-vs.img.gz target/sonic-vs-dbg.img.gz
+            fi
+            make $BUILD_OPTIONS target/docker-sonic-vs.gz target/sonic-vs.img.gz
+          else
+            if [ $(dbg_image) == yes ]; then
+              make  $BUILD_OPTIONS INSTALL_DEBUG_TOOLS=y target/sonic-$(GROUP_NAME).bin
+              mv target/sonic-$(GROUP_NAME).bin target/sonic-$(GROUP_NAME)-dbg.bin
+            fi
+            if [ $(swi_image) == yes ]; then
+              make $BUILD_OPTIONS ENABLE_IMAGE_SIGNATURE=y target/sonic-aboot-$(GROUP_NAME).swi
+            fi
+            if [ $(raw_image) == yes ]; then
+              make $BUILD_OPTIONS target/sonic-$(GROUP_NAME).raw
+            fi
+            if [ $(sync_rpc_image) == yes ]; then
+              make $BUILD_OPTIONS ENABLE_SYNCD_RPC=y target/docker-syncd-$(platform_rpc)-rpc.gz
+            fi
+            make $BUILD_OPTIONS target/sonic-$(GROUP_NAME).bin
+          fi
+        displayName: "Build sonic image"

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

@@ -0,0 +1,58 @@
+# The azure pipeline template for PR build, Official build, and upgrade version build
+
+parameters:
+- name: 'jobFilters'
+  type: object
+  default: ''
+- name: 'preSteps'
+  type: stepList
+  default: []
+- name: 'buildSteps'
+  type: stepList
+  default: []
+- name: 'postSteps'
+  type: stepList
+  default: []
+- name: jobGroups
+  type: object
+  default: []
+- name: jobVariables
+  type: object
+  default: []
+jobs:
+- template: azure-pipelines-job-groups.yml
+  parameters:
+    jobFilters: ${{ parameters.jobFilters }}
+    jobVariables: ${{ parameters.jobVariables }}
+    preSteps:
+      - template: cleanup.yml
+      - ${{ parameters. preSteps }}
+      - script: |
+          if [ -n "$(CACHE_MODE)" ] && echo $(PLATFORM_AZP) | grep -E -q "^(vs|broadcom|mellanox)$"; then
+            CACHE_OPTIONS="SONIC_DPKG_CACHE_METHOD=$(CACHE_MODE) SONIC_DPKG_CACHE_SOURCE=/nfs/dpkg_cache/$(PLATFORM_AZP)"
+            BUILD_OPTIONS="$(BUILD_OPTIONS) $CACHE_OPTIONS"
+            echo "##vso[task.setvariable variable=BUILD_OPTIONS]$BUILD_OPTIONS"
+          fi
+        displayName: "Set cache options"
+      - checkout: self
+        submodules: recursive
+        displayName: 'Checkout code'
+      - script: |
+          BRANCH_NAME=$(Build.SourceBranchName)
+          [ -n "$SYSTEM_PULLREQUEST_PULLREQUESTID" ] && BRANCH_NAME="$SYSTEM_PULLREQUEST_TARGETBRANCH-$SYSTEM_PULLREQUEST_PULLREQUESTNUMBER"
+          git checkout -b $BRANCH_NAME
+          sudo modprobe overlay
+          sudo apt-get install -y acl
+          sudo bash -c "echo 1 > /proc/sys/vm/compact_memory"
+          ENABLE_DOCKER_BASE_PULL=y make PLATFORM=$(PLATFORM_AZP) PLATFORM_ARCH=$(PLATFORM_ARCH) configure
+        displayName: 'Make configure'
+    postSteps:
+      - script: cp target -r $(Build.ArtifactStagingDirectory)/
+        displayName: Copy Artifacts
+      - publish:  $(Build.ArtifactStagingDirectory)
+        artifact: 'sonic-buildimage.$(GROUP_NAME)$(GROUP_EXTNAME)'
+        displayName: "Archive sonic image"
+      - ${{ parameters.postSteps }}
+      - template: cleanup.yml
+    jobGroups: ${{ parameters.jobGroups }}
+    buildSteps: ${{ parameters.buildSteps }}

.azure-pipelines/azure-pipelines-job-groups.yml

@@ -0,0 +1,57 @@
+parameters:
+- name: 'preSteps'
+  type: stepList
+  default: []
+- name: 'buildSteps'
+  type: stepList
+  default: []
+- name: "postSteps"
+  type: stepList
+  default: []
+- name: 'jobGroups'
+  type: object
+  default: []
+- name: 'jobVariables'
+  type: object
+  default: {}
+- name: 'scriptEnv'
+  type: object
+  default: ''
+- name: 'timeoutInMinutes'
+  type: 'number'
+  default: 600
+- name: 'jobFilters'
+  type: object
+  default: ''
+
+jobs:
+- ${{ each jobGroup in parameters.jobGroups }}:
+  - ${{ if or(eq(parameters.jobFilters, ''), containsValue(parameters.jobFilters, jobGroup.name), endswith(variables['Build.DefinitionName'], format('.{0}{1}', jobGroup.name, jobGroup.extName))) }}:
+    - job: ${{ replace(format('{0}{1}', jobGroup.name, jobGroup.extName), '-', '_') }}
+      ${{ each pair in jobGroup }}:
+        ${{ if not(in(pair.key, 'job', 'name', 'extName', 'variables', 'steps', 'script', 'scriptEnv')) }}:
+          ${{ pair.key }}: ${{ pair.value }}
+      ${{ if eq(jobGroup.timeoutInMinutes, '') }}:
+        timeoutInMinutes: ${{ parameters.timeoutInMinutes }}
+      variables:
+        GROUP_NAME: ${{ jobGroup.name }}
+        GROUP_EXTNAME: '${{ jobGroup.extName }}'
+        GROUP_NAMES: ${{ join(',', parameters.jobGroups.*.name ) }}
+        ${{ if ne(jobGroup.variables, '') }}:
+          ${{ jobGroup.variables }}
+        ${{ each para in parameters.jobvariables }}:
+          ${{ if eq(jobGroup.variables[para.key], '') }}:
+            ${{ para.key }}: ${{ para.value }}
+      steps:
+      - ${{ parameters.preSteps }}
+      - ${{ if ne(jobGroup.script, '') }}:
+        - script: |
+            ${{ jobGroup.script }}
+          env:
+            ${{ if ne(parameters.scriptEnv, '') }}:
+              ${{ parameters.scriptEnv }}
+          displayName: 'JobScript'
+      - ${{ if ne(jobGroup.steps, '') }}:
+        - ${{ jobGroup.steps }}
+      - ${{ parameters.buildSteps }}
+      - ${{ parameters.postSteps }}

.azure-pipelines/cleanup.yml

@@ -0,0 +1,14 @@
+steps:
+- script: |
+    if sudo [ -f /var/run/march/docker.pid ] ; then
+        pid=`sudo cat /var/run/march/docker.pid` ; sudo kill $pid
+    fi
+    sudo rm -f /var/run/march/docker.pid
+    sudo rm -rf /data/march/docker
+
+    # clean native docker build
+    if sudo [ -f dockerfs/var/run/docker.pid ] ; then
+        pid=`sudo cat dockerfs/var/run/docker.pid` ; sudo kill $pid
+    fi
+    sudo rm -rf $(ls -A1)
+  displayName: "Clean Workspace"

.azure-pipelines/official-build.yml

@@ -0,0 +1,46 @@
+# Starter pipeline
+# Start with a minimal pipeline that you can customize to build and deploy your code.
+# Add steps that build, run tests, deploy, and more:
+# https://aka.ms/yaml
+
+schedules:
+- cron: "0 8 * * *"
+  displayName: Daily midnight build
+  branches:
+    include:
+    - master
+    - 202012
+  always: true
+- cron: "0 4 * * *"
+  displayName: nightly build for release
+  branches:
+    include:
+    - 201911
+    - 201811
+
+trigger: none
+pr: none
+
+stages:
+- stage: Build
+  pool: sonicbld
+  variables:
+    CACHE_MODE: wcache
+    ${{ if eq(variables['Build.SourceBranchName'], '202012') }}:
+      VERSION_CONTROL_OPTIONS: 'SONIC_VERSION_CONTROL_COMPONENTS=deb,py2,py3,web'
+  jobs:
+  - template: azure-pipelines-build.yml
+    parameters:
+      buildOptions: 'USERNAME=admin SONIC_BUILD_JOBS=$(nproc) ${{ variables.VERSION_CONTROL_OPTIONS }}'
+      jobFilters: none
+      jobGroups:
+        - name: vs
+        - name: broadcom
+          variables:
+            swi_image: yes
+        - name: innovium
+        - name: mellanox
+          variables:
+            sync_rpc_image: yes
+            platform_rpc: mlnx
+        - name: nephos

.azure-pipelines/run-test-template.yml

@@ -0,0 +1,84 @@
+parameters:
+- name: dut
+  type: string
+- name: tbname
+  type: string
+- name: tbtype
+  type: string
+- name: ptf_name
+  type: string
+
+steps:
+- checkout: self
+  clean: true
+  displayName: 'checkout sonic-mgmt repo'
+
+- task: DownloadPipelineArtifact@2
+  inputs:
+    artifact: sonic-buildimage.vs
+  displayName: "Download sonic-buildimage.vs artifact"
+
+- script: |
+    set -x
+    sudo mkdir -p /data/sonic-vm/images
+    sudo cp -v ../target/sonic-vs.img.gz /data/sonic-vm/images/sonic-vs.img.gz
+    sudo gzip -fd /data/sonic-vm/images/sonic-vs.img.gz
+    username=$(id -un)
+    sudo chown -R $username.$username /data/sonic-vm
+
+    pushd /data/sonic-mgmt
+    git remote update
+    git reset --hard origin/master
+    sed -i s/use_own_value/${username}/ ansible/veos_vtb
+    echo aaa > ansible/password.txt
+    docker exec sonic-mgmt bash -c "pushd /data/sonic-mgmt/ansible;./testbed-cli.sh -d /data/sonic-vm -m $(inventory) -t $(testbed_file) -k ceos refresh-dut ${{ parameters.tbname }} password.txt" && sleep 180
+  displayName: "Setup testbed"
+
+- script: |
+    rm -rf $(Build.ArtifactStagingDirectory)/*
+    docker exec sonic-mgmt bash -c "/data/sonic-mgmt/tests/kvmtest.sh -en -T ${{ parameters.tbtype }} ${{ parameters.tbname }} ${{ parameters.dut }}"
+  displayName: "Run tests"
+
+- script: |
+    # save dut state if test fails
+    virsh_version=$(virsh --version)
+    if [ $virsh_version == "6.0.0" ]; then
+        mkdir -p $(Build.ArtifactStagingDirectory)/kvmdump
+        virsh -c qemu:///system list
+        virsh -c qemu:///system save ${{ parameters.dut }} $(Build.ArtifactStagingDirectory)/kvmdump/${{ parameters.dut }}.memdmp
+        virsh -c qemu:///system dumpxml ${{ parameters.dut }} > $(Build.ArtifactStagingDirectory)/kvmdump/${{ parameters.dut }}.xml
+        img=$(virsh -c qemu:///system domblklist ${{ parameters.dut }} | grep vda | awk '{print $2}')
+        cp $img $(Build.ArtifactStagingDirectory)/kvmdump/${{ parameters.dut }}.img
+        gzip $(Build.ArtifactStagingDirectory)/kvmdump/${{ parameters.dut }}.img
+        sudo gzip $(Build.ArtifactStagingDirectory)/kvmdump/${{ parameters.dut }}.memdmp
+        virsh -c qemu:///system undefine ${{ parameters.dut }}
+    fi
+
+    docker commit ${{ parameters.ptf_name }} docker-ptf:$(Build.BuildNumber)
+    docker save docker-ptf:$(Build.BuildNumber) | gzip -c > $(Build.ArtifactStagingDirectory)/kvmdump/docker-ptf-dump.gz
+    docker rmi docker-ptf:$(Build.BuildNumber)
+  displayName: "Collect kvmdump"
+  condition: failed()
+
+- script: |
+    cp -r /data/sonic-mgmt/tests/logs $(Build.ArtifactStagingDirectory)/
+    username=$(id -un)
+    sudo chown -R $username.$username $(Build.ArtifactStagingDirectory)
+  displayName: "Collect test logs"
+  condition: succeededOrFailed()
+
+- publish: $(Build.ArtifactStagingDirectory)/kvmdump
+  artifact: sonic-buildimage.kvmtest.${{ parameters.tbtype}}.memdump@$(System.JobAttempt)
+  displayName: "Archive sonic kvm memdump"
+  condition: failed()
+
+- publish: $(Build.ArtifactStagingDirectory)/logs
+  artifact: sonic-buildimage.kvmtest.${{ parameters.tbtype }}.log@$(System.JobAttempt)
+  displayName: "Archive sonic kvm logs"
+  condition: succeededOrFailed()
+
+- task: PublishTestResults@2
+  inputs:
+    testResultsFiles: '$(Build.ArtifactStagingDirectory)/logs/**/*.xml'
+    testRunTitle: kvmtest.${{ parameters.tbtype }}
+  condition: succeededOrFailed()

.gitignore

@@ -11,6 +11,11 @@ target/
 *.buildinfo
 
 # Subdirectories in src
+src/dhcpmon/debian/*
+!src/dhcpmon/debian/changelog 
+!src/dhcpmon/debian/compat 
+!src/dhcpmon/debian/control
+!src/dhcpmon/debian/rules 
 src/hiredis/*
 !src/hiredis/Makefile
 src/igb/*
@@ -27,12 +32,18 @@ src/libteam/*
 src/lldpd/*
 !src/lldpd/Makefile
 !src/lldpd/patch/
+src/monit/*
+!src/monit/Makefile
+!src/monit/patch/
 src/mpdecimal/*
 !src/mpdecimal/Makefile
 src/python-click/*
 !src/python-click/Makefile
 src/python3/*
 !src/python3/Makefile
+src/radvd/*
+!src/radvd/Makefile
+!src/radvd/patch/
 src/redis/*
 !src/redis/Makefile
 src/snmpd/*

.gitmodules

@@ -1,15 +1,18 @@
 [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
+	branch = 201811
 [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
+	branch = 201811
 [submodule "sonic-swss"]
 	path = src/sonic-swss
-	url = https://github.com/Azure/sonic-swss
+	url = https://github.com/sonic-net/sonic-swss
+	branch = 201811
 [submodule "src/p4c-bm/p4c-bm"]
 	path = platform/p4/p4c-bm/p4c-bm
 	url = https://github.com/krambn/p4c-bm
@@ -18,35 +21,37 @@
 	url = https://github.com/p4lang/p4-hlir
 [submodule "quagga"]
 	path = src/sonic-quagga
-	url = https://github.com/Azure/sonic-quagga
-	branch = debian/0.99.24.1
+	url = https://github.com/sonic-net/sonic-quagga
+	branch = 201811
 [submodule "sonic-dbsyncd"]
 	path = src/sonic-dbsyncd
-	url = https://github.com/Azure/sonic-dbsyncd
+	url = https://github.com/sonic-net/sonic-dbsyncd
 [submodule "src/sonic-py-swsssdk"]
 	path = src/sonic-py-swsssdk
-	url = https://github.com/Azure/sonic-py-swsssdk.git
+	url = https://github.com/sonic-net/sonic-py-swsssdk.git
 [submodule "src/sonic-snmpagent"]
 	path = src/sonic-snmpagent
-	url = https://github.com/Azure/sonic-snmpagent
+	url = https://github.com/sonic-net/sonic-snmpagent
 [submodule "src/ptf"]
 	path = src/ptf
 	url = https://github.com/p4lang/ptf.git
 [submodule "src/sonic-utilities"]
 	path = src/sonic-utilities
-	url = https://github.com/Azure/sonic-utilities
+	url = https://github.com/sonic-net/sonic-utilities
+	branch = 201811
 [submodule "platform/broadcom/sonic-platform-modules-arista"]
 	path = platform/broadcom/sonic-platform-modules-arista
 	url = https://github.com/aristanetworks/sonic
 [submodule "src/sonic-platform-common"]
 	path = src/sonic-platform-common
-	url = https://github.com/Azure/sonic-platform-common
+	url = https://github.com/sonic-net/sonic-platform-common
+	branch = 201811
 [submodule "src/sonic-platform-daemons"]
 	path = src/sonic-platform-daemons
-	url = https://github.com/Azure/sonic-platform-daemons
+	url = https://github.com/sonic-net/sonic-platform-daemons
 [submodule "src/sonic-frr/frr"]
 	path = src/sonic-frr/frr
-	url = https://github.com/Azure/sonic-frr.git
+	url = https://github.com/sonic-net/sonic-frr.git
 [submodule "platform/p4/p4-hlir/p4-hlir-v1.1"]
 	path = platform/p4/p4-hlir/p4-hlir-v1.1
 	url = https://github.com/p4lang/p4-hlir.git
@@ -62,3 +67,6 @@
 [submodule "src/redis-dump-load"]
 	path = src/redis-dump-load
 	url = https://github.com/p/redis-dump-load.git
+[submodule "src/telemetry/sonic-telemetry"]
+	path = src/telemetry/sonic-telemetry
+	url = https://github.com/sonic-net/sonic-telemetry.git

Makefile.work

@@ -27,6 +27,9 @@
 #  *                  make NOSTRETCH=1 KEEP_SLAVE_ON=yes <any jessie target>
 #  * SOURCE_FOLDER: host path to be mount as /var/$(USER)/src, only effective when KEEP_SLAVE_ON=yes
 #  * SONIC_BUILD_JOBS: Specifying number of concurrent build job(s) to run
+#  * VS_PREPARE_MEM: Prepare memory in VS build (drop cache and compact).
+#  *                 Default: yes
+#  *                 Values:  yes, no
 #  * KERNEL_PROCURE_METHOD: Specifying method of obtaining kernel Debian package: download or build
 #
 ###############################################################################
@@ -35,6 +38,7 @@ SHELL = /bin/bash
 
 USER := $(shell id -un)
 PWD := $(shell pwd)
+USER_LC := $(shell echo $(USER) | tr A-Z a-z)
 
 ifeq ($(USER), root)
 $(error Add your user account to docker group and use your user account to make. root or sudo are not supported!)
@@ -49,13 +53,13 @@ ifeq ($(BLDENV), stretch)
 SLAVE_BASE_TAG = $(shell sha1sum sonic-slave-stretch/Dockerfile | awk '{print substr($$1,0,11);}')
 SLAVE_TAG = $(shell cat sonic-slave-stretch/Dockerfile.user sonic-slave-stretch/Dockerfile | sha1sum | awk '{print substr($$1,0,11);}')
 SLAVE_BASE_IMAGE = sonic-slave-stretch-base
-SLAVE_IMAGE = sonic-slave-stretch-$(USER)
+SLAVE_IMAGE = sonic-slave-stretch-$(USER_LC)
 SLAVE_DIR = sonic-slave-stretch
 else
 SLAVE_BASE_TAG = $(shell sha1sum sonic-slave/Dockerfile | awk '{print substr($$1,0,11);}')
 SLAVE_TAG = $(shell cat sonic-slave/Dockerfile.user sonic-slave/Dockerfile | sha1sum | awk '{print substr($$1,0,11);}')
 SLAVE_BASE_IMAGE = sonic-slave-base
-SLAVE_IMAGE = sonic-slave-$(USER)
+SLAVE_IMAGE = sonic-slave-$(USER_LC)
 SLAVE_DIR = sonic-slave
 endif
 
@@ -76,7 +80,7 @@ DOCKER_RUN := docker run --rm=true --privileged \
     -w $(DOCKER_BUILDER_WORKDIR) \
     -e "http_proxy=$(http_proxy)" \
     -e "https_proxy=$(https_proxy)" \
-    -i$(if $(TERM),t,)
+    -i$(shell { if [ -t 0 ]; then echo t; fi })
 
 include rules/config
 
@@ -114,6 +118,7 @@ SONIC_BUILD_INSTRUCTION :=  make \
                            PASSWORD=$(PASSWORD) \
                            USERNAME=$(USERNAME) \
                            SONIC_BUILD_JOBS=$(SONIC_BUILD_JOBS) \
+                           VS_PREPARE_MEM=$(VS_PREPARE_MEM) \
                            KERNEL_PROCURE_METHOD=$(KERNEL_PROCURE_METHOD) \
                            HTTP_PROXY=$(http_proxy) \
                            HTTPS_PROXY=$(https_proxy) \
@@ -122,9 +127,17 @@ SONIC_BUILD_INSTRUCTION :=  make \
 .PHONY: sonic-slave-build sonic-slave-bash init reset
 
 .DEFAULT_GOAL :=  all
+FAKETIME := rm -rf faketime_0.9.7-2_amd64.deb libfaketime_0.9.7-2_amd64.deb; \
+		curl "https://sonicstoragepublic.blob.core.windows.net/public/libfaketime_0.9.7-2_amd64.deb" -o libfaketime_0.9.7-2_amd64.deb; \
+		curl "https://sonicstoragepublic.blob.core.windows.net/public/faketime_0.9.7-2_amd64.deb" -o faketime_0.9.7-2_amd64.deb; \
+		cp faketime_0.9.7-2_amd64.deb libfaketime_0.9.7-2_amd64.deb dockers/docker-base/; \
+		cp faketime_0.9.7-2_amd64.deb libfaketime_0.9.7-2_amd64.deb sonic-slave/; \
+		cp faketime_0.9.7-2_amd64.deb libfaketime_0.9.7-2_amd64.deb dockers/docker-ptf/
 
 %::
 	@$(OVERLAY_MODULE_CHECK)
+	@$(FAKETIME)
+
 	@docker inspect --type image $(SLAVE_BASE_IMAGE):$(SLAVE_BASE_TAG) &> /dev/null || \
 	    { echo Image $(SLAVE_BASE_IMAGE):$(SLAVE_BASE_TAG) not found. Building... ; \
 	    $(DOCKER_BASE_BUILD) ; }

azure-pipelines.yml

@@ -0,0 +1,49 @@
+# Starter pipeline
+# Start with a minimal pipeline that you can customize to build and deploy your code.
+# Add steps that build, run tests, deploy, and more:
+# https://aka.ms/yaml
+
+trigger:
+  branches:
+    include:
+      - master
+      - 202012
+  paths:
+    exclude:
+      - .github
+
+pr:
+  branches:
+    include:
+      - master
+      - 202012
+      - 201811
+  paths:
+    exclude:
+      - .github
+
+name: $(TeamProject)_$(Build.DefinitionName)_$(SourceBranchName)_$(Date:yyyyMMdd)$(Rev:.r)
+
+resources:
+  repositories:
+  - repository: sonic-mgmt
+    type: github
+    name: sonic-net/sonic-mgmt
+    endpoint: sonic-net
+
+stages:
+- stage: Build
+  pool: sonicbld
+  variables:
+    CACHE_MODE: rcache
+    ${{ if eq(variables['Build.SourceBranchName'], '202012') }}:
+      VERSION_CONTROL_OPTIONS: 'SONIC_VERSION_CONTROL_COMPONENTS=deb,py2,py3,web'
+  jobs:
+  - template: .azure-pipelines/azure-pipelines-build.yml
+    parameters:
+      buildOptions: 'USERNAME=admin SONIC_BUILD_JOBS=$(nproc) ${{ variables.VERSION_CONTROL_OPTIONS }}'
+      jobGroups:
+      - name: vs
+      - name: broadcom
+      - name: mellanox
+

build_debian.sh

@@ -29,8 +29,8 @@
 set -x -e
 
 ## docker engine version (with platform)
-DOCKER_VERSION=5:18.09.0~3-0~debian-stretch
-LINUX_KERNEL_VERSION=4.9.0-8
+DOCKER_VERSION=5:18.09.8~3-0~debian-stretch
+LINUX_KERNEL_VERSION=4.9.0-14
 
 ## Working directory to prepare the file system
 FILESYSTEM_ROOT=./fsroot
@@ -70,7 +70,7 @@ popd
 
 ## Build a basic Debian system by debootstrap
 echo '[INFO] Debootstrap...'
-sudo http_proxy=$http_proxy debootstrap --variant=minbase --arch amd64 stretch $FILESYSTEM_ROOT http://debian-archive.trafficmanager.net/debian
+sudo http_proxy=$http_proxy debootstrap --variant=minbase --arch amd64 stretch $FILESYSTEM_ROOT http://packages.trafficmanager.net/snapshot/debian/20230101T000234Z
 
 ## Config hostname and hosts, otherwise 'sudo ...' will complain 'sudo: unable to resolve host ...'
 sudo LANG=C chroot $FILESYSTEM_ROOT /bin/bash -c "echo '$HOSTNAME' > /etc/hostname"
@@ -93,7 +93,7 @@ sudo LANG=C chroot $FILESYSTEM_ROOT mount proc /proc -t proc
 
 ## Pointing apt to public apt mirrors and getting latest packages, needed for latest security updates
 sudo cp files/apt/sources.list $FILESYSTEM_ROOT/etc/apt/
-sudo cp files/apt/apt.conf.d/{81norecommends,apt-{clean,gzip-indexes,no-languages}} $FILESYSTEM_ROOT/etc/apt/apt.conf.d/
+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/
 sudo LANG=C chroot $FILESYSTEM_ROOT bash -c 'apt-mark auto `apt-mark showmanual`'
 
 ## Note: set lang to prevent locale warnings in your chroot
@@ -120,7 +120,7 @@ sudo dpkg --root=$FILESYSTEM_ROOT -i target/debs/initramfs-tools_*.deb || \
     sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y install -f
 sudo dpkg --root=$FILESYSTEM_ROOT -i target/debs/linux-image-${LINUX_KERNEL_VERSION}-amd64_*.deb || \
     sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y install -f
-sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y install acl
+sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y install acl dmidecode hdparm
 
 ## Update initramfs for booting with squashfs+overlay
 cat files/initramfs-tools/modules | sudo tee -a $FILESYSTEM_ROOT/etc/initramfs-tools/modules > /dev/null
@@ -150,8 +150,8 @@ sudo chmod +x $FILESYSTEM_ROOT/etc/initramfs-tools/scripts/init-bottom/union-mou
 sudo cp files/initramfs-tools/varlog $FILESYSTEM_ROOT/etc/initramfs-tools/scripts/init-bottom/varlog
 sudo chmod +x $FILESYSTEM_ROOT/etc/initramfs-tools/scripts/init-bottom/varlog
 # Management interface (eth0) dhcp can be optionally turned off (during a migration from another NOS to SONiC)
-sudo cp files/initramfs-tools/mgmt-intf-dhcp $FILESYSTEM_ROOT/etc/initramfs-tools/scripts/init-bottom/mgmt-intf-dhcp
-sudo chmod +x $FILESYSTEM_ROOT/etc/initramfs-tools/scripts/init-bottom/mgmt-intf-dhcp
+#sudo cp files/initramfs-tools/mgmt-intf-dhcp $FILESYSTEM_ROOT/etc/initramfs-tools/scripts/init-bottom/mgmt-intf-dhcp
+#sudo chmod +x $FILESYSTEM_ROOT/etc/initramfs-tools/scripts/init-bottom/mgmt-intf-dhcp
 sudo cp files/initramfs-tools/union-fsck $FILESYSTEM_ROOT/etc/initramfs-tools/hooks/union-fsck
 sudo chmod +x $FILESYSTEM_ROOT/etc/initramfs-tools/hooks/union-fsck
 pushd $FILESYSTEM_ROOT/usr/share/initramfs-tools/scripts/init-bottom && sudo patch -p1 < $OLDPWD/files/initramfs-tools/udev.patch; popd
@@ -169,19 +169,21 @@ sudo LANG=C chroot $FILESYSTEM_ROOT apt-get -y install apt-transport-https \
                                                        curl \
                                                        gnupg2 \
                                                        software-properties-common
-sudo LANG=C chroot $FILESYSTEM_ROOT curl -o /tmp/docker.gpg -fsSL https://download.docker.com/linux/debian/gpg
+sudo https_proxy=$https_proxy LANG=C chroot $FILESYSTEM_ROOT curl -o /tmp/docker.gpg -fsSL https://download.docker.com/linux/debian/gpg
 sudo LANG=C chroot $FILESYSTEM_ROOT apt-key add /tmp/docker.gpg
 sudo LANG=C chroot $FILESYSTEM_ROOT rm /tmp/docker.gpg
 sudo LANG=C chroot $FILESYSTEM_ROOT add-apt-repository \
                                     "deb [arch=amd64] https://download.docker.com/linux/debian stretch stable"
 sudo LANG=C chroot $FILESYSTEM_ROOT apt-get update
-sudo LANG=C chroot $FILESYSTEM_ROOT apt-get -y install docker-ce=${DOCKER_VERSION}
+sudo LANG=C chroot $FILESYSTEM_ROOT apt-get -y install docker-ce=${DOCKER_VERSION} docker-ce-cli=${DOCKER_VERSION}
 sudo LANG=C chroot $FILESYSTEM_ROOT apt-get -y remove software-properties-common gnupg2
 
 ## Add docker config drop-in to select aufs, otherwise it may select other storage driver
 sudo mkdir -p $FILESYSTEM_ROOT/etc/systemd/system/docker.service.d/
 ## Note: $_ means last argument of last command
 sudo cp files/docker/docker.service.conf $_
+## Fix systemd race between docker and containerd
+sudo sed -i '/After=/s/$/ containerd.service/' $FILESYSTEM_ROOT/lib/systemd/system/docker.service
 
 ## Create default user
 ## Note: user should be in the group with the same name, and also in sudo/docker group
@@ -213,7 +215,6 @@ sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y in
     openssh-server          \
     python                  \
     python-setuptools       \
-    monit                   \
     python-apt              \
     traceroute              \
     iputils-ping            \
@@ -225,6 +226,7 @@ sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y in
     usbutils                \
     pciutils                \
     iptables-persistent     \
+    ebtables                \
     logrotate               \
     curl                    \
     kexec-tools             \
@@ -240,7 +242,21 @@ sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y in
     python-scapy            \
     tcptraceroute           \
     mtr-tiny                \
-    locales
+    locales                 \
+    mcelog                  \
+    ndisc6                  \
+    python-pip              \
+    ipmitool                \
+    lsof                    \
+    sysstat                 \
+    smartmontools           \
+
+## Set /etc/shadow permissions to -rw-------.
+sudo LANG=c chroot $FILESYSTEM_ROOT chmod 600 /etc/shadow
+
+## Set /etc/passwd, /etc/group permissions to -rw-r--r--.
+sudo LANG=c chroot $FILESYSTEM_ROOT chmod 644 /etc/passwd
+sudo LANG=c chroot $FILESYSTEM_ROOT chmod 644 /etc/group
 
 #Adds a locale to a debian system in non-interactive mode
 sudo sed -i '/^#.* en_US.* /s/^#//' $FILESYSTEM_ROOT/etc/locale.gen && \
@@ -271,33 +287,30 @@ sudo chmod u+s $FILESYSTEM_ROOT/bin/ping{,6}
 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
-## Config sshd
-sudo augtool --autosave "set /files/etc/ssh/sshd_config/UseDNS no" -r $FILESYSTEM_ROOT
-sudo sed -i 's/^ListenAddress ::/#ListenAddress ::/' $FILESYSTEM_ROOT/etc/ssh/sshd_config
-sudo sed -i 's/^#ListenAddress 0.0.0.0/ListenAddress 0.0.0.0/' $FILESYSTEM_ROOT/etc/ssh/sshd_config
+# Config sshd
+# 1. Set 'UseDNS' to 'no'
+# 2. Configure sshd to close all SSH connetions after 15 minutes of inactivity
+sudo augtool -r $FILESYSTEM_ROOT <<'EOF'
+touch /files/etc/ssh/sshd_config/EmptyLineHack
+rename /files/etc/ssh/sshd_config/EmptyLineHack ""
+set /files/etc/ssh/sshd_config/UseDNS no
+ins #comment before /files/etc/ssh/sshd_config/UseDNS
+set /files/etc/ssh/sshd_config/#comment[following-sibling::*[1][self::UseDNS]] "Disable hostname lookups"
 
-## Config monit
-sudo sed -i '
-    s/^# set logfile syslog/set logfile syslog/;
-    s/^\s*set logfile \/var/# set logfile \/var/;
-    s/^# set httpd port/set httpd port/;
-    s/^#    use address localhost/   use address localhost/;
-    s/^#    allow localhost/   allow localhost/;
-    s/^#    allow admin:monit/   allow admin:monit/;
-    s/^#    allow @monit/   allow @monit/;
-    s/^#    allow @users readonly/   allow @users readonly/
-    ' $FILESYSTEM_ROOT/etc/monit/monitrc
-
-sudo tee -a $FILESYSTEM_ROOT/etc/monit/monitrc > /dev/null <<'EOF'
-check filesystem root-overlay with path /
-  if space usage > 90% for 5 times within 10 cycles then alert
-check filesystem var-log with path /var/log
-  if space usage > 90% for 5 times within 10 cycles then alert
-check system $HOST
-  if memory usage > 90% for 5 times within 10 cycles then alert
-  if cpu usage (user) > 90% for 5 times within 10 cycles then alert
-  if cpu usage (system) > 90% for 5 times within 10 cycles then alert
+rm /files/etc/ssh/sshd_config/ClientAliveInterval
+rm /files/etc/ssh/sshd_config/ClientAliveCountMax
+touch /files/etc/ssh/sshd_config/EmptyLineHack
+rename /files/etc/ssh/sshd_config/EmptyLineHack ""
+set /files/etc/ssh/sshd_config/ClientAliveInterval 900
+set /files/etc/ssh/sshd_config/ClientAliveCountMax 0
+ins #comment before /files/etc/ssh/sshd_config/ClientAliveInterval
+set /files/etc/ssh/sshd_config/#comment[following-sibling::*[1][self::ClientAliveInterval]] "Close inactive client sessions after 15 minutes"
+save
+quit
 EOF
+# Configure sshd to listen for v4 and v6 connections
+sudo sed -i 's/^#ListenAddress 0.0.0.0/ListenAddress 0.0.0.0/' $FILESYSTEM_ROOT/etc/ssh/sshd_config
+sudo sed -i 's/^#ListenAddress ::/ListenAddress ::/' $FILESYSTEM_ROOT/etc/ssh/sshd_config
 
 ## Config sysctl
 sudo mkdir -p $FILESYSTEM_ROOT/var/core
@@ -306,6 +319,7 @@ set /files/etc/sysctl.conf/kernel.core_pattern '|/usr/bin/coredump-compress %e %
 
 set /files/etc/sysctl.conf/kernel.softlockup_panic 1
 set /files/etc/sysctl.conf/kernel.panic 10
+set /files/etc/sysctl.conf/vm.panic_on_oom 2
 set /files/etc/sysctl.conf/fs.suid_dumpable 2
 
 set /files/etc/sysctl.conf/net.ipv4.conf.default.forwarding 1
@@ -325,6 +339,12 @@ set /files/etc/sysctl.conf/net.ipv4.conf.all.arp_ignore 2
 
 set /files/etc/sysctl.conf/net.ipv4.neigh.default.base_reachable_time_ms 1800000
 set /files/etc/sysctl.conf/net.ipv6.neigh.default.base_reachable_time_ms 1800000
+set /files/etc/sysctl.conf/net.ipv4.neigh.default.gc_thresh1 1024
+set /files/etc/sysctl.conf/net.ipv6.neigh.default.gc_thresh1 1024
+set /files/etc/sysctl.conf/net.ipv4.neigh.default.gc_thresh2 2048
+set /files/etc/sysctl.conf/net.ipv6.neigh.default.gc_thresh2 2048
+set /files/etc/sysctl.conf/net.ipv4.neigh.default.gc_thresh3 4096
+set /files/etc/sysctl.conf/net.ipv6.neigh.default.gc_thresh3 4096
 
 set /files/etc/sysctl.conf/net.ipv6.conf.default.forwarding 1
 set /files/etc/sysctl.conf/net.ipv6.conf.all.forwarding 1
@@ -339,13 +359,17 @@ set /files/etc/sysctl.conf/net.ipv6.conf.all.keep_addr_on_down 1
 set /files/etc/sysctl.conf/net.ipv6.conf.eth0.keep_addr_on_down 1
 
 set /files/etc/sysctl.conf/net.ipv6.conf.eth0.accept_ra_defrtr 0
+set /files/etc/sysctl.conf/net.ipv6.conf.eth0.accept_ra 0
 
 set /files/etc/sysctl.conf/net.core.rmem_max 2097152
 set /files/etc/sysctl.conf/net.core.wmem_max 2097152
 " -r $FILESYSTEM_ROOT
 
+# Configure mcelog to log machine checks to syslog
+sudo sed -i 's/^#syslog = yes/syslog = yes/' $FILESYSTEM_ROOT/etc/mcelog/mcelog.conf
+
 ## docker-py is needed by Ansible docker module
-sudo https_proxy=$https_proxy LANG=C chroot $FILESYSTEM_ROOT easy_install pip
+sudo https_proxy=$https_proxy LANG=C chroot $FILESYSTEM_ROOT pip install --upgrade 'pip==20.3.3'
 sudo https_proxy=$https_proxy LANG=C chroot $FILESYSTEM_ROOT pip install 'docker-py==1.6.0'
 ## Note: keep pip installed for maintainance purpose
 
@@ -383,6 +407,17 @@ build_number: ${BUILD_NUMBER:-0}
 built_by: $USER@$BUILD_HOSTNAME
 EOF
 
+## Copy over clean-up script
+sudo cp ./files/scripts/core_cleanup.py $FILESYSTEM_ROOT/usr/bin/core_cleanup.py
+
+## Copy ASIC config checksum
+python files/build_scripts/generate_asic_config_checksum.py
+if [[ ! -f './asic_config_checksum' ]]; then
+    echo 'asic_config_checksum not found'
+    exit 1
+fi
+sudo cp ./asic_config_checksum $FILESYSTEM_ROOT/etc/sonic/asic_config_checksum
+
 if [ -f sonic_debian_extension.sh ]; then
     ./sonic_debian_extension.sh $FILESYSTEM_ROOT $PLATFORM_DIR
 fi
@@ -390,11 +425,34 @@ fi
 ## Organization specific extensions such as Configuration & Scripts for features like AAA, ZTP...
 if [ "${enable_organization_extensions}" = "y" ]; then
    if [ -f files/build_templates/organization_extensions.sh ]; then
-      sudo chmod 755 files/build_templates/organization_extensions.sh 
+      sudo chmod 755 files/build_templates/organization_extensions.sh
       ./files/build_templates/organization_extensions.sh -f $FILESYSTEM_ROOT -h $HOSTNAME
    fi
 fi
 
+## Setup ebtable rules (rule file is in binary format)
+sudo sed -i 's/EBTABLES_LOAD_ON_START="no"/EBTABLES_LOAD_ON_START="yes"/g' ${FILESYSTEM_ROOT}/etc/default/ebtables
+sudo cp files/image_config/ebtables/ebtables.filter ${FILESYSTEM_ROOT}/etc
+
+## Debug Image specific changes
+## Update motd for debug image
+if [ "$DEBUG_IMG" == "y" ]
+then
+    sudo LANG=C chroot $FILESYSTEM_ROOT /bin/bash -c "echo '**************' >> /etc/motd"
+    sudo LANG=C chroot $FILESYSTEM_ROOT /bin/bash -c "echo 'Running DEBUG image' >> /etc/motd"
+    sudo LANG=C chroot $FILESYSTEM_ROOT /bin/bash -c "echo '**************' >> /etc/motd"
+    sudo LANG=C chroot $FILESYSTEM_ROOT /bin/bash -c "echo '/src has the sources' >> /etc/motd"
+    sudo LANG=C chroot $FILESYSTEM_ROOT /bin/bash -c "echo '/src is mounted in each docker' >> /etc/motd"
+    sudo LANG=C chroot $FILESYSTEM_ROOT /bin/bash -c "echo '/debug is created for core files or temp files' >> /etc/motd"
+    sudo LANG=C chroot $FILESYSTEM_ROOT /bin/bash -c "echo 'Create a subdir under /debug to upload your files' >> /etc/motd"
+    sudo LANG=C chroot $FILESYSTEM_ROOT /bin/bash -c "echo '/debug is mounted in each docker' >> /etc/motd"
+
+    sudo mkdir -p $FILESYSTEM_ROOT/src
+    sudo cp $DEBUG_SRC_ARCHIVE_FILE $FILESYSTEM_ROOT/src/
+    sudo mkdir -p $FILESYSTEM_ROOT/debug
+
+fi
+
 ## Remove gcc and python dev pkgs
 sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y remove gcc libpython2.7-dev
 

build_debug_docker_j2.sh

@@ -0,0 +1,44 @@
+#! /bin/bash
+
+echo "
+FROM $1
+
+ARG docker_container_name
+
+## Make apt-get non-interactive
+ENV DEBIAN_FRONTEND=noninteractive
+
+{% if $2 is defined %}
+{% if $2|length %}
+
+COPY \
+{% for deb in $2.split(' ') -%}
+debs/{{ deb }}{{' '}}
+{%- endfor -%}
+debs/
+
+RUN dpkg -i \
+{% for deb in $2.split(' ') -%}
+debs/{{ deb }}{{' '}}
+{%- endfor %}
+
+{% endif %}
+{% endif %}
+
+{% if $3 is defined %}
+{% if $3|length %}
+
+RUN apt-get install -f -y \
+{% for dbg in $3.split(' ') -%}
+{{ dbg }}{{' '}}
+{%- endfor %}
+
+{% endif %}
+{% endif %}
+
+
+## Clean up
+RUN apt-get clean -y; apt-get autoclean -y; apt-get autoremove -y
+RUN rm -rf /debs
+
+"

build_image.sh

@@ -60,22 +60,18 @@ elif [ "$IMAGE_TYPE" = "raw" ]; then
     ## 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 ./$OUTPUT_ONIE_IMAGE || {
+        ## Failure during 'build' install mode of the installer results in an incomplete raw image.
+        ## Delete the incomplete raw image.
+        sudo rm -f $OUTPUT_RAW_IMAGE
+    }
 
     [ -r $OUTPUT_RAW_IMAGE ] || {
         echo "Error : $OUTPUT_RAW_IMAGE not generated!"
         exit 1
     }
 
-    gzip $OUTPUT_RAW_IMAGE
-
-    [ -r $OUTPUT_RAW_IMAGE.gz ] || {
-        echo "Error : gzip $OUTPUT_RAW_IMAGE failed!"
-        exit 1
-    }
-
-    mv $OUTPUT_RAW_IMAGE.gz $OUTPUT_RAW_IMAGE
-    echo "The compressed raw image is in $OUTPUT_RAW_IMAGE"
+    echo "The raw image is in $OUTPUT_RAW_IMAGE"
 
 elif [ "$IMAGE_TYPE" = "kvm" ]; then
 

build_kvm_image.sh

@@ -1,4 +1,4 @@
-#!/bin/sh -ex
+#!/bin/bash -ex
 
 #  Copyright (C) 2014 Curt Brune <curt@cumulusnetworks.com>
 #
@@ -47,6 +47,15 @@ prepare_installer_disk()
 create_disk
 prepare_installer_disk
 
+echo "Prepare memory for KVM build: $vs_build_prepare_mem"
+free -m
+if [[ "$vs_build_prepare_mem" == "yes" ]]; then
+    # Force o.s. to drop cache and compact memory so that KVM can get 2G memory
+    sudo bash -c 'echo 1 > /proc/sys/vm/drop_caches'
+    sudo bash -c 'echo 1 > /proc/sys/vm/compact_memory'
+    free -m
+fi
+
 /usr/bin/kvm -m $MEM \
     -name "onie" \
     -boot "order=cd,once=d" -cdrom "$ONIE_RECOVERY_ISO" \

dbg_files.sh

@@ -0,0 +1,12 @@
+#!/bin/bash
+
+# Provide file paths to archive for debug image as relative to src subdir
+#
+if [ "$DEBUG_IMG" == "y" ]
+then
+    for i in $DEBUG_SRC_ARCHIVE_DIRS
+    do
+        find src/$i/ -name "*.c" -o -name "*.cpp" -o -name "*.h" -o -name "*.hpp" -type f
+    done | tar -czf $DEBUG_SRC_ARCHIVE_FILE -T -
+fi
+

device/arista/x86_64-arista_7050_qx32/Arista-7050-QX32/buffers_defaults_t0.j2

@@ -0,0 +1,45 @@
+{%- set default_cable = '300m' %}
+
+{%- macro generate_port_lists(PORT_ALL) %}
+    {# Generate list of ports #}
+    {% for port_idx in range(0,32) %}
+        {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{% endif %}
+    {% endfor %}
+{%- endmacro %}
+
+{%- macro generate_buffer_pool_and_profiles() %}
+    "BUFFER_POOL": {
+        "ingress_lossless_pool": {
+            "size": "12766208",
+            "type": "ingress",
+            "mode": "dynamic"
+        },
+        "egress_lossless_pool": {
+            "size": "12766208",
+            "type": "egress",
+            "mode": "static"
+        },
+        "egress_lossy_pool": {
+            "size": "7326924",
+            "type": "egress",
+            "mode": "dynamic"
+        }
+    },
+    "BUFFER_PROFILE": {
+        "ingress_lossy_profile": {
+            "pool":"[BUFFER_POOL|ingress_lossless_pool]",
+            "size":"0",
+            "dynamic_th":"3"
+        },
+        "egress_lossless_profile": {
+            "pool":"[BUFFER_POOL|egress_lossless_pool]",
+            "size":"0",
+            "static_th":"12766208"
+        },
+        "egress_lossy_profile": {
+            "pool":"[BUFFER_POOL|egress_lossy_pool]",
+            "size":"1518",
+            "dynamic_th":"3"
+        }
+    },
+{%- endmacro %}

device/arista/x86_64-arista_7050_qx32/Arista-7050-QX32/buffers_defaults_t1.j2

@@ -20,7 +20,7 @@
             "mode": "static"
         },
         "egress_lossy_pool": {
-            "size": "7582515",
+            "size": "7326924",
             "type": "egress",
             "mode": "dynamic"
         }

device/arista/x86_64-arista_7050_qx32/Arista-7050-QX32/pg_profile_lookup.ini

@@ -1,11 +1,11 @@
 # PG lossless profiles.
 # speed cable size      xon     xoff   threshold xon_offset
-  40000  5m   41808     18432   40560  -3        2496
-  50000  5m   41808     18432   40560  -3        2496
- 100000  5m   41808     18432   40560  -3        2496
-  40000  40m  51376     18432   50128  -3        2496
-  50000  40m  51376     18432   50128  -3        2496
- 100000  40m  51376     18432   50128  -3        2496
-  40000  300m 51376     18432   50128  -3        2496
-  50000  300m 51376     18432   50128  -3        2496
- 100000  300m 51376     18432   50128  -3        2496
+  40000  5m   56368     18432   55120  -3        2496
+  50000  5m   56368     18432   55120  -3        2496
+ 100000  5m   56368     18432   55120  -3        2496
+  40000  40m  56368     18432   55120  -3        2496
+  50000  40m  56368     18432   55120  -3        2496
+ 100000  40m  56368     18432   55120  -3        2496
+  40000  300m 56368     18432   55120  -3        2496
+  50000  300m 56368     18432   55120  -3        2496
+ 100000  300m 56368     18432   55120  -3        2496

device/arista/x86_64-arista_7050_qx32s/Arista-7050-QX-32S

@@ -0,0 +1 @@
+Arista-7050QX-32S-S4Q31

device/arista/x86_64-arista_7050_qx32s/Arista-7050-QX-32S/pg_profile_lookup.ini

@@ -1,11 +0,0 @@
-# PG lossless profiles.
-# speed cable size      xon     xoff   threshold xon_offset
-  40000  5m   41808     18432   40560  -3        2496
-  50000  5m   41808     18432   40560  -3        2496
- 100000  5m   41808     18432   40560  -3        2496
-  40000  40m  51376     18432   50128  -3        2496
-  50000  40m  51376     18432   50128  -3        2496
- 100000  40m  51376     18432   50128  -3        2496
-  40000  300m 51376     18432   50128  -3        2496
-  50000  300m 51376     18432   50128  -3        2496
- 100000  300m 51376     18432   50128  -3        2496

device/arista/x86_64-arista_7050_qx32s/Arista-7050QX-32S-S4Q31/buffers_defaults_t0.j2

@@ -0,0 +1,49 @@
+{%- set default_cable = '300m' %}
+
+{%- macro generate_port_lists(PORT_ALL) %}
+    {# Generate list of ports #}
+    {% if PORT_ALL.append("Ethernet0") %}{% endif %}
+    {% if PORT_ALL.append("Ethernet1") %}{% endif %}
+    {% if PORT_ALL.append("Ethernet2") %}{% endif %}
+    {% if PORT_ALL.append("Ethernet3") %}{% endif %}
+    {% for port_idx in range(1,32) %}
+        {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{% endif %}
+    {% endfor %}
+{%- endmacro %}
+
+{%- macro generate_buffer_pool_and_profiles() %}
+    "BUFFER_POOL": {
+        "ingress_lossless_pool": {
+            "size": "12766208",
+            "type": "ingress",
+            "mode": "dynamic"
+        },
+        "egress_lossless_pool": {
+            "size": "12766208",
+            "type": "egress",
+            "mode": "static"
+        },
+        "egress_lossy_pool": {
+            "size": "7326924",
+            "type": "egress",
+            "mode": "dynamic"
+        }
+    },
+    "BUFFER_PROFILE": {
+        "ingress_lossy_profile": {
+            "pool":"[BUFFER_POOL|ingress_lossless_pool]",
+            "size":"0",
+            "dynamic_th":"3"
+        },
+        "egress_lossless_profile": {
+            "pool":"[BUFFER_POOL|egress_lossless_pool]",
+            "size":"0",
+            "static_th":"12766208"
+        },
+        "egress_lossy_profile": {
+            "pool":"[BUFFER_POOL|egress_lossy_pool]",
+            "size":"1518",
+            "dynamic_th":"3"
+        }
+    },
+{%- endmacro %}

device/arista/x86_64-arista_7050_qx32s/Arista-7050QX-32S-S4Q31/buffers_defaults_t1.j2

@@ -24,7 +24,7 @@
             "mode": "static"
         },
         "egress_lossy_pool": {
-            "size": "8072396",
+            "size": "7326924",
             "type": "egress",
             "mode": "dynamic"
         }

device/arista/x86_64-arista_7050_qx32s/Arista-7050QX-32S-S4Q31/pg_profile_lookup.ini

@@ -1,14 +1,17 @@
 # PG lossless profiles.
 # speed cable size      xon     xoff   threshold xon_offset
-  10000  5m   41808     18432   40560  -4        2496
-  40000  5m   41808     18432   40560  -4        2496
-  50000  5m   41808     18432   40560  -4        2496
- 100000  5m   41808     18432   40560  -4        2496
-  10000  40m  41808     18432   40560  -4        2496
-  40000  40m  41808     18432   40560  -4        2496
-  50000  40m  41808     18432   40560  -4        2496
- 100000  40m  41808     18432   40560  -4        2496
-  10000  300m 41808     18432   40560  -4        2496
-  40000  300m 41808     18432   40560  -4        2496
-  50000  300m 41808     18432   40560  -4        2496
- 100000  300m 41808     18432   40560  -4        2496
+   1000  5m   41808     18432   40560  -3        2496
+  10000  5m   41808     18432   40560  -3        2496
+  40000  5m   56368     18432   55120  -3        2496
+  50000  5m   56368     18432   55120  -3        2496
+ 100000  5m   56368     18432   55120  -3        2496
+   1000  40m  41808     18432   40560  -3        2496
+  10000  40m  41808     18432   40560  -3        2496
+  40000  40m  56368     18432   55120  -3        2496
+  50000  40m  56368     18432   55120  -3        2496
+ 100000  40m  56368     18432   55120  -3        2496
+   1000  300m 41808     18432   40560  -3        2496
+  10000  300m 41808     18432   40560  -3        2496
+  40000  300m 56368     18432   55120  -3        2496
+  50000  300m 56368     18432   55120  -3        2496
+ 100000  300m 56368     18432   55120  -3        2496

device/arista/x86_64-arista_7050_qx32s/Arista-7050QX-32S-S4Q31/qos.json.j2

@@ -1,148 +1 @@
-{
-    "TC_TO_PRIORITY_GROUP_MAP": {
-        "AZURE": {
-            "0": "0",
-            "1": "1",
-            "3": "3",
-            "4": "4"
-        }
-    },
-    "MAP_PFC_PRIORITY_TO_QUEUE": {
-        "AZURE": {
-            "0": "0",
-            "1": "1",
-            "3": "3",
-            "4": "4"
-        }
-    },
-    "TC_TO_QUEUE_MAP": {
-        "AZURE": {
-            "0": "0",
-            "1": "1",
-            "3": "3",
-            "4": "4"
-        }
-    },
-    "DSCP_TO_TC_MAP": {
-        "AZURE": {
-            "0":"0",
-            "1":"0",
-            "2":"0",
-            "3":"3",
-            "4":"4",
-            "5":"0",
-            "6":"0",
-            "7":"0",
-            "8":"1",
-            "9":"0",
-            "10":"0",
-            "11":"0",
-            "12":"0",
-            "13":"0",
-            "14":"0",
-            "15":"0",
-            "16":"0",
-            "17":"0",
-            "18":"0",
-            "19":"0",
-            "20":"0",
-            "21":"0",
-            "22":"0",
-            "23":"0",
-            "24":"0",
-            "25":"0",
-            "26":"0",
-            "27":"0",
-            "28":"0",
-            "29":"0",
-            "30":"0",
-            "31":"0",
-            "32":"0",
-            "33":"0",
-            "34":"0",
-            "35":"0",
-            "36":"0",
-            "37":"0",
-            "38":"0",
-            "39":"0",
-            "40":"0",
-            "41":"0",
-            "42":"0",
-            "43":"0",
-            "44":"0",
-            "45":"0",
-            "46":"0",
-            "47":"0",
-            "48":"0",
-            "49":"0",
-            "50":"0",
-            "51":"0",
-            "52":"0",
-            "53":"0",
-            "54":"0",
-            "55":"0",
-            "56":"0",
-            "57":"0",
-            "58":"0",
-            "59":"0",
-            "60":"0",
-            "61":"0",
-            "62":"0",
-            "63":"0"
-        }
-    },
-    "SCHEDULER": {
-        "scheduler.0" : {
-            "type":"DWRR",
-            "weight": "25"
-        },
-        "scheduler.1" : {
-            "type":"DWRR",
-            "weight": "30"
-        },
-        "scheduler.2" : {
-            "type":"DWRR",
-            "weight": "20"
-        }
-    },
-    "PORT_QOS_MAP": {
-        "Ethernet0,Ethernet1,Ethernet2,Ethernet3,Ethernet4,Ethernet8,Ethernet12,Ethernet16,Ethernet20,Ethernet24,Ethernet28,Ethernet32,Ethernet36,Ethernet40,Ethernet44,Ethernet48,Ethernet52,Ethernet56,Ethernet60,Ethernet64,Ethernet68,Ethernet72,Ethernet76,Ethernet80,Ethernet84,Ethernet88,Ethernet92,Ethernet96,Ethernet100,Ethernet104,Ethernet108,Ethernet112,Ethernet116,Ethernet120,Ethernet124": {
-            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
-            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
-            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
-            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
-            "pfc_enable": "3,4"
-        }
-    },
-    "WRED_PROFILE": {
-        "AZURE_LOSSLESS" : {
-            "wred_green_enable":"true",
-            "wred_yellow_enable":"true",
-            "wred_red_enable":"true",
-            "ecn":"ecn_all",
-            "red_max_threshold":"312000",
-            "red_min_threshold":"104000",
-            "yellow_max_threshold":"312000",
-            "yellow_min_threshold":"104000",
-            "green_max_threshold":"312000",
-            "green_min_threshold":"104000"
-        }
-    },
-    "QUEUE": {
-        "Ethernet0,Ethernet1,Ethernet2,Ethernet3,Ethernet4,Ethernet8,Ethernet12,Ethernet16,Ethernet20,Ethernet24,Ethernet28,Ethernet32,Ethernet36,Ethernet40,Ethernet44,Ethernet48,Ethernet52,Ethernet56,Ethernet60,Ethernet64,Ethernet68,Ethernet72,Ethernet76,Ethernet80,Ethernet84,Ethernet88,Ethernet92,Ethernet96,Ethernet100,Ethernet104,Ethernet108,Ethernet112,Ethernet116,Ethernet120,Ethernet124|3-4" : {
-            "scheduler"     :   "[SCHEDULER|scheduler.0]"
-        },
-        "Ethernet0,Ethernet1,Ethernet2,Ethernet3,Ethernet4,Ethernet8,Ethernet12,Ethernet16,Ethernet20,Ethernet24,Ethernet28,Ethernet32,Ethernet36,Ethernet40,Ethernet44,Ethernet48,Ethernet52,Ethernet56,Ethernet60,Ethernet64,Ethernet68,Ethernet72,Ethernet76,Ethernet80,Ethernet84,Ethernet88,Ethernet92,Ethernet96,Ethernet100,Ethernet104,Ethernet108,Ethernet112,Ethernet116,Ethernet120,Ethernet124|3" : {
-            "wred_profile"  :   "[WRED_PROFILE|AZURE_LOSSLESS]"
-        },
-        "Ethernet0,Ethernet1,Ethernet2,Ethernet3,Ethernet4,Ethernet8,Ethernet12,Ethernet16,Ethernet20,Ethernet24,Ethernet28,Ethernet32,Ethernet36,Ethernet40,Ethernet44,Ethernet48,Ethernet52,Ethernet56,Ethernet60,Ethernet64,Ethernet68,Ethernet72,Ethernet76,Ethernet80,Ethernet84,Ethernet88,Ethernet92,Ethernet96,Ethernet100,Ethernet104,Ethernet108,Ethernet112,Ethernet116,Ethernet120,Ethernet124|4" : {
-            "wred_profile"  :   "[WRED_PROFILE|AZURE_LOSSLESS]"
-        },
-        "Ethernet0,Ethernet1,Ethernet2,Ethernet3,Ethernet4,Ethernet8,Ethernet12,Ethernet16,Ethernet20,Ethernet24,Ethernet28,Ethernet32,Ethernet36,Ethernet40,Ethernet44,Ethernet48,Ethernet52,Ethernet56,Ethernet60,Ethernet64,Ethernet68,Ethernet72,Ethernet76,Ethernet80,Ethernet84,Ethernet88,Ethernet92,Ethernet96,Ethernet100,Ethernet104,Ethernet108,Ethernet112,Ethernet116,Ethernet120,Ethernet124|0" : {
-            "scheduler"     :   "[SCHEDULER|scheduler.1]"
-        },
-        "Ethernet0,Ethernet1,Ethernet2,Ethernet3,Ethernet4,Ethernet8,Ethernet12,Ethernet16,Ethernet20,Ethernet24,Ethernet28,Ethernet32,Ethernet36,Ethernet40,Ethernet44,Ethernet48,Ethernet52,Ethernet56,Ethernet60,Ethernet64,Ethernet68,Ethernet72,Ethernet76,Ethernet80,Ethernet84,Ethernet88,Ethernet92,Ethernet96,Ethernet100,Ethernet104,Ethernet108,Ethernet112,Ethernet116,Ethernet120,Ethernet124|1" : {
-            "scheduler"     :   "[SCHEDULER|scheduler.2]"
-        }
-    }
-}
+{%- include 'qos_config.j2' %}

device/arista/x86_64-arista_7050_qx32s/Arista-7050QX-32S-S4Q31/td2-a7050-q31s4-31x40G-4x10G.config.bcm

@@ -1,17 +1,51 @@
+# ALPM enable
+l3_alpm_enable=2
+ipv6_lpm_128b_enable=1
+l2_mem_entries=32768
+l3_mem_entries=16384
+
+# From old config file
+os=unix
+higig2_hdr_mode=1
+
+# Parity
+parity_correction=1
+parity_enable=1
+stat_if_parity_enable=0
+
+# l2 thread related config vars
+l2xmsg_hostbuf_size=8192
+l2xmsg_mode=1
+
+bcm_num_cos=8
+bcm_stat_interval=2000000
+lls_num_l2uc=12
+max_vp_lags=0
+miim_intr_enable=0
+mmu_lossless=0
+module_64ports=0
+
+stable_size=0x2000000
+
+tdma_timeout_usec=5000000
+tslam_timeout_usec=15000000
+cdma_timeout_usec=15000000
+dma_desc_timeout_usec=15000000
+
+###############################
+serdes_fiber_pref=1
+###############################
+mdio_output_delay=0x0d
+###############################
+xgxs_lcpll_xtal_refclk=1
+tdma_intr_enable=1
+tslam_intr_enable=1
+table_dma_enable=1
+
 arl_clean_timeout_usec=15000000
-bcm_num_cos.0=8
 bcm_stat_flags=1
 bcm_stat_jumbo.0=9236
-cdma_timeout_usec.0=15000000
-dma_desc_timeout_usec.0=15000000
-higig2_hdr_mode.0=1
-ipv6_lpm_128b_enable.0=2
-l2xmsg_mode.0=1
-max_vp_lags.0=0
-mdio_output_delay=0x0d
-miim_intr_enable.0=0
-module_64ports.0=0
-os=unix
+
 pbmp_oversubscribe.0=0x1fffffffffffffffffffffffffe
 pbmp_xport_xe.0=0x1fffffffffffffffffffffffffe
 phy_an_c37_1.0=3
@@ -243,10 +277,6 @@ serdes_firmware_mode_101.0=2
 serdes_firmware_mode_102.0=2
 serdes_firmware_mode_103.0=2
 serdes_firmware_mode_104.0=2
-stable_size=0x2000000
-tdma_timeout_usec.0=15000000
-tslam_timeout_usec.0=15000000
-xgxs_lcpll_xtal_refclk.0=1
 xgxs_rx_lane_map_1.0=0x3210
 xgxs_rx_lane_map_5.0=0x0321
 xgxs_rx_lane_map_9.0=0x1302

device/arista/x86_64-arista_7050_qx32s/Arista-7050QX32S-Q32/buffers_defaults_t0.j2

@@ -0,0 +1,45 @@
+{%- set default_cable = '300m' %}
+
+{%- macro generate_port_lists(PORT_ALL) %}
+    {# Generate list of ports #}
+    {% for port_idx in range(0,32) %}
+        {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{% endif %}
+    {% endfor %}
+{%- endmacro %}
+
+{%- macro generate_buffer_pool_and_profiles() %}
+    "BUFFER_POOL": {
+        "ingress_lossless_pool": {
+            "size": "12766208",
+            "type": "ingress",
+            "mode": "dynamic"
+        },
+        "egress_lossless_pool": {
+            "size": "12766208",
+            "type": "egress",
+            "mode": "static"
+        },
+        "egress_lossy_pool": {
+            "size": "7326924",
+            "type": "egress",
+            "mode": "dynamic"
+        }
+    },
+    "BUFFER_PROFILE": {
+        "ingress_lossy_profile": {
+            "pool":"[BUFFER_POOL|ingress_lossless_pool]",
+            "size":"0",
+            "dynamic_th":"3"
+        },
+        "egress_lossless_profile": {
+            "pool":"[BUFFER_POOL|egress_lossless_pool]",
+            "size":"0",
+            "static_th":"12766208"
+        },
+        "egress_lossy_profile": {
+            "pool":"[BUFFER_POOL|egress_lossy_pool]",
+            "size":"1518",
+            "dynamic_th":"3"
+        }
+    },
+{%- endmacro %}

device/arista/x86_64-arista_7050_qx32s/Arista-7050QX32S-Q32/buffers_defaults_t1.j2

@@ -20,7 +20,7 @@
             "mode": "static"
         },
         "egress_lossy_pool": {
-            "size": "7582515",
+            "size": "7326924",
             "type": "egress",
             "mode": "dynamic"
         }

device/arista/x86_64-arista_7050_qx32s/Arista-7050QX32S-Q32/pg_profile_lookup.ini

@@ -0,0 +1,11 @@
+# PG lossless profiles.
+# speed cable size      xon     xoff   threshold xon_offset
+  40000  5m   56368     18432   55120  -3        2496
+  50000  5m   56368     18432   55120  -3        2496
+ 100000  5m   56368     18432   55120  -3        2496
+  40000  40m  56368     18432   55120  -3        2496
+  50000  40m  56368     18432   55120  -3        2496
+ 100000  40m  56368     18432   55120  -3        2496
+  40000  300m 56368     18432   55120  -3        2496
+  50000  300m 56368     18432   55120  -3        2496
+ 100000  300m 56368     18432   55120  -3        2496

device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-C32/BALANCED

@@ -0,0 +1 @@
+../../../common/profiles/th/gen/BALANCED

device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-C32/RDMA-CENTRIC

@@ -0,0 +1 @@
+../../../common/profiles/th/gen/RDMA-CENTRIC

device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-C32/TCP-CENTRIC

@@ -0,0 +1 @@
+../../../common/profiles/th/gen/TCP-CENTRIC

device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-C32/buffer_ports_t0.j2

@@ -0,0 +1,6 @@
+{%- macro generate_port_lists(PORT_ALL) %}
+    {# Generate list of ports #}
+    {%- for port_idx in range(0,128,4) %}
+        {%- if PORT_ALL.append("Ethernet%d" % (port_idx)) %}{%- endif %}
+    {%- endfor %}
+{%- endmacro %}

device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-C32/buffer_ports_t1.j2

@@ -0,0 +1,6 @@
+{%- macro generate_port_lists(PORT_ALL) %}
+    {# Generate list of ports #}
+    {%- for port_idx in range(0,128,4) %}
+        {%- if PORT_ALL.append("Ethernet%d" % (port_idx)) %}{%- endif %}
+    {%- endfor %}
+{%- endmacro %}

device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-C32/buffers_defaults_t0.j2

@@ -1,47 +0,0 @@
-
-{%- set default_cable = '5m' %}
-
-{%- macro generate_port_lists(PORT_ALL) %}
-    {# Generate list of ports #}
-    {%- for port_idx in range(0,128,4) %}
-        {%- if PORT_ALL.append("Ethernet%d" % (port_idx)) %}{%- endif %}
-    {%- endfor %}
-{%- endmacro %}
-
-{%- macro generate_buffer_pool_and_profiles() %}
-    "BUFFER_POOL": {
-        "ingress_lossless_pool": {
-            "size": "11213696",
-            "type": "ingress",
-            "mode": "dynamic",
-            "xoff": "3855488"
-        },
-        "egress_lossy_pool": {
-            "size": "9532224",
-            "type": "egress",
-            "mode": "dynamic"
-        },
-        "egress_lossless_pool": {
-            "size": "15982720",
-            "type": "egress",
-            "mode": "static"
-        }
-    },
-    "BUFFER_PROFILE": {
-        "ingress_lossy_profile": {
-            "pool":"[BUFFER_POOL|ingress_lossless_pool]",
-            "size":"0",
-            "dynamic_th":"3"
-        },
-        "egress_lossless_profile": {
-            "pool":"[BUFFER_POOL|egress_lossless_pool]",
-            "size":"1518",
-            "static_th":"3995680"
-        },
-        "egress_lossy_profile": {
-            "pool":"[BUFFER_POOL|egress_lossy_pool]",
-            "size":"1518",
-            "dynamic_th":"3"
-        }
-    },
-{%- endmacro %}

device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-C32/buffers_defaults_t0.j2

@@ -0,0 +1 @@
+BALANCED/buffers_defaults_t0.j2

device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-C32/buffers_defaults_t1.j2

@@ -1,47 +0,0 @@
-
-{%- set default_cable = '40m' %}
-
-{%- macro generate_port_lists(PORT_ALL) %}
-    {# Generate list of ports #}
-    {%- for port_idx in range(0,128,4) %}
-        {%- if PORT_ALL.append("Ethernet%d" % (port_idx)) %}{%- endif %}
-    {%- endfor %}
-{%- endmacro %}
-
-{%- macro generate_buffer_pool_and_profiles() %}
-    "BUFFER_POOL": {
-        "ingress_lossless_pool": {
-            "size": "10443264",
-            "type": "ingress",
-            "mode": "dynamic",
-            "xoff": "4625920"
-        },
-        "egress_lossy_pool": {
-            "size": "8877440",
-            "type": "egress",
-            "mode": "dynamic"
-        },
-        "egress_lossless_pool": {
-            "size": "15982720",
-            "type": "egress",
-            "mode": "static"
-        }
-    },
-    "BUFFER_PROFILE": {
-        "ingress_lossy_profile": {
-            "pool":"[BUFFER_POOL|ingress_lossless_pool]",
-            "size":"0",
-            "dynamic_th":"3"
-        },
-        "egress_lossless_profile": {
-            "pool":"[BUFFER_POOL|egress_lossless_pool]",
-            "size":"1518",
-            "static_th":"3995680"
-        },
-        "egress_lossy_profile": {
-            "pool":"[BUFFER_POOL|egress_lossy_pool]",
-            "size":"1518",
-            "dynamic_th":"3"
-        }
-    },
-{%- endmacro %}

device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-C32/buffers_defaults_t1.j2

@@ -0,0 +1 @@
+BALANCED/buffers_defaults_t1.j2

device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-C32/pg_profile_lookup.ini

@@ -1,17 +0,0 @@
-# PG lossless profiles.
-# speed cable size    xon  xoff threshold xon_offset
-  10000  5m   1248    2288 35776  -3        2288
-  25000  5m   1248    2288 53248  -3        2288
-  40000  5m   1248    2288 66560  -3        2288
-  50000  5m   1248    2288 90272  -3        2288
- 100000  5m   1248    2288 165568 -3        2288
-  10000  40m  1248    2288 37024  -3        2288
-  25000  40m  1248    2288 53248  -3        2288
-  40000  40m  1248    2288 71552  -3        2288
-  50000  40m  1248    2288 96096  -3        2288
- 100000  40m  1248    2288 177632 -3        2288
-  10000  300m 1248    2288 46176  -3        2288
-  25000  300m 1248    2288 79040  -3        2288
-  40000  300m 1248    2288 108160 -3        2288
-  50000  300m 1248    2288 141856 -3        2288
- 100000  300m 1248    2288 268736 -3        2288

device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-C32/pg_profile_lookup.ini

@@ -0,0 +1 @@
+BALANCED/pg_profile_lookup.ini

device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-C32/qos.json.j2

@@ -1 +0,0 @@
-{%- include 'qos_config.j2' %}

device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-C32/qos.json.j2

@@ -0,0 +1 @@
+BALANCED/qos.json.j2

device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-C32/th-a7060-cx32s-32x100G-t1.config.bcm

@@ -444,3 +444,5 @@ serdes_driver_current_109=0xa
 serdes_preemphasis_109=0x284008
 
 mmu_init_config="MSFT-TH-Tier1"
+
+phy_an_lt_msft=1

device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-D48C8/BALANCED

@@ -0,0 +1 @@
+../../../common/profiles/th/gen/BALANCED

device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-D48C8/RDMA-CENTRIC

@@ -0,0 +1 @@
+../../../common/profiles/th/gen/RDMA-CENTRIC

device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-D48C8/TCP-CENTRIC

@@ -0,0 +1 @@
+../../../common/profiles/th/gen/TCP-CENTRIC

device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-D48C8/buffer_ports_t0.j2

@@ -0,0 +1,21 @@
+{%- macro generate_port_lists(PORT_ALL) %}
+    {# Generate list of ports #}
+    {%- for port_idx in range(0,6) %}
+        {%- if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{%- endif %}
+        {%- if PORT_ALL.append("Ethernet%d" % (port_idx * 4 + 2)) %}{%- endif %}
+    {%- endfor %}
+    {%- for port_idx in range(10,22) %}
+        {%- if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{%- endif %}
+        {%- if PORT_ALL.append("Ethernet%d" % (port_idx * 4 + 2)) %}{%- endif %}
+    {%- endfor %}
+    {%- for port_idx in range(26,32) %}
+        {%- if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{%- endif %}
+        {%- if PORT_ALL.append("Ethernet%d" % (port_idx * 4 + 2)) %}{%- endif %}
+    {%- endfor %}
+    {%- for port_idx in range(6,10) %}
+        {%- if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{%- endif %}
+    {%- endfor %}
+    {%- for port_idx in range(22,26) %}
+        {%- if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{%- endif %}
+    {%- endfor %}
+{%- endmacro %}

device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-D48C8/buffers_defaults_t0.j2

@@ -1,61 +0,0 @@
-{%- set default_cable = '5m' %}
-
-{%- macro generate_port_lists(PORT_ALL) %}
-    {# Generate list of ports #}
-    {%- for port_idx in range(0,6) %}
-        {%- if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{%- endif %}
-        {%- if PORT_ALL.append("Ethernet%d" % (port_idx * 4 + 2)) %}{%- endif %}
-    {%- endfor %}
-    {%- for port_idx in range(10,22) %}
-        {%- if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{%- endif %}
-        {%- if PORT_ALL.append("Ethernet%d" % (port_idx * 4 + 2)) %}{%- endif %}
-    {%- endfor %}
-    {%- for port_idx in range(24,32) %}
-        {%- if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{%- endif %}
-        {%- if PORT_ALL.append("Ethernet%d" % (port_idx * 4 + 2)) %}{%- endif %}
-    {%- endfor %}
-    {%- for port_idx in range(6,10) %}
-        {%- if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{%- endif %}
-    {%- endfor %}
-    {%- for port_idx in range(22,24) %}
-        {%- if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{%- endif %}
-    {%- endfor %}
-{%- endmacro %}
-
-{%- macro generate_buffer_pool_and_profiles() %}
-    "BUFFER_POOL": {
-        "ingress_lossless_pool": {
-            "size": "11213696",
-            "type": "ingress",
-            "mode": "dynamic",
-            "xoff": "3855488"
-        },
-        "egress_lossy_pool": {
-            "size": "9532224",
-            "type": "egress",
-            "mode": "dynamic"
-        },
-        "egress_lossless_pool": {
-            "size": "15982720",
-            "type": "egress",
-            "mode": "static"
-        }
-    },
-    "BUFFER_PROFILE": {
-        "ingress_lossy_profile": {
-            "pool":"[BUFFER_POOL|ingress_lossless_pool]",
-            "size":"0",
-            "dynamic_th":"3"
-        },
-        "egress_lossless_profile": {
-            "pool":"[BUFFER_POOL|egress_lossless_pool]",
-            "size":"1518",
-            "static_th":"3995680"
-        },
-        "egress_lossy_profile": {
-            "pool":"[BUFFER_POOL|egress_lossy_pool]",
-            "size":"1518",
-            "dynamic_th":"3"
-        }
-    },
-{%- endmacro %}

device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-D48C8/buffers_defaults_t0.j2

@@ -0,0 +1 @@
+BALANCED/buffers_defaults_t0.j2

device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-D48C8/pg_profile_lookup.ini

@@ -1,17 +0,0 @@
-# PG lossless profiles.
-# speed cable size    xon  xoff threshold xon_offset
-  10000  5m   1248    2288 35776  -3        2288
-  25000  5m   1248    2288 53248  -3        2288
-  40000  5m   1248    2288 66560  -3        2288
-  50000  5m   1248    2288 79872  -3        2288
- 100000  5m   1248    2288 165568 -3        2288
-  10000  40m  1248    2288 37024  -3        2288
-  25000  40m  1248    2288 56160  -3        2288
-  40000  40m  1248    2288 71552  -3        2288
-  50000  40m  1248    2288 85696  -3        2288
- 100000  40m  1248    2288 177632 -3        2288
-  10000  300m 1248    2288 46176  -3        2288
-  25000  300m 1248    2288 79040  -3        2288
-  40000  300m 1248    2288 108160 -3        2288
-  50000  300m 1248    2288 131456 -3        2288
- 100000  300m 1248    2288 268736 -3        2288

device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-D48C8/pg_profile_lookup.ini

@@ -0,0 +1 @@
+BALANCED/pg_profile_lookup.ini

device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-D48C8/qos.json.j2

@@ -1 +0,0 @@
-{%- include 'qos_config.j2' %}

device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-D48C8/qos.json.j2

@@ -0,0 +1 @@
+BALANCED/qos.json.j2

device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-D48C8/th-a7060-cx32s-8x100G+48x50G.config.bcm

@@ -545,3 +545,5 @@ serdes_driver_current_115=0xa
 serdes_preemphasis_115=0x284008
 
 mmu_init_config="MSFT-TH-Tier0"
+
+phy_an_lt_msft=1

device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-Q32/BALANCED

@@ -0,0 +1 @@
+../../../common/profiles/th/gen/BALANCED

device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-Q32/RDMA-CENTRIC

@@ -0,0 +1 @@
+../../../common/profiles/th/gen/RDMA-CENTRIC

device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-Q32/TCP-CENTRIC

@@ -0,0 +1 @@
+../../../common/profiles/th/gen/TCP-CENTRIC

device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-Q32/buffer_ports_t0.j2

@@ -0,0 +1,6 @@
+{%- macro generate_port_lists(PORT_ALL) %}
+    {# Generate list of ports #}
+    {%- for port_idx in range(0,128,4) %}
+        {%- if PORT_ALL.append("Ethernet%d" % (port_idx)) %}{%- endif %}
+    {%- endfor %}
+{%- endmacro %}

device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-Q32/buffer_ports_t1.j2

@@ -0,0 +1,6 @@
+{%- macro generate_port_lists(PORT_ALL) %}
+    {# Generate list of ports #}
+    {%- for port_idx in range(0,128,4) %}
+        {%- if PORT_ALL.append("Ethernet%d" % (port_idx)) %}{%- endif %}
+    {%- endfor %}
+{%- endmacro %}

device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-Q32/buffers_defaults_t0.j2

@@ -1,47 +0,0 @@
-
-{%- set default_cable = '5m' %}
-
-{%- macro generate_port_lists(PORT_ALL) %}
-    {# Generate list of ports #}
-    {%- for port_idx in range(0,128,4) %}
-        {%- if PORT_ALL.append("Ethernet%d" % (port_idx)) %}{%- endif %}
-    {%- endfor %}
-{%- endmacro %}
-
-{%- macro generate_buffer_pool_and_profiles() %}
-    "BUFFER_POOL": {
-        "ingress_lossless_pool": {
-            "size": "11213696",
-            "type": "ingress",
-            "mode": "dynamic",
-            "xoff": "3855488"
-        },
-        "egress_lossy_pool": {
-            "size": "9532224",
-            "type": "egress",
-            "mode": "dynamic"
-        },
-        "egress_lossless_pool": {
-            "size": "15982720",
-            "type": "egress",
-            "mode": "static"
-        }
-    },
-    "BUFFER_PROFILE": {
-        "ingress_lossy_profile": {
-            "pool":"[BUFFER_POOL|ingress_lossless_pool]",
-            "size":"0",
-            "dynamic_th":"3"
-        },
-        "egress_lossless_profile": {
-            "pool":"[BUFFER_POOL|egress_lossless_pool]",
-            "size":"1518",
-            "static_th":"3995680"
-        },
-        "egress_lossy_profile": {
-            "pool":"[BUFFER_POOL|egress_lossy_pool]",
-            "size":"1518",
-            "dynamic_th":"3"
-        }
-    },
-{%- endmacro %}

device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-Q32/buffers_defaults_t0.j2

@@ -0,0 +1 @@
+BALANCED/buffers_defaults_t0.j2

device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-Q32/buffers_defaults_t1.j2

@@ -1,47 +0,0 @@
-
-{%- set default_cable = '40m' %}
-
-{%- macro generate_port_lists(PORT_ALL) %}
-    {# Generate list of ports #}
-    {%- for port_idx in range(0,128,4) %}
-        {%- if PORT_ALL.append("Ethernet%d" % (port_idx)) %}{%- endif %}
-    {%- endfor %}
-{%- endmacro %}
-
-{%- macro generate_buffer_pool_and_profiles() %}
-    "BUFFER_POOL": {
-        "ingress_lossless_pool": {
-            "size": "10443264",
-            "type": "ingress",
-            "mode": "dynamic",
-            "xoff": "4625920"
-        },
-        "egress_lossy_pool": {
-            "size": "8877440",
-            "type": "egress",
-            "mode": "dynamic"
-        },
-        "egress_lossless_pool": {
-            "size": "15982720",
-            "type": "egress",
-            "mode": "static"
-        }
-    },
-    "BUFFER_PROFILE": {
-        "ingress_lossy_profile": {
-            "pool":"[BUFFER_POOL|ingress_lossless_pool]",
-            "size":"0",
-            "dynamic_th":"3"
-        },
-        "egress_lossless_profile": {
-            "pool":"[BUFFER_POOL|egress_lossless_pool]",
-            "size":"1518",
-            "static_th":"3995680"
-        },
-        "egress_lossy_profile": {
-            "pool":"[BUFFER_POOL|egress_lossy_pool]",
-            "size":"1518",
-            "dynamic_th":"3"
-        }
-    },
-{%- endmacro %}

device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-Q32/buffers_defaults_t1.j2

@@ -0,0 +1 @@
+BALANCED/buffers_defaults_t1.j2

device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-Q32/pg_profile_lookup.ini

@@ -1,17 +0,0 @@
-# PG lossless profiles.
-# speed cable size    xon  xoff threshold xon_offset
-  10000  5m   1248    2288 35776  -3        2288
-  25000  5m   1248    2288 53248  -3        2288
-  40000  5m   1248    2288 66560  -3        2288
-  50000  5m   1248    2288 90272  -3        2288
- 100000  5m   1248    2288 165568 -3        2288
-  10000  40m  1248    2288 37024  -3        2288
-  25000  40m  1248    2288 53248  -3        2288
-  40000  40m  1248    2288 71552  -3        2288
-  50000  40m  1248    2288 96096  -3        2288
- 100000  40m  1248    2288 177632 -3        2288
-  10000  300m 1248    2288 46176  -3        2288
-  25000  300m 1248    2288 79040  -3        2288
-  40000  300m 1248    2288 108160 -3        2288
-  50000  300m 1248    2288 141856 -3        2288
- 100000  300m 1248    2288 268736 -3        2288

device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-Q32/pg_profile_lookup.ini

@@ -0,0 +1 @@
+BALANCED/pg_profile_lookup.ini

device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-Q32/qos.json.j2

@@ -1 +0,0 @@
-{%- include 'qos_config.j2' %}

device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-Q32/qos.json.j2

@@ -0,0 +1 @@
+BALANCED/qos.json.j2

device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-Q32/th-a7060-cx32s-32x40G-t0.config.bcm

@@ -442,3 +442,5 @@ serdes_driver_current_109=0x4
 serdes_preemphasis_109=0x145c00
 
 mmu_init_config="MSFT-TH-Tier0"
+
+phy_an_lt_msft=1

device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-Q32/th-a7060-cx32s-32x40G-t1.config.bcm

@@ -442,3 +442,5 @@ serdes_driver_current_109=0x4
 serdes_preemphasis_109=0x145c00
 
 mmu_init_config="MSFT-TH-Tier1"
+
+phy_an_lt_msft=1

device/arista/x86_64-arista_7060_cx32s/platform-init

@@ -0,0 +1,3 @@
+# Increase PCIe timeout value to 210ms
+setpci -s01:00.0 CAP_EXP+0x28.B=6
+setpci -s01:00.1 CAP_EXP+0x28.B=6

device/arista/x86_64-arista_7170_64c/Arista-7170-Q59S20/port_config.ini

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

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

@@ -0,0 +1,32 @@
+{
+    "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",
+            "switchsai": "lib/libswitchsai.so",
+            "switchapi_port_add": false
+        }
+    ]
+}

device/arista/x86_64-arista_7170_64c/fancontrol

@@ -1,6 +1,6 @@
 INTERVAL=5
 DEVPATH=hwmon2=devices/pci0000:00/0000:00:1c.0/0000:06:00.0/i2c-8/8-004c hwmon4=devices/pci0000:ff/0000:ff:0b.3/i2c-93/93-0060
-DEVNAME=hwmon2=max6658 hwmon4=rook_cpld
+DEVNAME=hwmon2=max6658 hwmon4=la_cpld
 FCTEMPS=hwmon4/pwm4=hwmon2/temp1_input hwmon4/pwm3=hwmon2/temp1_input hwmon4/pwm2=hwmon2/temp1_input hwmon4/pwm1=hwmon2/temp1_input
 FCFANS=hwmon4/pwm4=hwmon4/fan4_input hwmon4/pwm3=hwmon4/fan3_input hwmon4/pwm2=hwmon4/fan2_input hwmon4/pwm1=hwmon4/fan1_input
 MINTEMP=hwmon4/pwm4=50 hwmon4/pwm3=50 hwmon4/pwm2=50 hwmon4/pwm1=50

device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/BALANCED

@@ -0,0 +1 @@
+../../../common/profiles/th2/7260/BALANCED

device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/RDMA-CENTRIC

@@ -0,0 +1 @@
+../../../common/profiles/th2/7260/RDMA-CENTRIC

device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/TCP-CENTRIC

@@ -0,0 +1 @@
+../../../common/profiles/th2/7260/TCP-CENTRIC

device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/buffer_ports_t0.j2

@@ -0,0 +1,6 @@
+{%- macro generate_port_lists(PORT_ALL) %}
+    {# Generate list of ports #}
+    {%- for port_idx in range(0,64) %}
+        {%- if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{%- endif %}
+    {%- endfor %}
+{%- endmacro %}

device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/buffer_ports_t1.j2

@@ -0,0 +1,6 @@
+{%- macro generate_port_lists(PORT_ALL) %}
+    {# Generate list of ports #}
+    {%- for port_idx in range(0,64) %}
+        {%- if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{%- endif %}
+    {%- endfor %}
+{%- endmacro %}

device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/buffers.json.j2

@@ -0,0 +1,3 @@
+{%- set default_topo = 't1' %}
+{%- include 'buffers_config.j2' %}
+

device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/buffers_defaults_t0.j2

@@ -0,0 +1 @@
+BALANCED/buffers_defaults_t0.j2

device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/buffers_defaults_t1.j2

@@ -0,0 +1 @@
+BALANCED/buffers_defaults_t1.j2

device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/pg_profile_lookup.ini

@@ -0,0 +1 @@
+BALANCED/pg_profile_lookup.ini

device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/qos.json.j2

@@ -0,0 +1 @@
+BALANCED/qos.json.j2

device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/sai.profile

@@ -1 +0,0 @@
-SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/th2-a7260cx3-64-64x100G.config.bcm

device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/sai.profile.j2

@@ -0,0 +1,13 @@
+{# Get sai.profile based on switch_role #}
+{%- if DEVICE_METADATA is defined -%}
+{%-     set switch_role = DEVICE_METADATA['localhost']['type'] -%}
+{%-     if 'torrouter' in switch_role.lower() or 'torswitch' in switch_role.lower() %}
+{%         set sai_profile_contents = 'SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/th2-a7260cx3-64-64x100G-t0.config.bcm' -%}
+{%-     else %}
+{%         set sai_profile_contents = 'SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/th2-a7260cx3-64-64x100G-t1.config.bcm' -%}
+{%-     endif %}
+{%- else %}
+{%      set sai_profile_contents = 'SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/th2-a7260cx3-64-64x100G-t1.config.bcm' -%}
+{%- endif %}
+{# Write the contents of sai_ profile_filename to sai.profile file #}
+{{ sai_profile_contents }}

device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/th2-a7260cx3-64-64x100G-t0.config.bcm

@@ -939,7 +939,6 @@ portmap_9=17:100
 robust_hash_disable_egress_vlan=1
 robust_hash_disable_mpls=1
 robust_hash_disable_vlan=1
-sram_scan_enable=0
 stable_size=0x5500000
 stable_size=0x5500000
 tdma_timeout_usec=15000000
@@ -978,7 +977,7 @@ serdes_preemphasis_46=0x144108
 serdes_preemphasis_47=0x103a07
 serdes_preemphasis_48=0x194407
 serdes_preemphasis_49=0x194407
-serdes_preemphasis_66=0x62f01
+serdes_preemphasis_66=0x43004
 serdes_preemphasis_68=0x164308
 serdes_preemphasis_69=0x164408
 serdes_preemphasis_70=0xe3206
@@ -995,7 +994,7 @@ serdes_preemphasis_80=0x184606
 serdes_preemphasis_81=0x184407
 serdes_preemphasis_82=0x103706
 serdes_preemphasis_83=0x103706
-serdes_preemphasis_100=0x62f01
+serdes_preemphasis_100=0x43004
 serdes_preemphasis_102=0x184408
 serdes_preemphasis_103=0x184606
 serdes_preemphasis_104=0x184606
@@ -1012,3 +1011,7 @@ serdes_preemphasis_114=0x174507
 serdes_preemphasis_115=0x184606
 serdes_preemphasis_116=0x103706
 serdes_preemphasis_117=0x133c06
+
+mmu_init_config="MSFT-TH2-Tier0"
+
+phy_an_lt_msft=1

device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D108C8/BALANCED

@@ -0,0 +1 @@
+../../../common/profiles/th2/7260/BALANCED

device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D108C8/RDMA-CENTRIC

@@ -0,0 +1 @@
+../../../common/profiles/th2/7260/RDMA-CENTRIC

device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D108C8/TCP-CENTRIC

@@ -0,0 +1 @@
+../../../common/profiles/th2/7260/TCP-CENTRIC

device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D108C8/buffer_ports_t0.j2

@@ -0,0 +1,14 @@
+{%- macro generate_port_lists(PORT_ALL) %}
+    {# Generate list of ports #}
+    {%- for port_idx in range(0,12) %}
+        {%- if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{%- endif %}
+        {%- if PORT_ALL.append("Ethernet%d" % (port_idx * 4 + 2)) %}{%- endif %}
+    {%- endfor %}
+    {%- for port_idx in range(20,64) %}
+        {%- if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{%- endif %}
+        {%- if PORT_ALL.append("Ethernet%d" % (port_idx * 4 + 2)) %}{%- endif %}
+    {%- endfor %}
+    {%- for port_idx in range(12,20) %}
+        {%- if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{%- endif %}
+    {%- endfor %}
+{%- endmacro %}

device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D108C8/buffers_defaults_t0.j2

@@ -1,54 +0,0 @@
-{%- set default_cable = '5m' %}
-
-{%- macro generate_port_lists(PORT_ALL) %}
-    {# Generate list of ports #}
-    {%- for port_idx in range(0,12) %}
-        {%- if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{%- endif %}
-        {%- if PORT_ALL.append("Ethernet%d" % (port_idx * 4 + 2)) %}{%- endif %}
-    {%- endfor %}
-    {%- for port_idx in range(20,64) %}
-        {%- if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{%- endif %}
-        {%- if PORT_ALL.append("Ethernet%d" % (port_idx * 4 + 2)) %}{%- endif %}
-    {%- endfor %}
-    {%- for port_idx in range(12,20) %}
-        {%- if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{%- endif %}
-    {%- endfor %}
-{%- endmacro %}
-
-{%- macro generate_buffer_pool_and_profiles() %}
-    "BUFFER_POOL": {
-        "ingress_lossless_pool": {
-            "size": "32799936",
-            "type": "ingress",
-            "mode": "dynamic",
-            "xoff": "8356608"
-        },
-        "egress_lossy_pool": {
-            "size": "26240448",
-            "type": "egress",
-            "mode": "dynamic"
-        },
-        "egress_lossless_pool": {
-            "size": "42349632",
-            "type": "egress",
-            "mode": "static"
-        }
-    },
-    "BUFFER_PROFILE": {
-        "ingress_lossy_profile": {
-            "pool":"[BUFFER_POOL|ingress_lossless_pool]",
-            "size":"0",
-            "static_th":"11075584"
-        },
-        "egress_lossless_profile": {
-            "pool":"[BUFFER_POOL|egress_lossless_pool]",
-            "size":"0",
-            "static_th":"10587408"
-        },
-        "egress_lossy_profile": {
-            "pool":"[BUFFER_POOL|egress_lossy_pool]",
-            "size":"1664",
-            "dynamic_th":"-1"
-        }
-    },
-{%- endmacro %}