Merge remote-tracking branch 'origin/master' into use-chrony-ntp

Signed-off-by: Saikrishna Arcot <sarcot@microsoft.com>

Author: saiarcot895

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

@@ -37,8 +37,8 @@ parameters:
   - centec
   - centec-arm64
   - generic
-  - marvell-armhf
-  - marvell-arm64
+  - marvell-prestera-armhf
+  - marvell-prestera-arm64
   - mellanox
   - pensando
   - nvidia-bluefield

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

@@ -94,23 +94,23 @@ jobs:
           variables:
             dbg_image: yes
 
-        - name: marvell-armhf
+        - name: marvell-prestera-armhf
           ${{ if not(parameters.qemuOrCrossBuild) }}:
             pool: sonicbld-armhf
           timeoutInMinutes: 2880
           variables:
-            PLATFORM_NAME: marvell
+            PLATFORM_NAME: marvell-prestera
             PLATFORM_ARCH: armhf
 
-        - name: marvell-arm64
+        - name: marvell-prestera-arm64
           ${{ if not(parameters.qemuOrCrossBuild) }}:
             pool: sonicbld-arm64
           timeoutInMinutes: 2880
           variables:
-            PLATFORM_NAME: marvell
+            PLATFORM_NAME: marvell-prestera
             PLATFORM_ARCH: arm64
 
-        - name: marvell
+        - name: marvell-prestera
 
         - name: mellanox
           variables:

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

@@ -36,7 +36,7 @@ jobs:
       - script: |
           [ -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|marvell-arm64|vpp)$"; then
+          if [ -n "$(CACHE_MODE)" ] && echo $(PLATFORM_AZP) | grep -E -q "^(vs|broadcom|mellanox|marvell-prestera-armhf|marvell-prestera-arm64|vpp)$"; then
             CACHE_OPTIONS="SONIC_DPKG_CACHE_METHOD=$(CACHE_MODE) SONIC_DPKG_CACHE_SOURCE=/nfs/dpkg_cache/$(PLATFORM_AZP)"
             BUILD_OPTIONS="$BUILD_OPTIONS $CACHE_OPTIONS"
           fi

.azure-pipelines/build-template.yml

@@ -4,7 +4,7 @@ parameters:
   values:
   - broadcom
   - centec-arm64
-  - marvell-armhf
+  - marvell-prestera-armhf
   - mellanox
   - vs
 
@@ -21,7 +21,7 @@ parameters:
   values:
   - brcm
   - centec-arm64
-  - marvell-armhf
+  - marvell-prestera-armhf
   - mlnx
   - vs
 

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

@@ -20,6 +20,13 @@ pr:
     include:
     - dockers/docker-sonic-mgmt
 
+resources:
+  repositories:
+  - repository: sonic-mgmt
+    type: github
+    name: sonic-net/sonic-mgmt
+    endpoint: sonic-net
+
 parameters:
 - name: registry_url
   type: string
@@ -46,7 +53,6 @@ stages:
     - bash: |
         set -xe
         git submodule update --init --recursive -- src/sonic-platform-daemons src/sonic-genl-packet src/sonic-sairedis src/ptf src/sonic-device-data src/sonic-dash-api
-
         make SONIC_BUILD_JOBS=$(nproc) DEFAULT_CONTAINER_REGISTRY=publicmirror.azurecr.io ENABLE_DOCKER_BASE_PULL=y configure PLATFORM=generic
         make -f Makefile.work BLDENV=bullseye SONIC_BUILD_JOBS=$(nproc) DEFAULT_CONTAINER_REGISTRY=publicmirror.azurecr.io ENABLE_DOCKER_BASE_PULL=y LEGACY_SONIC_MGMT_DOCKER=y target/docker-sonic-mgmt.gz
         cp target -r $(Build.ArtifactStagingDirectory)/target
@@ -55,14 +61,44 @@ stages:
       env:
         REGISTRY_SERVER: ${{ parameters.registry_url }}
       displayName: Build docker-sonic-mgmt.gz
