Merge branch 'master' into system-health

README.md

@@ -14,6 +14,10 @@
 [![P4](https://sonic-jenkins.westus2.cloudapp.azure.com/job/p4/job/buildimage-p4-all/badge/icon?subject=P4)](https://sonic-jenkins.westus2.cloudapp.azure.com/job/p4/job/buildimage-p4-all)
 [![VS](https://sonic-jenkins.westus2.cloudapp.azure.com/job/vs/job/buildimage-vs-all/badge/icon?subject=VS)](https://sonic-jenkins.westus2.cloudapp.azure.com/job/vs/job/buildimage-vs-all)
 
+*202006 builds*:
+
+[![Barefoot](https://sonic-jenkins.westus2.cloudapp.azure.com/job/barefoot/job/buildimage-bf-202006/badge/icon?subject=Barefoot)](https://sonic-jenkins.westus2.cloudapp.azure.com/job/barefoot/job/buildimage-bf-202006/)
+
 *201911 builds*:
 
 [![Barefoot](https://sonic-jenkins.westus2.cloudapp.azure.com/job/barefoot/job/buildimage-bf-201911/badge/icon?subject=Barefoot)](https://sonic-jenkins.westus2.cloudapp.azure.com/job/barefoot/job/buildimage-bf-201911/)

device/accton/x86_64-accton_as5712_54x-r0/Accton-AS5712-54X/sai.profile

@@ -1 +1,2 @@
 SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/td2-as5712-72x10G.config.bcm
+SAI_NUM_ECMP_MEMBERS=64

device/accton/x86_64-accton_as5812_54t-r0/Accton-AS5812-54T/sai.profile

@@ -1 +1,2 @@
 SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/td2-as5812t-72x10G.config.bcm
+SAI_NUM_ECMP_MEMBERS=64

device/accton/x86_64-accton_as5812_54x-r0/Accton-AS5812-54X/sai.profile

@@ -1 +1,2 @@
 SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/td2-as5812-72x10G.config.bcm
+SAI_NUM_ECMP_MEMBERS=64

device/accton/x86_64-accton_as5835_54t-r0/Accton-AS5835-54T/sai.profile

@@ -1,2 +1,3 @@
 SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/mv2-as5835t-48x10G+6x100G.config.bcm
 SAI_BOARD_CONFIG_PATH=/etc/accton
+SAI_NUM_ECMP_MEMBERS=64

device/accton/x86_64-accton_as5835_54x-r0/Accton-AS5835-54X/sai.profile

@@ -1 +1,2 @@
 SAI_INIT_CONFIG_FILE=/etc/bcm/mv2-as5835-48x10G+6x100G.config.bcm
+SAI_NUM_ECMP_MEMBERS=64

device/accton/x86_64-accton_as6712_32x-r0/Accton-AS6712-32X/sai.profile

@@ -1 +1,2 @@
 SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/td2-as6712-32x40G.config.bcm
+SAI_NUM_ECMP_MEMBERS=64

device/accton/x86_64-accton_as7312_54x-r0/Accton-AS7312-54X/sai.profile

@@ -1 +1,2 @@
 SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/th-as7312-48x25G+6x100G.config.bcm
+SAI_NUM_ECMP_MEMBERS=64

device/accton/x86_64-accton_as7312_54xs-r0/Accton-AS7312-54XS/sai.profile

@@ -1 +1,2 @@
 SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/th-as7312-48x25G+6x100G.config.bcm
+SAI_NUM_ECMP_MEMBERS=64

device/accton/x86_64-accton_as7315_27xb-r0/Accton-AS7315-27XB/sai.profile

@@ -1 +1,2 @@
 SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/qax-as7315-20x10G+4x25G+3x100G.config.bcm
+SAI_NUM_ECMP_MEMBERS=64

device/accton/x86_64-accton_as7326_56x-r0/Accton-AS7326-56X/sai.profile

@@ -1 +1,2 @@
 SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/td3-as7326-48x25G+8x100G.config.bcm
+SAI_NUM_ECMP_MEMBERS=64

device/accton/x86_64-accton_as7326_56x-r0/plugins/sfputil.py

@@ -47,16 +47,16 @@ class SfpUtil(SfpUtilBase):
  8: 50,
  9: 48,
  10: 49,
- 11: 51,
- 12: 52,
+ 11: 52,
+ 12: 51,
  13: 53,
  14: 56,
  15: 55,
  16: 54,
  17: 58,
  18: 57,
- 19: 59,
- 20: 60,
+ 19: 60,
+ 20: 59,
  21: 61,
  22: 63,
  23: 62,

device/accton/x86_64-accton_as7712_32x-r0/Accton-AS7712-32X/sai.profile

@@ -1 +1,2 @@
 SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/th-as7712-32x100G.config.bcm
+SAI_NUM_ECMP_MEMBERS=64

device/accton/x86_64-accton_as7716_32x-r0/Accton-AS7716-32X/sai.profile

@@ -1 +1,2 @@
 SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/th-as7716-32x100G.config.bcm
+SAI_NUM_ECMP_MEMBERS=64

device/accton/x86_64-accton_as7716_32xb-r0/Accton-AS7716-32XB/sai.profile

@@ -1 +1,2 @@
 SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/th-as7716-32x100G.config.bcm
+SAI_NUM_ECMP_MEMBERS=64

device/accton/x86_64-accton_as7726_32x-r0/Accton-AS7726-32X/sai.profile

@@ -1 +1,2 @@
 SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/td3-as7726-32x100G.config.bcm
+SAI_NUM_ECMP_MEMBERS=64

device/accton/x86_64-accton_as7816_64x-r0/Accton-AS7816-64X/sai.profile

@@ -1 +1,2 @@
 SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/th2-as7816-64x25G-48x100G_row1.config.bcm
+SAI_NUM_ECMP_MEMBERS=64

device/accton/x86_64-accton_as9716_32d-r0/Accton-AS9716-32D/sai.profile

@@ -1 +1,2 @@
-SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/th3-as9716-32x400G.config.bcm
+SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/th3-as9716-32x400G.config.bcm
+SAI_NUM_ECMP_MEMBERS=64

device/alphanetworks/x86_64-alphanetworks_snh60a0_320fv2-r0/Alphanetworks-SNH60A0-320FV2/sai.profile

@@ -1 +1,2 @@
 SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/th-snh60a0-32x100G.config.bcm
+SAI_NUM_ECMP_MEMBERS=64

device/alphanetworks/x86_64-alphanetworks_snh60b0_640f-r0/Alphanetworks-SNH60B0-640F/sai.profile

@@ -1 +1,2 @@
 SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/th2-snh60b0-64x100G.config.bcm
+SAI_NUM_ECMP_MEMBERS=64

device/arista/x86_64-arista_7050_qx32s/Arista-7050-QX-32S/sai.profile

@@ -1 +1,2 @@
 SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/td2-a7050-qx32s-32x40G.config.bcm
+SAI_NUM_ECMP_MEMBERS=64

device/arista/x86_64-arista_7050_qx32s/Arista-7050QX-32S-S4Q31/sai.profile

@@ -1 +1,2 @@
 SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/td2-a7050-q31s4-31x40G-4x10G.config.bcm
+SAI_NUM_ECMP_MEMBERS=64

device/arista/x86_64-arista_7050_qx32s/plugins/eeprom.py

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

device/arista/x86_64-arista_7050_qx32s/plugins/led_control.py

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

device/arista/x86_64-arista_7050_qx32s/plugins/pcie.yaml

@@ -0,0 +1,135 @@
+- bus: '00'
+ dev: '00'
+ fn: '0'
+ id: '1536'
+ name: 'Host bridge: Advanced Micro Devices, Inc. [AMD] Family 16h Processor Root
+ Complex'
+- bus: '00'
+ dev: '01'
+ fn: '0'
+ id: '9831'
+ name: 'VGA compatible controller: Advanced Micro Devices, Inc. [AMD/ATI] Kabini
+ [Radeon HD 8400E]'
+- bus: '00'
+ dev: '02'
+ fn: '0'
+ id: '1538'
+ name: 'Host bridge: Advanced Micro Devices, Inc. [AMD] Family 16h Processor Function
+ 0'
+- bus: '00'
+ dev: '02'
+ fn: '1'
+ id: '1439'
+ name: 'PCI bridge: Advanced Micro Devices, Inc. [AMD] Family 16h Processor Functions
+ 5:1'
+- bus: '00'
+ dev: '02'
+ fn: '2'
+ id: '1439'
+ name: 'PCI bridge: Advanced Micro Devices, Inc. [AMD] Family 16h Processor Functions
+ 5:1'
+- bus: '00'
+ dev: '02'
+ fn: '3'
+ id: '1439'
+ name: 'PCI bridge: Advanced Micro Devices, Inc. [AMD] Family 16h Processor Functions
+ 5:1'
+- bus: '00'
+ dev: '02'
+ fn: '4'
+ id: '1439'
+ name: 'PCI bridge: Advanced Micro Devices, Inc. [AMD] Family 16h Processor Functions
+ 5:1'
+- bus: '00'
+ dev: '02'
+ fn: '5'
+ id: '1439'
+ name: 'PCI bridge: Advanced Micro Devices, Inc. [AMD] Family 16h Processor Functions
+ 5:1'
+- bus: '00'
+ dev: '11'
+ fn: '0'
+ id: '7801'
+ name: 'SATA controller: Advanced Micro Devices, Inc. [AMD] FCH SATA Controller [AHCI
+ mode] (rev 40)'
+- bus: '00'
+ dev: '12'
+ fn: '0'
+ id: '7807'
+ name: 'USB controller: Advanced Micro Devices, Inc. [AMD] FCH USB OHCI Controller
+ (rev 39)'
+- bus: '00'
+ dev: '12'
+ fn: '2'
+ id: '7808'
+ name: 'USB controller: Advanced Micro Devices, Inc. [AMD] FCH USB EHCI Controller
+ (rev 39)'
+- bus: '00'
+ dev: '14'
+ fn: '0'
+ id: 780b
+ name: 'SMBus: Advanced Micro Devices, Inc. [AMD] FCH SMBus Controller (rev 3a)'
+- bus: '00'
+ dev: '14'
+ fn: '3'
+ id: 780e
+ name: 'ISA bridge: Advanced Micro Devices, Inc. [AMD] FCH LPC Bridge (rev 11)'
+- bus: '00'
+ dev: '14'
+ fn: '7'
+ id: '7813'
+ name: 'SD Host controller: Advanced Micro Devices, Inc. [AMD] FCH SD Flash Controller
+ (rev 01)'
+- bus: '00'
+ dev: '18'
+ fn: '0'
+ id: '1530'
+ name: 'Host bridge: Advanced Micro Devices, Inc. [AMD] Family 16h Processor Function
+ 0'
+- bus: '00'
+ dev: '18'
+ fn: '1'
+ id: '1531'
+ name: 'Host bridge: Advanced Micro Devices, Inc. [AMD] Family 16h Processor Function
+ 1'
+- bus: '00'
+ dev: '18'
+ fn: '2'
+ id: '1532'
+ name: 'Host bridge: Advanced Micro Devices, Inc. [AMD] Family 16h Processor Function
+ 2'
+- bus: '00'
+ dev: '18'
+ fn: '3'
+ id: '1533'
+ name: 'Host bridge: Advanced Micro Devices, Inc. [AMD] Family 16h Processor Function
+ 3'
+- bus: '00'
+ dev: '18'
+ fn: '4'
+ id: '1534'
+ name: 'Host bridge: Advanced Micro Devices, Inc. [AMD] Family 16h Processor Function
+ 4'
+- bus: '00'
+ dev: '18'
+ fn: '5'
+ id: '1535'
+ name: 'Host bridge: Advanced Micro Devices, Inc. [AMD] Family 16h Processor Function
+ 5'
+- bus: '01'
+ dev: '00'
+ fn: '0'
+ id: b850
+ name: 'Ethernet controller: Broadcom Limited Broadcom BCM56850 Switch ASIC (rev
+ 03)'
+- bus: '02'
+ dev: '00'
+ fn: '0'
+ id: '0001'
+ name: 'System peripheral: Arastra Inc. Device 0001 (rev 01)'
+- bus: '04'
+ dev: '00'
+ fn: '0'
+ id: '1682'
+ name: 'Ethernet controller: Broadcom Limited NetXtreme BCM57762 Gigabit Ethernet
+ PCIe (rev 20)'

device/arista/x86_64-arista_7050_qx32s/plugins/psuutil.py

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

device/arista/x86_64-arista_7050_qx32s/plugins/sfputil.py

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

device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/sai.profile

@@ -1 +1,2 @@
 SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/td3-a7050cx3-32s-32x100G.config.bcm
+SAI_NUM_ECMP_MEMBERS=64

device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/port_config.ini

@@ -0,0 +1,57 @@
+# name lanes alias index speed
+Ethernet0 1,2 Ethernet1/1 1 50000
+Ethernet2 3,4 Ethernet1/3 1 50000
+Ethernet4 5,6 Ethernet2/1 2 50000
+Ethernet6 7,8 Ethernet2/3 2 50000
+Ethernet8 9,10 Ethernet3/1 3 50000
+Ethernet10 11,12 Ethernet3/3 3 50000
+Ethernet12 13,14 Ethernet4/1 4 50000
+Ethernet14 15,16 Ethernet4/3 4 50000
+Ethernet16 21,22 Ethernet5/1 5 50000
+Ethernet18 23,24 Ethernet5/3 5 50000
+Ethernet20 17,18 Ethernet6/1 6 50000
+Ethernet22 19,20 Ethernet6/3 6 50000
+Ethernet24 25,26,27,28 Ethernet7/1 7 100000
+Ethernet28 29,30,31,32 Ethernet8/1 8 100000
+Ethernet32 37,38,39,40 Ethernet9/1 9 100000
+Ethernet36 33,34,35,36 Ethernet10/1 10 100000
+Ethernet40 41,42 Ethernet11/1 11 50000
+Ethernet42 43,44 Ethernet11/3 11 50000
+Ethernet44 45,46 Ethernet12/1 12 50000
+Ethernet46 47,48 Ethernet12/3 12 50000
+Ethernet48 53,54 Ethernet13/1 13 50000
+Ethernet50 55,56 Ethernet13/3 13 50000
+Ethernet52 49,50 Ethernet14/1 14 50000
+Ethernet54 51,52 Ethernet14/3 14 50000
+Ethernet56 57,58 Ethernet15/1 15 50000
+Ethernet58 59,60 Ethernet15/3 15 50000
+Ethernet60 61,62 Ethernet16/1 16 50000
+Ethernet62 63,64 Ethernet16/3 16 50000
+Ethernet64 69,70 Ethernet17/1 17 50000
+Ethernet66 71,72 Ethernet17/3 17 50000
+Ethernet68 65,66 Ethernet18/1 18 50000
+Ethernet70 67,68 Ethernet18/3 18 50000
+Ethernet72 73,74 Ethernet19/1 19 50000
+Ethernet74 75,76 Ethernet19/3 19 50000
+Ethernet76 77,78 Ethernet20/1 20 50000
+Ethernet78 79,80 Ethernet20/3 20 50000
+Ethernet80 85,86 Ethernet21/1 21 50000
+Ethernet82 87,88 Ethernet21/3 21 50000
+Ethernet84 81,82 Ethernet22/1 22 50000
+Ethernet86 83,84 Ethernet22/3 22 50000
+Ethernet88 89,90,91,92 Ethernet23/1 23 100000
+Ethernet92 93,94,95,96 Ethernet24/1 24 100000
+Ethernet96 101,102,103,104 Ethernet25/1 25 100000
+Ethernet100 97,98,99,100 Ethernet26/1 26 100000
+Ethernet104 105,106 Ethernet27/1 27 50000
+Ethernet106 107,108 Ethernet27/3 27 50000
+Ethernet108 109,110 Ethernet28/1 28 50000
+Ethernet110 111,112 Ethernet28/3 28 50000
+Ethernet112 117,118 Ethernet29/1 29 50000
+Ethernet114 119,120 Ethernet29/3 29 50000
+Ethernet116 113,114 Ethernet30/1 30 50000
+Ethernet118 115,116 Ethernet30/3 30 50000
+Ethernet120 121,122 Ethernet31/1 31 50000
+Ethernet122 123,124 Ethernet31/3 31 50000
+Ethernet124 125,126 Ethernet32/1 32 50000
+Ethernet126 127,128 Ethernet32/3 32 50000

device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/sai.profile

@@ -0,0 +1,2 @@
+SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/td3-a7050cx3-32s-48x50G+8x100G.config.bcm
+SAI_NUM_ECMP_MEMBERS=64