Merge branch 'sonic-net:master' into add_rsyslog_plugin_support

sonic-net · Aug 30, 2023 · 3881575 · 3881575
2 parents 6d7a771 + 5e586a5
commit 3881575
Show file tree

Hide file tree

Showing 87 changed files with 723 additions and 326 deletions.
diff --git a/.azure-pipelines/dpkg-cache-cleanup.yml b/.azure-pipelines/dpkg-cache-cleanup.yml
@@ -15,13 +15,34 @@ trigger: none
 pr: none
 
 jobs:
-- job: Build
+- job: Amd
   pool: sonicbld
   timeoutInMinutes: 5
   steps:
   - checkout: none
   - script: |
-      set -xe
+      df -h
       sudo find /nfs/dpkg_cache/ -name *.tgz -mtime +30 -type f -delete
+      df -h
     displayName: clean dpkg cache
-    
+- job: Armhf
+  pool: sonicbld-armhf
+  timeoutInMinutes: 5
+  steps:
+  - checkout: none
+  - script: |
+      df -h
+      sudo find /nfs/dpkg_cache/ -name *.tgz -mtime +30 -type f -delete
+      df -h
+    displayName: clean dpkg cache
+- job: Arm64
+  pool: sonicbld-arm64
+  timeoutInMinutes: 5
+  steps:
+  - checkout: none
+  - script: |
+      df -h
+      sudo find /nfs/dpkg_cache/ -name *.tgz -mtime +30 -type f -delete
+      df -h
+    displayName: clean dpkg cache
+
diff --git a/device/arista/x86_64-arista_7050dx4_32s/pcie.yaml b/device/arista/x86_64-arista_7050dx4_32s/pcie.yaml
@@ -152,11 +152,6 @@
   id: '1466'
   name: 'Host bridge: Advanced Micro Devices, Inc. [AMD] Family 17h (Models 00h-0fh)
     Data Fabric: Device 18h; Function 6'
-- bus: '00'
-  dev: '18'
-  fn: '7'
-  id: '0001'
-  name: 'Host bridge: Arastra Inc. Device 0001'
 - bus: '01'
   dev: '00'
   fn: '0'

diff --git a/device/arista/x86_64-arista_7050px4_32s/pcie.yaml b/device/arista/x86_64-arista_7050px4_32s/pcie.yaml
@@ -152,11 +152,6 @@
   id: '1466'
   name: 'Host bridge: Advanced Micro Devices, Inc. [AMD] Family 17h (Models 00h-0fh)
     Data Fabric: Device 18h; Function 6'
-- bus: '00'
-  dev: '18'
-  fn: '7'
-  id: '0001'
-  name: 'Host bridge: Arastra Inc. Device 0001'
 - bus: '01'
   dev: '00'
   fn: '0'

diff --git a/device/arista/x86_64-arista_7050sx3_48c8/pcie.yaml b/device/arista/x86_64-arista_7050sx3_48c8/pcie.yaml
@@ -64,11 +64,6 @@
   id: '1578'
   name: 'Encryption controller: Advanced Micro Devices, Inc. [AMD] Carrizo Platform
     Security Processor'
-- bus: '00'
-  dev: 09
-  fn: '0'
-  id: '0001'
-  name: 'Host bridge: Arastra Inc. Device 0001'
 - bus: '00'
   dev: 09
   fn: '2'

diff --git a/device/arista/x86_64-arista_7050sx3_48yc8/pcie.yaml b/device/arista/x86_64-arista_7050sx3_48yc8/pcie.yaml
@@ -64,11 +64,6 @@
   id: '1578'
   name: 'Encryption controller: Advanced Micro Devices, Inc. [AMD] Carrizo Platform
     Security Processor'
-- bus: '00'
-  dev: 09
-  fn: '0'
-  id: '0001'
-  name: 'Host bridge: Arastra Inc. Device 0001'
 - bus: '00'
   dev: 09
   fn: '2'