+
+    - publish:  $(Build.ArtifactStagingDirectory)
+      artifact: 'docker-sonic-mgmt'
+      displayName: "Archive docker image sonic-mgmt"
+
+  - job: validate_docker_image_and_upload
+    pool: sonicbld-1es
+    timeoutInMinutes: 360
+    dependsOn: Build
+    steps:
+    - checkout: sonic-mgmt
+      clean: true
+      displayName: 'Checkout sonic-mgmt'
+
+    - download: current
+      artifact: 'docker-sonic-mgmt'
+      displayName: "Download docker image sonic-mgmt"
+
+    - script: |
+        set -ex
+
+        docker load -i $(Pipeline.Workspace)/docker-sonic-mgmt/target/docker-sonic-mgmt.gz
+
+        cd ansible
+        sudo ./setup-management-network.sh -d
+        cd ../
+        docker rm -f sonic-mgmt
+
+        ./setup-container.sh -n sonic-mgmt -d /data -i docker-sonic-mgmt -v
+
+        docker exec sonic-mgmt bash -c "echo 'Container is running' && ps aux"
+      displayName: 'Setup sonic-mgmt docker container and verify'
+
     - task: Docker@2
       displayName: Upload image
+      condition: succeeded()
       inputs:
         containerRegistry: ${{ parameters.registry_conn }}
         repository: docker-sonic-mgmt
         command: push
         tags: latest
-    - publish:  $(Build.ArtifactStagingDirectory)
-      artifact: 'docker-sonic-mgmt'
-      displayName: "Archive docker image sonic-mgmt"
-

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

@@ -45,9 +45,9 @@ stages:
           variables:
             docker_syncd_rpc_image: yes
             platform_rpc: mlnx
-        - name: marvell-armhf
+        - name: marvell-prestera-armhf
           pool: sonicbld-armhf
           timeoutInMinutes: 1200
           variables:
-            PLATFORM_NAME: marvell
+            PLATFORM_NAME: marvell-prestera
             PLATFORM_ARCH: armhf

.gitmodules

@@ -118,12 +118,6 @@
 [submodule "src/sonic-dash-api"]
 	path = src/sonic-dash-api
 	url = https://github.com/sonic-net/sonic-dash-api.git
-[submodule "platform/marvell/mrvl-prestera"]
-	path = platform/marvell/mrvl-prestera
-	url = https://github.com/Marvell-switching/mrvl-prestera.git
-[submodule "platform/marvell/sonic-platform-marvell"]
-	path = platform/marvell/sonic-platform-marvell
-	url = https://github.com/Marvell-switching/sonic-platform-arm64.git
 [submodule "src/sonic-stp"]
 	path = src/sonic-stp
 	url = https://github.com/sonic-net/sonic-stp
@@ -132,4 +126,13 @@
 	url = https://github.com/Marvell-switching/sonic-platform-marvell.git
 [submodule "platform/vpp"]
 	path = platform/vpp
-	url = https://github.com/sonic-net/sonic-platform-vpp.git
+	url = https://github.com/sonic-net/sonic-platform-vpp.git
+[submodule "src/sonic-framework/gnoi"]
+	path = src/sonic-framework/gnoi
+	url = https://github.com/openconfig/gnoi
+[submodule "platform/marvell-prestera/mrvl-prestera"]
+	path = platform/marvell-prestera/mrvl-prestera
+	url = https://github.com/Marvell-switching/mrvl-prestera.git
+[submodule "platform/marvell-prestera/sonic-platform-marvell"]
+	path = platform/marvell-prestera/sonic-platform-marvell
+	url = https://github.com/Marvell-switching/sonic-platform-arm64.git

README.md

