Merge branch 'master' of github.com:ycoheNvidia/sonic-buildimage into…

… container_net_host_remove
sonic-net · Aug 14, 2023 · 5296455 · 5296455
2 parents 238a198 + 34bad34
commit 5296455
Show file tree

Hide file tree

Showing 704 changed files with 350,493 additions and 38,127 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -46,7 +46,7 @@
 [submodule "src/sonic-frr/frr"]
 	path = src/sonic-frr/frr
 	url = https://github.com/sonic-net/sonic-frr.git
-	branch = frr/8.2
+	branch = frr/8.5
 [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

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -28,6 +28,7 @@ resources:
   - repository: sonic-mgmt
     type: github
     name: sonic-net/sonic-mgmt
+    ref: master
     endpoint: sonic-net
   - repository: buildimage
     type: github
@@ -55,8 +56,6 @@ stages:
 
 - stage: Build
   pool: sonicbld
-  variables:
-    INSTALL_DEBUG_TOOLS: y
   dependsOn: []
   jobs:
   - template: .azure-pipelines/azure-pipelines-build.yml
@@ -67,6 +66,10 @@ stages:
         variables:
           swi_image: yes
       - name: mellanox
+        variables:
+          dbg_image: yes
+          docker_syncd_rpc_image: yes
+          platform_rpc: mlnx
       - name: marvell-arm64
         pool: sonicbld-arm64
         variables:
@@ -152,26 +155,26 @@ stages:
     timeoutInMinutes: 240
     continueOnError: false
     steps:
-    - template: .azure-pipelines/run-test-scheduler-template.yml
+    - template: .azure-pipelines/run-test-elastictest-template.yml@sonic-mgmt
       parameters:
         TOPOLOGY: t0
         MIN_WORKER: $(T0_INSTANCE_NUM)
         MAX_WORKER: $(T0_INSTANCE_NUM)
-        MGMT_BRANCH: master
+        MGMT_BRANCH: "master"
 
   - job: t0_2vlans_elastictest
     pool: ubuntu-20.04
     displayName: "kvmtest-t0-2vlans by Elastictest"
     timeoutInMinutes: 240
     continueOnError: false
     steps:
-    - template: .azure-pipelines/run-test-scheduler-template.yml
+    - template: .azure-pipelines/run-test-elastictest-template.yml@sonic-mgmt
       parameters:
         TOPOLOGY: t0
         TEST_SET: t0-2vlans
         MIN_WORKER: $(T0_2VLANS_INSTANCE_NUM)
         MAX_WORKER: $(T0_2VLANS_INSTANCE_NUM)
-        MGMT_BRANCH: master
+        MGMT_BRANCH: "master"
         DEPLOY_MG_EXTRA_PARAMS: "-e vlan_config=two_vlan_a"
 
   - job: t1_lag_elastictest
@@ -180,40 +183,40 @@ stages:
     timeoutInMinutes: 240
     continueOnError: false
     steps:
-    - template: .azure-pipelines/run-test-scheduler-template.yml
+    - template: .azure-pipelines/run-test-elastictest-template.yml@sonic-mgmt
       parameters:
         TOPOLOGY: t1-lag
         MIN_WORKER: $(T1_LAG_INSTANCE_NUM)
         MAX_WORKER: $(T1_LAG_INSTANCE_NUM)
-        MGMT_BRANCH: master
+        MGMT_BRANCH: "master"
 
   - job: multi_asic_elastictest
     displayName: "kvmtest-multi-asic-t1-lag by Elastictest"
     pool: ubuntu-20.04
     timeoutInMinutes: 240
     continueOnError: false
     steps:
-      - template: .azure-pipelines/run-test-scheduler-template.yml
+      - template: .azure-pipelines/run-test-elastictest-template.yml@sonic-mgmt
         parameters:
           TOPOLOGY: t1-8-lag
           TEST_SET: multi-asic-t1-lag
           MIN_WORKER: $(MULTI_ASIC_INSTANCE_NUM)
           MAX_WORKER: $(MULTI_ASIC_INSTANCE_NUM)
           NUM_ASIC: 4
-          MGMT_BRANCH: master
+          MGMT_BRANCH: "master"
 
   - job: dualtor_elastictest
     pool: ubuntu-20.04
     displayName: "kvmtest-dualtor-t0 by Elastictest"
     timeoutInMinutes: 240
     continueOnError: false
     steps:
-      - template: .azure-pipelines/run-test-scheduler-template.yml
+      - template: .azure-pipelines/run-test-elastictest-template.yml@sonic-mgmt
         parameters:
           TOPOLOGY: dualtor
           MIN_WORKER: $(T0_DUALTOR_INSTANCE_NUM)
           MAX_WORKER: $(T0_DUALTOR_INSTANCE_NUM)
-          MGMT_BRANCH: master
+          MGMT_BRANCH: "master"
           COMMON_EXTRA_PARAMS: "--disable_loganalyzer "
 
   - job: sonic_t0_elastictest
@@ -222,13 +225,13 @@ stages:
     timeoutInMinutes: 240
     continueOnError: false
     steps:
-      - template: .azure-pipelines/run-test-scheduler-template.yml
+      - template: .azure-pipelines/run-test-elastictest-template.yml@sonic-mgmt
         parameters:
           TOPOLOGY: t0-64-32
           MIN_WORKER: $(T0_SONIC_INSTANCE_NUM)
           MAX_WORKER: $(T0_SONIC_INSTANCE_NUM)
           TEST_SET: t0-sonic
-          MGMT_BRANCH: master
+          MGMT_BRANCH: "master"
           COMMON_EXTRA_PARAMS: "--neighbor_type=sonic "
           VM_TYPE: vsonic
 

diff --git a/...ce/arista/x86_64-arista_7060dx4_32/Arista-7060DX4-C32/th3-a7060dx4-c32-32x400G.config.bcm b/...ce/arista/x86_64-arista_7060dx4_32/Arista-7060DX4-C32/th3-a7060dx4-c32-32x400G.config.bcm
@@ -16,6 +16,8 @@ miim_intr_enable.0=0
 module_64ports.0=1
 multicast_l2_range.0=511
 oversubscribe_mode=1
+sai_tunnel_global_sip_mask_enable=1
+bcm_tunnel_term_compatible_mode=1
 parity_correction=1
 parity_enable=1
 pbmp_xport_xe.0=0x3ffffffffffffffffffffffffffffffffffffffe

diff --git a/device/arista/x86_64-arista_7060dx4_32/th3-a7060dx4-32-flex.config.bcm b/device/arista/x86_64-arista_7060dx4_32/th3-a7060dx4-32-flex.config.bcm
@@ -16,6 +16,8 @@ miim_intr_enable.0=0
 module_64ports.0=1
 multicast_l2_range.0=511
 oversubscribe_mode=1
+sai_tunnel_global_sip_mask_enable=1
+bcm_tunnel_term_compatible_mode=1
 parity_correction=1
 parity_enable=1
 pbmp_xport_xe.0=0x3ffffffffffffffffffffffffffffffffffffffe

diff --git a/device/arista/x86_64-arista_7060dx5_32/Arista-7060DX5-32/BALANCED b/device/arista/x86_64-arista_7060dx5_32/Arista-7060DX5-32/BALANCED
@@ -0,0 +1 @@
+../../../common/profiles/th4/gen/BALANCED
diff --git a/device/arista/x86_64-arista_7060dx5_32/Arista-7060DX5-32/buffers.json.j2 b/device/arista/x86_64-arista_7060dx5_32/Arista-7060DX5-32/buffers.json.j2
@@ -0,0 +1,2 @@
+{%- set default_topo = 't1' %}
+{%- include 'buffers_config.j2' %}
diff --git a/device/arista/x86_64-arista_7060dx5_32/Arista-7060DX5-32/buffers_defaults_t0.j2 b/device/arista/x86_64-arista_7060dx5_32/Arista-7060DX5-32/buffers_defaults_t0.j2
@@ -0,0 +1 @@
+BALANCED/buffers_defaults_t0.j2
diff --git a/device/arista/x86_64-arista_7060dx5_32/Arista-7060DX5-32/buffers_defaults_t1.j2 b/device/arista/x86_64-arista_7060dx5_32/Arista-7060DX5-32/buffers_defaults_t1.j2
@@ -0,0 +1 @@
+BALANCED/buffers_defaults_t1.j2
diff --git a/device/arista/x86_64-arista_7060dx5_32/Arista-7060DX5-32/hwsku.json b/device/arista/x86_64-arista_7060dx5_32/Arista-7060DX5-32/hwsku.json
@@ -0,0 +1,104 @@
+{
+    "interfaces": {
+        "Ethernet0": {
+            "default_brkout_mode": "1x400G[200G,100G,50G,40G,25G,10G]"
+        },
+        "Ethernet8": {
+            "default_brkout_mode": "1x400G[200G,100G,50G,40G,25G,10G]"
+        },
+        "Ethernet16": {
+            "default_brkout_mode": "1x400G[200G,100G,50G,40G,25G,10G]"
+        },
+        "Ethernet24": {
+            "default_brkout_mode": "1x400G[200G,100G,50G,40G,25G,10G]"
+        },
+        "Ethernet32": {
+            "default_brkout_mode": "1x400G[200G,100G,50G,40G,25G,10G]"
+        },
+        "Ethernet40": {
+            "default_brkout_mode": "1x400G[200G,100G,50G,40G,25G,10G]"
+        },
+        "Ethernet48": {
+            "default_brkout_mode": "1x400G[200G,100G,50G,40G,25G,10G]"
+        },
+        "Ethernet56": {
+            "default_brkout_mode": "1x400G[200G,100G,50G,40G,25G,10G]"
+        },
+        "Ethernet64": {
+            "default_brkout_mode": "1x400G[200G,100G,50G,40G,25G,10G]"
+        },
+        "Ethernet72": {
+            "default_brkout_mode": "1x400G[200G,100G,50G,40G,25G,10G]"
+        },
+        "Ethernet80": {
+            "default_brkout_mode": "1x400G[200G,100G,50G,40G,25G,10G]"
+        },
+        "Ethernet88": {
+            "default_brkout_mode": "1x400G[200G,100G,50G,40G,25G,10G]"
+        },
+        "Ethernet96": {
+            "default_brkout_mode": "1x400G[200G,100G,50G,40G,25G,10G]"
+        },
+        "Ethernet104": {
+            "default_brkout_mode": "1x400G[200G,100G,50G,40G,25G,10G]"
+        },
+        "Ethernet112": {
+            "default_brkout_mode": "1x400G[200G,100G,50G,40G,25G,10G]"
+        },
+        "Ethernet120": {
+            "default_brkout_mode": "1x400G[200G,100G,50G,40G,25G,10G]"
+        },
+        "Ethernet128": {
+            "default_brkout_mode": "1x400G[200G,100G,50G,40G,25G,10G]"
+        },
+        "Ethernet136": {
+            "default_brkout_mode": "1x400G[200G,100G,50G,40G,25G,10G]"
+        },
+        "Ethernet144": {
+            "default_brkout_mode": "1x400G[200G,100G,50G,40G,25G,10G]"
+        },
+        "Ethernet152": {
+            "default_brkout_mode": "1x400G[200G,100G,50G,40G,25G,10G]"
+        },
+        "Ethernet160": {
+            "default_brkout_mode": "1x400G[200G,100G,50G,40G,25G,10G]"
+        },
+        "Ethernet168": {
+            "default_brkout_mode": "1x400G[200G,100G,50G,40G,25G,10G]"
+        },
+        "Ethernet176": {
+            "default_brkout_mode": "1x400G[200G,100G,50G,40G,25G,10G]"
+        },
+        "Ethernet184": {
+            "default_brkout_mode": "1x400G[200G,100G,50G,40G,25G,10G]"
+        },
+        "Ethernet192": {
+            "default_brkout_mode": "1x400G[200G,100G,50G,40G,25G,10G]"
+        },
+        "Ethernet200": {
+            "default_brkout_mode": "1x400G[200G,100G,50G,40G,25G,10G]"
+        },
+        "Ethernet208": {
+            "default_brkout_mode": "1x400G[200G,100G,50G,40G,25G,10G]"
+        },
+        "Ethernet216": {
+            "default_brkout_mode": "1x400G[200G,100G,50G,40G,25G,10G]"
+        },
+        "Ethernet224": {
+            "default_brkout_mode": "1x400G[200G,100G,50G,40G,25G,10G]"
+        },
+        "Ethernet232": {
+            "default_brkout_mode": "1x400G[200G,100G,50G,40G,25G,10G]"
+        },
+        "Ethernet240": {
+            "default_brkout_mode": "1x400G[200G,100G,50G,40G,25G,10G]"
+        },
+        "Ethernet248": {
+            "default_brkout_mode": "1x400G[200G,100G,50G,40G,25G,10G]"
+        },
+        "Ethernet256": {
+            "default_brkout_mode": "1x10G",
+            "fec": "none"
+        }
+    }
+}
diff --git a/device/arista/x86_64-arista_7060dx5_32/Arista-7060DX5-32/pg_profile_lookup.ini b/device/arista/x86_64-arista_7060dx5_32/Arista-7060DX5-32/pg_profile_lookup.ini
@@ -0,0 +1 @@
+BALANCED/pg_profile_lookup.ini
diff --git a/device/arista/x86_64-arista_7060dx5_32/Arista-7060DX5-32/port_config.ini b/device/arista/x86_64-arista_7060dx5_32/Arista-7060DX5-32/port_config.ini
@@ -0,0 +1,34 @@
+# name          lanes                           alias        index  speed     fec
+Ethernet0       1,2,3,4,5,6,7,8                 Ethernet1/1  1      400000    rs
+Ethernet8       9,10,11,12,13,14,15,16          Ethernet2/1  2      400000    rs
+Ethernet16      17,18,19,20,21,22,23,24         Ethernet3/1  3      400000    rs
+Ethernet24      25,26,27,28,29,30,31,32         Ethernet4/1  4      400000    rs
+Ethernet32      33,34,35,36,37,38,39,40         Ethernet5/1  5      400000    rs
+Ethernet40      41,42,43,44,45,46,47,48         Ethernet6/1  6      400000    rs
+Ethernet48      49,50,51,52,53,54,55,56         Ethernet7/1  7      400000    rs
+Ethernet56      57,58,59,60,61,62,63,64         Ethernet8/1  8      400000    rs
+Ethernet64      65,66,67,68,69,70,71,72         Ethernet9/1  9      400000    rs
+Ethernet72      73,74,75,76,77,78,79,80         Ethernet10/1 10     400000    rs
+Ethernet80      81,82,83,84,85,86,87,88         Ethernet11/1 11     400000    rs
+Ethernet88      89,90,91,92,93,94,95,96         Ethernet12/1 12     400000    rs
+Ethernet96      97,98,99,100,101,102,103,104    Ethernet13/1 13     400000    rs
+Ethernet104     105,106,107,108,109,110,111,112 Ethernet14/1 14     400000    rs
+Ethernet112     113,114,115,116,117,118,119,120 Ethernet15/1 15     400000    rs
+Ethernet120     121,122,123,124,125,126,127,128 Ethernet16/1 16     400000    rs
+Ethernet128     385,386,387,388,389,390,391,392 Ethernet17/1 17     400000    rs
+Ethernet136     393,394,395,396,397,398,399,400 Ethernet18/1 18     400000    rs
+Ethernet144     401,402,403,404,405,406,407,408 Ethernet19/1 19     400000    rs
+Ethernet152     409,410,411,412,413,414,415,416 Ethernet20/1 20     400000    rs
+Ethernet160     417,418,419,420,421,422,423,424 Ethernet21/1 21     400000    rs
+Ethernet168     425,426,427,428,429,430,431,432 Ethernet22/1 22     400000    rs
+Ethernet176     433,434,435,436,437,438,439,440 Ethernet23/1 23     400000    rs
+Ethernet184     441,442,443,444,445,446,447,448 Ethernet24/1 24     400000    rs
+Ethernet192     449,450,451,452,453,454,455,456 Ethernet25/1 25     400000    rs
+Ethernet200     457,458,459,460,461,462,463,464 Ethernet26/1 26     400000    rs
+Ethernet208     465,466,467,468,469,470,471,472 Ethernet27/1 27     400000    rs
+Ethernet216     473,474,475,476,477,478,479,480 Ethernet28/1 28     400000    rs
+Ethernet224     481,482,483,484,485,486,487,488 Ethernet29/1 29     400000    rs
+Ethernet232     489,490,491,492,493,494,495,496 Ethernet30/1 30     400000    rs
+Ethernet240     497,498,499,500,501,502,503,504 Ethernet31/1 31     400000    rs
+Ethernet248     505,506,507,508,509,510,511,512 Ethernet32/1 32     400000    rs
+Ethernet256     513                             Ethernet33   33     10000     none
diff --git a/device/arista/x86_64-arista_7060dx5_32/Arista-7060DX5-32/qos.json.j2 b/device/arista/x86_64-arista_7060dx5_32/Arista-7060DX5-32/qos.json.j2
@@ -0,0 +1 @@
+{%- include 'qos_config.j2' %}
diff --git a/device/arista/x86_64-arista_7060dx5_32/Arista-7060DX5-32/sai.profile b/device/arista/x86_64-arista_7060dx5_32/Arista-7060DX5-32/sai.profile
@@ -0,0 +1 @@
+SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/th4-a7060dx5-32.config.bcm