diff --git a/device/arista/x86_64-arista_7060dx4_32/pcie.yaml b/device/arista/x86_64-arista_7060dx4_32/pcie.yaml
@@ -186,11 +186,6 @@
   id: 6f37
   name: 'Performance counters: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
     D R3 QPI Link 0/1 (rev 03)'
-- bus: ff
-  dev: 0b
-  fn: '3'
-  id: '0001'
-  name: 'System peripheral: Arastra Inc. Device 0001 (rev 03)'
 - bus: ff
   dev: 0c
   fn: '0'

diff --git a/device/arista/x86_64-arista_7060dx5_32/pcie.yaml b/device/arista/x86_64-arista_7060dx5_32/pcie.yaml
@@ -0,0 +1 @@
+../x86_64-arista_common/pcie.yaml
diff --git a/device/arista/x86_64-arista_7060dx5_64s/pcie.yaml b/device/arista/x86_64-arista_7060dx5_64s/pcie.yaml
@@ -0,0 +1 @@
+../x86_64-arista_common/pcie.yaml
diff --git a/device/arista/x86_64-arista_7060px4_32/pcie.yaml b/device/arista/x86_64-arista_7060px4_32/pcie.yaml
@@ -186,11 +186,6 @@
   id: 6f37
   name: 'Performance counters: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
     D R3 QPI Link 0/1 (rev 03)'
-- bus: ff
-  dev: 0b
-  fn: '3'
-  id: '0001'
-  name: 'System peripheral: Arastra Inc. Device 0001 (rev 03)'
 - bus: ff
   dev: 0c
   fn: '0'

diff --git a/device/arista/x86_64-arista_7060px5_64s/pcie.yaml b/device/arista/x86_64-arista_7060px5_64s/pcie.yaml
@@ -0,0 +1 @@
+../x86_64-arista_common/pcie.yaml
diff --git a/device/arista/x86_64-arista_7170_32cd/pcie.yaml b/device/arista/x86_64-arista_7170_32cd/pcie.yaml
@@ -186,11 +186,6 @@
   id: 6f37
   name: 'Performance counters: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
     D R3 QPI Link 0/1 (rev 03)'
-- bus: ff
-  dev: 0b
-  fn: '3'
-  id: '0001'
-  name: 'System peripheral: Arastra Inc. Device 0001 (rev 03)'
 - bus: ff
   dev: 0c
   fn: '0'

diff --git a/device/arista/x86_64-arista_7170_64c/pcie.yaml b/device/arista/x86_64-arista_7170_64c/pcie.yaml
@@ -174,11 +174,6 @@
   id: 6f37
   name: 'Performance counters: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
     D R3 QPI Link 0/1 (rev 03)'
-- bus: ff
-  dev: 0b
-  fn: '3'
-  id: '0001'
-  name: 'System peripheral: Arastra Inc. Device 0001 (rev 03)'
 - bus: ff
   dev: 0c
   fn: '0'

diff --git a/device/arista/x86_64-arista_720dt_48s/pcie.yaml b/device/arista/x86_64-arista_720dt_48s/pcie.yaml
@@ -90,11 +90,6 @@
   id: 15ee
   name: 'Host bridge: Advanced Micro Devices, Inc. [AMD] Raven/Raven2 Device 24: Function
     6'
-- bus: '00'
-  dev: '18'
-  fn: '7'
-  id: '0001'
-  name: 'Host bridge: Arista Networks, Inc. Device 0001'
 - bus: '01'
   dev: '00'
   fn: '0'

diff --git a/device/arista/x86_64-arista_7260cx3_64/pcie.yaml b/device/arista/x86_64-arista_7260cx3_64/pcie.yaml
@@ -179,11 +179,6 @@
   id: 6f37
   name: 'Performance counters: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
     D R3 QPI Link 0/1 (rev 03)'