@@ -5,8 +5,8 @@
 [![Centec(arm64)](https://dev.azure.com/mssonic/build/_apis/build/status/centec/Azure.sonic-buildimage.official.centec-arm64?branchName=master&label=Centec-arm64)](https://dev.azure.com/mssonic/build/_build/latest?definitionId=140&branchName=master)
 [![Marvell-Teralynx](https://dev.azure.com/mssonic/build/_apis/build/status/innovium/Azure.sonic-buildimage.official.marvell-teralynx?branchName=master&label=Marvell-Teralynx)](https://dev.azure.com/mssonic/build/_build/latest?definitionId=148&branchName=master)
 [![Mellanox](https://dev.azure.com/mssonic/build/_apis/build/status/mellanox/Azure.sonic-buildimage.official.mellanox?branchName=master&label=Mellanox)](https://dev.azure.com/mssonic/build/_build/latest?definitionId=139&branchName=master)
-[![Marvell(armhf)](https://dev.azure.com/mssonic/build/_apis/build/status/marvell/Azure.sonic-buildimage.official.marvell-armhf?branchName=master&label=Marvell-armhf)](https://dev.azure.com/mssonic/build/_build/latest?definitionId=141&branchName=master)
-[![Marvell(arm64)](https://dev.azure.com/mssonic/build/_apis/build/status/marvell/Azure.sonic-buildimage.official.marvell-arm64?branchName=master&label=Marvell-arm64)](https://dev.azure.com/mssonic/build/_build/latest?definitionId=999&branchName=master)
+[![Marvell-Prestera(armhf)](https://dev.azure.com/mssonic/build/_apis/build/status/marvell-prestera/Azure.sonic-buildimage.official.marvell-prestera-armhf?branchName=master&label=Marvell-Prestera-armhf)](https://dev.azure.com/mssonic/build/_build/latest?definitionId=141&branchName=master)
+[![Marvell-Prestera(arm64)](https://dev.azure.com/mssonic/build/_apis/build/status/marvell-prestera/Azure.sonic-buildimage.official.marvell-prestera-arm64?branchName=master&label=Marvell-Prestera-arm64)](https://dev.azure.com/mssonic/build/_build/latest?definitionId=999&branchName=master)
 [![Nephos](https://dev.azure.com/mssonic/build/_apis/build/status/nephos/Azure.sonic-buildimage.official.nephos?branchName=master&label=Nephos)](https://dev.azure.com/mssonic/build/_build/latest?definitionId=149&branchName=master)
 [![Nvidia-Bluefield](https://dev.azure.com/mssonic/build/_apis/build/status/nvidia/Azure.sonic-buildimage.official.nvidia-bluefield?branchName=master&label=Nvidia-Bluefield)](https://dev.azure.com/mssonic/build/_build/latest?definitionId=1665&branchName=master)
 [![Pensando](https://dev.azure.com/mssonic/build/_apis/build/status/pensando/Azure.sonic-buildimage.official.pensando?branchName=master&label=Pensando)](https://dev.azure.com/mssonic/build/_build/latest?definitionId=1366&branchName=master)
@@ -209,12 +209,12 @@ The supported ASIC vendors are:
 
 * PLATFORM=barefoot
 * PLATFORM=broadcom
-* PLATFORM=marvell
+* PLATFORM=marvell-prestera
+* PLATFORM=marvell-teralynx
 * PLATFORM=mellanox
 * PLATFORM=centec
 * PLATFORM=nephos
 * PLATFORM=nvidia-bluefield
-* PLATFORM=marvell-teralynx
 * PLATFORM=vs
 
 ## Usage for ARM Architecture
@@ -235,22 +235,22 @@ make target/sonic-[ASIC_VENDER]-armhf.bin
 _example:_
 
 ```shell
-make configure PLATFORM=marvell PLATFORM_ARCH=armhf
-make target/sonic-marvell-armhf.bin
+make configure PLATFORM=marvell-prestera PLATFORM_ARCH=armhf
+make target/sonic-marvell-prestera-armhf.bin
 ```
 
-To build Arm32 bit for (ARMHF) Marvell platform on amd64 host for debian buster
+To build Arm32 bit for (ARMHF) Marvell Prestera platform on amd64 host for debian buster
 using cross-compilation, run the following commands:
 
 ```shell
 # Execute make configure once to configure ASIC and ARCH for cross-compilation build
 
 NOJESSIE=1 NOSTRETCH=1 BLDENV=buster CROSS_BLDENV=1 \
-make configure PLATFORM=marvell PLATFORM_ARCH=armhf
+make configure PLATFORM=marvell-prestera PLATFORM_ARCH=armhf
 
 # Execute Arm32 build using cross-compilation environment
 
-NOJESSIE=1 NOSTRETCH=1 BLDENV=buster CROSS_BLDENV=1 make target/sonic-marvell-armhf.bin
+NOJESSIE=1 NOSTRETCH=1 BLDENV=buster CROSS_BLDENV=1 make target/sonic-marvell-prestera-armhf.bin
 ```
 
 Running the above Arm32 build using cross-compilation instead of qemu emulator
@@ -265,7 +265,7 @@ make configure PLATFORM=[ASIC_VENDOR] PLATFORM_ARCH=arm64
 
 # example:
 
-make configure PLATFORM=marvell PLATFORM_ARCH=arm64
+make configure PLATFORM=marvell-prestera PLATFORM_ARCH=arm64
 ```
 
  **NOTE**:
@@ -374,6 +374,8 @@ on the SAI version for each SONiC release.
     and Nephos switch ASIC (gzip tar archive)
   * docker-syncd-mrvl-teralynx.gz: docker image for the daemon to sync database
     and Marvell-Teralynx switch ASIC (gzip tar archive)
+  * docker-syncd-mrvl-prestera.gz: docker image for the daemon to sync database
+    and Marvell-Prestera switch ASIC (gzip tar archive)
   * docker-sonic-p4.gz: docker image for all-in-one for p4 software switch
     (gzip tar archive)
   * docker-sonic-vs.gz: docker image for all-in-one for software virtual switch

azure-pipelines.yml

@@ -78,16 +78,16 @@ stages:
           dbg_image: yes
           docker_syncd_rpc_image: yes
           platform_rpc: mlnx
-      - name: marvell-arm64
+      - name: marvell-prestera-arm64
         pool: sonicbld-arm64
         variables:
-           PLATFORM_NAME: marvell
+           PLATFORM_NAME: marvell-prestera
            PLATFORM_ARCH: arm64
-      - name: marvell-armhf
+      - name: marvell-prestera-armhf
         pool: sonicbld-armhf
         timeoutInMinutes: 1200
         variables:
-          PLATFORM_NAME: marvell
+          PLATFORM_NAME: marvell-prestera
           PLATFORM_ARCH: armhf
           INCLUDE_RESTAPI: y
 

device/marvell/arm64-marvell_db98cx8580_32cd-r0/platform_asic

@@ -1 +1 @@
-marvell
+marvell-prestera

device/marvell/arm64-marvell_rd98DX35xx-r0/platform_asic

@@ -1 +1 @@
-marvell
+marvell-prestera

device/marvell/arm64-marvell_rd98DX35xx_cn9131-r0/platform_asic

@@ -1 +1 @@
-marvell
+marvell-prestera

device/marvell/x86_64-marvell_db98cx8514_10cc-r0/platform_asic

@@ -1 +1 @@
-marvell
+marvell-prestera

device/marvell/x86_64-marvell_db98cx8522_10cc-r0/platform_asic

@@ -1 +1 @@
-marvell
+marvell-prestera

device/marvell/x86_64-marvell_db98cx8540_16cd-r0/platform_asic

@@ -1 +1 @@
-marvell
+marvell-prestera

device/marvell/x86_64-marvell_db98cx8580_32cd-r0/platform_asic

@@ -1 +1 @@
-marvell
+marvell-prestera

device/marvell/x86_64-marvell_rd98DX35xx-r0/platform_asic

@@ -1 +1 @@
-marvell
+marvell-prestera

device/mellanox/x86_64-nvidia_sn4280-r0/Mellanox-SN4280-O28/create_only_config_db_buffers.json

@@ -0,0 +1,7 @@
+{
+    "DEVICE_METADATA": {
+        "localhost": {
+            "create_only_config_db_buffers": "true"
+        }
+    }
+}

device/mellanox/x86_64-nvidia_sn4280-r0/Mellanox-SN4280-O28/supporting_bulk_counter_groups

@@ -0,0 +1 @@
+QUEUE_WATERMARK_STAT_COUNTER,PG_WATERMARK_STAT_COUNTER,PFC_WD