-- bus: ff
-  dev: 0b
-  fn: '3'
-  id: '0001'
-  name: 'System peripheral: Arastra Inc. Device 0001 (rev 03)'
 - bus: ff
   dev: 0c
   fn: '0'

diff --git a/device/arista/x86_64-arista_7280cr3_32p4/pcie.yaml b/device/arista/x86_64-arista_7280cr3_32p4/pcie.yaml
@@ -64,11 +64,6 @@
   id: '1578'
   name: 'Encryption controller: Advanced Micro Devices, Inc. [AMD] Carrizo Platform
     Security Processor'
-- bus: '00'
-  dev: 09
-  fn: '0'
-  id: '0001'
-  name: 'Host bridge: Arista Networks, Inc. Device 0001'
 - bus: '00'
   dev: 09
   fn: '2'

diff --git a/device/arista/x86_64-arista_7800_sup/pcie.yaml b/device/arista/x86_64-arista_7800_sup/pcie.yaml
@@ -0,0 +1 @@
+../x86_64-arista_common/pcie.yaml
diff --git a/...86_64-arista_7800r3_48cq2_lc/Arista-7800R3-48CQ2-C48/jr2-a7280cr3-32d4-40x100G.config.bcm b/...86_64-arista_7800r3_48cq2_lc/Arista-7800R3-48CQ2-C48/jr2-a7280cr3-32d4-40x100G.config.bcm
@@ -860,3 +860,4 @@ dma_desc_aggregator_timeout_usec.BCM8869X=1000
 dma_desc_aggregator_enable_specific_MDB_LPM.BCM8869X=1
 dma_desc_aggregator_enable_specific_MDB_FEC.BCM8869X=1
 sai_pfc_dlr_init_capability=0 
+sai_default_cpu_tx_tc=7
diff --git a/device/arista/x86_64-arista_7800r3_48cq2_lc/pcie.yaml b/device/arista/x86_64-arista_7800r3_48cq2_lc/pcie.yaml
@@ -152,11 +152,6 @@
   id: '1466'
   name: 'Host bridge: Advanced Micro Devices, Inc. [AMD] Family 17h (Models 00h-0fh)
     Data Fabric: Device 18h; Function 6'
-- bus: '00'
-  dev: '18'
-  fn: '7'
-  id: '0001'
-  name: 'Host bridge: Arista Networks, Inc. Device 0001'
 - bus: '04'
   dev: '00'
   fn: '0'

diff --git a/device/arista/x86_64-arista_7800r3_48cqm2_lc/pcie.yaml b/device/arista/x86_64-arista_7800r3_48cqm2_lc/pcie.yaml
@@ -152,11 +152,6 @@
   id: '1466'
   name: 'Host bridge: Advanced Micro Devices, Inc. [AMD] Family 17h (Models 00h-0fh)
     Data Fabric: Device 18h; Function 6'
-- bus: '00'
-  dev: '18'
-  fn: '7'
-  id: '0001'
-  name: 'Host bridge: Arista Networks, Inc. Device 0001'
 - bus: '04'
   dev: '00'
   fn: '0'

diff --git a/...6_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-C36/0/j2p-a7800r3a-36d-36x400G.config.bcm b/...6_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-C36/0/j2p-a7800r3a-36d-36x400G.config.bcm
@@ -1014,3 +1014,4 @@ appl_param_nof_ports_per_modid=64
 xflow_macsec_secure_chan_to_num_secure_assoc_encrypt=2
 xflow_macsec_secure_chan_to_num_secure_assoc_decrypt=2
 sai_pfc_dlr_init_capability=0
+sai_default_cpu_tx_tc=7
diff --git a/...6_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-C36/1/j2p-a7800r3a-36d-36x400G.config.bcm b/...6_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-C36/1/j2p-a7800r3a-36d-36x400G.config.bcm
@@ -1014,3 +1014,4 @@ appl_param_nof_ports_per_modid=64
 xflow_macsec_secure_chan_to_num_secure_assoc_encrypt=2
 xflow_macsec_secure_chan_to_num_secure_assoc_decrypt=2
 sai_pfc_dlr_init_capability=0
+sai_default_cpu_tx_tc=7
diff --git a/...6_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-C72/0/j2p-a7800r3a-36d-36x400G.config.bcm b/...6_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-C72/0/j2p-a7800r3a-36d-36x400G.config.bcm
@@ -1031,3 +1031,4 @@ serdes_tx_taps_36=nrz:-8:89:-29:0:0:0
 xflow_macsec_secure_chan_to_num_secure_assoc_encrypt=2
 xflow_macsec_secure_chan_to_num_secure_assoc_decrypt=4
 sai_pfc_dlr_init_capability=0
+sai_default_cpu_tx_tc=7
diff --git a/...6_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-C72/1/j2p-a7800r3a-36d-36x400G.config.bcm b/...6_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-C72/1/j2p-a7800r3a-36d-36x400G.config.bcm
@@ -1031,3 +1031,4 @@ serdes_tx_taps_36=nrz:-7:85:-25:0:0:0
 xflow_macsec_secure_chan_to_num_secure_assoc_encrypt=2
 xflow_macsec_secure_chan_to_num_secure_assoc_decrypt=4
 sai_pfc_dlr_init_capability=0
+sai_default_cpu_tx_tc=7
diff --git a/...6_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-D36/0/j2p-a7800r3a-36d-36x400G.config.bcm b/...6_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-D36/0/j2p-a7800r3a-36d-36x400G.config.bcm
@@ -1051,3 +1051,4 @@ appl_param_nof_ports_per_modid=64
 xflow_macsec_secure_chan_to_num_secure_assoc_encrypt=2
 xflow_macsec_secure_chan_to_num_secure_assoc_decrypt=4
 sai_pfc_dlr_init_capability=0
+sai_default_cpu_tx_tc=7
diff --git a/...6_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-D36/1/j2p-a7800r3a-36d-36x400G.config.bcm b/...6_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-D36/1/j2p-a7800r3a-36d-36x400G.config.bcm
@@ -1051,3 +1051,4 @@ appl_param_nof_ports_per_modid=64
 xflow_macsec_secure_chan_to_num_secure_assoc_encrypt=2
 xflow_macsec_secure_chan_to_num_secure_assoc_decrypt=4
 sai_pfc_dlr_init_capability=0
+sai_default_cpu_tx_tc=7
diff --git a/device/arista/x86_64-arista_7800r3a_36d2_lc/pcie.yaml b/device/arista/x86_64-arista_7800r3a_36d2_lc/pcie.yaml
@@ -152,11 +152,6 @@
   id: '1466'
   name: 'Host bridge: Advanced Micro Devices, Inc. [AMD] Family 17h (Models 00h-0fh)
     Data Fabric: Device 18h; Function 6'
-- bus: '00'
-  dev: '18'
-  fn: '7'
-  id: '0001'
-  name: 'Host bridge: Arista Networks, Inc. Device 0001'
 - bus: '04'
   dev: '00'
   fn: '0'

diff --git a/device/arista/x86_64-arista_common/pcie.yaml b/device/arista/x86_64-arista_common/pcie.yaml
@@ -0,0 +1 @@
+[]
diff --git a/device/dell/x86_64-dell_s6100_c2538-r0/platform.json b/device/dell/x86_64-dell_s6100_c2538-r0/platform.json
@@ -469,7 +469,13 @@
             },
             {
                 "name": "QSFP+ or later"
-            }
+            },
+            {
+                "name": "SFP/SFP+/SFP28"
+            },
+            {
+                "name": "SFP/SFP+/SFP28"
+	    }
         ]
     },
     "interfaces": {}

diff --git a/device/dell/x86_64-dellemc_s5248f_c3538-r0/system_health_monitoring_config.json b/device/dell/x86_64-dellemc_s5248f_c3538-r0/system_health_monitoring_config.json
@@ -0,0 +1,11 @@
+{
+    "services_to_ignore": [],
+    "devices_to_ignore": ["fan.speed"],
+    "user_defined_checkers": [],
+    "polling_interval": 60,
+    "led_color": {
+        "fault"  : "amber",
+        "normal" : "green",
+        "booting": "blinking_green"
+    }
+}
diff --git a/device/dell/x86_64-dellemc_s5296f_c3538-r0/system_health_monitoring_config.json b/device/dell/x86_64-dellemc_s5296f_c3538-r0/system_health_monitoring_config.json
@@ -0,0 +1,11 @@
+{
+    "services_to_ignore": [],
+    "devices_to_ignore": ["fan.speed"],
+    "user_defined_checkers": [],
+    "polling_interval": 60,
+    "led_color": {
+        "fault"  : "amber",
+        "normal" : "green",
+        "booting": "blinking_green"
+    }
+}
diff --git a/device/dell/x86_64-dellemc_z9264f_c3538-r0/system_health_monitoring_config.json b/device/dell/x86_64-dellemc_z9264f_c3538-r0/system_health_monitoring_config.json
@@ -0,0 +1,11 @@
+{
+    "services_to_ignore": [],
+    "devices_to_ignore": ["fan.speed"],
+    "user_defined_checkers": [],
+    "polling_interval": 60,
+    "led_color": {
+        "fault"  : "amber",
+        "normal" : "green",
+        "booting": "blinking_green"
+    }
+}
diff --git a/device/mellanox/x86_64-nvidia_sn5600-r0/ACS-SN5600/sai_5600.xml b/device/mellanox/x86_64-nvidia_sn5600-r0/ACS-SN5600/sai_5600.xml
@@ -27,6 +27,9 @@
         <!-- Number of ports in the following port list -->
         <number-of-physical-ports>65</number-of-physical-ports>
 
+        <!-- Global port late create -->
+        <late-create-all-ports>1</late-create-all-ports>
+
         <!-- List of ports in the device -->
         <ports-list>
             <port-info>

diff --git a/device/mellanox/x86_64-nvidia_sn5600_simx-r0/ACS-SN5600/sai_5600.xml b/device/mellanox/x86_64-nvidia_sn5600_simx-r0/ACS-SN5600/sai_5600.xml
@@ -27,6 +27,9 @@
         <!-- Number of ports in the following port list -->
         <number-of-physical-ports>65</number-of-physical-ports>
 
+        <!-- Global port late create -->
+        <late-create-all-ports>1</late-create-all-ports>
+
         <!-- List of ports in the device -->
         <ports-list>
             <port-info>

diff --git a/...4-nokia_ixr7250e_36x400g-r0/Nokia-IXR7250E-36x100G/0/jr2cp-nokia-18x100g-4x25g-config.bcm b/...4-nokia_ixr7250e_36x400g-r0/Nokia-IXR7250E-36x100G/0/jr2cp-nokia-18x100g-4x25g-config.bcm
@@ -2093,3 +2093,4 @@ xflow_macsec_secure_chan_to_num_secure_assoc_decrypt=4
 cmic_dma_abort_in_cold_boot=0
 sai_pfc_dlr_init_capability=0
 trunk_group_max_members=16
+sai_default_cpu_tx_tc=7
diff --git a/...4-nokia_ixr7250e_36x400g-r0/Nokia-IXR7250E-36x100G/1/jr2cp-nokia-18x100g-4x25g-config.bcm b/...4-nokia_ixr7250e_36x400g-r0/Nokia-IXR7250E-36x100G/1/jr2cp-nokia-18x100g-4x25g-config.bcm
@@ -2094,3 +2094,4 @@ xflow_macsec_secure_chan_to_num_secure_assoc_decrypt=4
 cmic_dma_abort_in_cold_boot=0
 sai_pfc_dlr_init_capability=0
 trunk_group_max_members=16
+sai_default_cpu_tx_tc=7
diff --git a/.../x86_64-nokia_ixr7250e_36x400g-r0/Nokia-IXR7250E-36x400G/0/jr2cp-nokia-18x400g-config.bcm b/.../x86_64-nokia_ixr7250e_36x400g-r0/Nokia-IXR7250E-36x400G/0/jr2cp-nokia-18x400g-config.bcm
@@ -2095,3 +2095,4 @@ xflow_macsec_secure_chan_to_num_secure_assoc_decrypt=4
 cmic_dma_abort_in_cold_boot=0
 sai_pfc_dlr_init_capability=0
 trunk_group_max_members=16
+sai_default_cpu_tx_tc=7
diff --git a/.../x86_64-nokia_ixr7250e_36x400g-r0/Nokia-IXR7250E-36x400G/1/jr2cp-nokia-18x400g-config.bcm b/.../x86_64-nokia_ixr7250e_36x400g-r0/Nokia-IXR7250E-36x400G/1/jr2cp-nokia-18x400g-config.bcm
@@ -2097,3 +2097,4 @@ xflow_macsec_secure_chan_to_num_secure_assoc_decrypt=4
 cmic_dma_abort_in_cold_boot=0
 sai_pfc_dlr_init_capability=0
 trunk_group_max_members=16
+sai_default_cpu_tx_tc=7
diff --git a/dockers/docker-fpm-frr/frr/bgpd/templates/sentinels/policies.conf.j2 b/dockers/docker-fpm-frr/frr/bgpd/templates/sentinels/policies.conf.j2
@@ -2,7 +2,7 @@
 ! template: bgpd/templates/sentinels/policies.conf.j2
 !
 {% if constants.bgp.sentinel_community is defined %}
-bgp community-list standard sentinel_community permit {{ constants.bgp.sentinel_community }}
+bgp community-list standard sentinel_community permit {{ constants.bgp.sentinel_community }} no-export
 !
 route-map FROM_BGP_SENTINEL permit 100
  match community sentinel_community

diff --git a/files/build/versions/build/build-sonic-slave-bullseye/versions-deb-bullseye b/files/build/versions/build/build-sonic-slave-bullseye/versions-deb-bullseye
@@ -44,6 +44,7 @@ linux-headers-5.10.0-18-2-common==5.10.140-1
 lldpd==1.0.4-1
 lm-sensors==1:3.6.0-7
 mft==4.25.0-62
+mlnx-sai==1.mlnx.SAIBuild2305.25.0.3
 net-tools==1.60+git20181103.0eebece-1
 protobuf-compiler==3.21.12-3
 python-thrift==0.11.0-4

diff --git a/files/build/versions/build/build-sonic-slave-bullseye/versions-deb-bullseye-arm64 b/files/build/versions/build/build-sonic-slave-bullseye/versions-deb-bullseye-arm64
@@ -1,3 +1 @@
-libnl-3-200==3.5.0-1
-libnl-route-3-200==3.5.0-1
 linux-headers-5.10.0-18-2-arm64==5.10.140-1
diff --git a/files/build/versions/build/build-sonic-slave-bullseye/versions-py3 b/files/build/versions/build/build-sonic-slave-bullseye/versions-py3
@@ -32,6 +32,6 @@ tabulate==0.8.2
 thrift==0.14.1
 toposort==1.6
 wcwidth==0.2.6
-websocket-client==1.6.1
+websocket-client==1.6.2
 www-authenticate==0.9.2
 xmltodict==0.12.0
diff --git a/files/build/versions/build/build-sonic-slave-bullseye/versions-py3-all-arm64 b/files/build/versions/build/build-sonic-slave-bullseye/versions-py3-all-arm64