Skip to content

Commit 906745c

Browse files
bbinxiemsosyaksrideepDellpaavaananlguohan
authored
update from azure/201911 (sonic-net#180)
* [201911][devices] skip_fancontrol for wedge 100 barefoot platforms (sonic-net#4528) * [device] DellEMC s5232f 50G hwsku support (sonic-net#4525) * [device] DellEmc S5232 support for new hwsku C8D48 8 100G ports and 48 50G ports * 10G ports update for S5232 hwsku-C8D48 Signed-off-by: Srideep Devireddy <srideep_devireddy@dell.com> * DellEMC S6000 updated sensors.conf (sonic-net#4568) Change PSU MAX temperature to 80 degree Change tmp75 sensors default temperature value from 25/50 to 70/80 degree. * [sonic-slave-stretch]: install same version for docker-ce and docker-ce-cli difference versions can cause compatibility issue between the server and client Signed-off-by: Guohan Lu <lguohan@gmail.com> * [baseimage]: install same version for docker-ce and docker-ce-cli Signed-off-by: Guohan Lu <lguohan@gmail.com> * [FRR]: Update frr to latest 7.2.1-s3 (sonic-net#4294) - Updated to latest frr 7.2.1 from the master. - Updated patches accordingly * [sonic-buildimage] updated minigraph for ACL Table data and ACL Interface Binding for Multi-NPU platforms (sonic-net#4491) * [sonic-buildimage] updated minigraph for ACL Table data and ACL Interface binding update for multu-npu platform based on subrole as "Frontend" or "Backend". For backend npu no ACL table is associated. For frontend npu only front-panel interface are associated. Updated with test case and fix typo in sample-mingraph for npu Address Review comments Signed-off-by: Abhishek Dosi <abdosi@microsoft.com> * Fixed the logic as per preview comment. Interface Filter logic only applies to Everflow/Mirror tables. * Address Review Comments. * Changes for LLDP docker to support multi-npu platforms (sonic-net#4530) * Changes for LLDP for Multi NPU Platoforms:- a) Enable LLDP for Host namespace for Management Port b) Make sure Management IP is avaliable in per asic namespace needed for LLDP Chassis configuration c) Make sure chassis mac-address is correct in per asic namespace d) Do not run lldp on eth0 of per asic namespace and avoid chassis configuration for same e) Use Linux hostname instead from Device Metadata for lldp chassis configuration since in multi-npu platforms device metadata hostname will be differnt Signed-off-by: Abhishek Dosi <abdosi@microsoft.com> * Address Review Comment with following changes: a) Use Device Metadata hostname even in per namespace conatiner. updated minigraph parsing for same to have hostname as system hostname and add new key for asic name b) Minigraph changes to have MGMT_INTERFACE Key in per asic/namespace config also as needed for LLDP for setting chassis management IP. Signed-off-by: Abhishek Dosi <abdosi@microsoft.com> * Address Review Comments * Moved utility functions for multi-npu platforms from sonic-utilities to sonic_device_util.py (sonic-net#4559) * Moved utility functions for multi-npu platforms from sonic-utilities config/main.py to here so that they can be used any module * Fix the issue with test run during compilation with acl-uploader PR#908 of sonic-utilities. * Fix get_num_npu as it was retuning string and not int * Address Review Comments * Address Review Comments * Fix for issue where image is compile with flag ENABLE_DHCP_GRAPH_SERVICE (sonic-net#4573) and then we load image and reboot even if there was existing config_db.json we will look for DHCP Service. we should disbale update_graph in such cases. This behaviour is silimar to what we have in 201811 image. * Change to enable redistribute connected on Frontend asics instead of backend asics (sonic-net#4588) Signed-off-by: Arvindsrinivasan Lakshmi Narasimhan <arlakshm@microsoft.com> * [DellEMC] S6000 Disable Low power mode by default (sonic-net#4592) * [BFN] Updated Barefoot SDK to 2020-05-07 (sonic-net#4566) Signed-off-by: Andriy Kokhan <akokhan@barefootnetworks.com> * [minigraph] Add tags for egress mirror tables (sonic-net#4526) Signed-off-by: Danny Allen <daall@microsoft.com> * [Submodule update] sonic-utlities with PR's [201911][show] Fix abbreviations for 'show ip bgp ...' commands (sonic-net#909) Changes to support acl-loader and mirror-session config commands for multi-npu platforms. (sonic-net#908) Changes to commands config reload/load-minigraph (sonic-net#919) Stop/Start restapi server upon config reload (sonic-net#911) [config] Add 'interface transceiver' subgroup with 'lpmode' and 'reset' subcommands (sonic-net#904) * [minigraph] Support FECDisabled in minigraph parser (sonic-net#4556) (sonic-net#4624) Signed-off-by: Qi Luo <qiluo-msft@users.noreply.github.com> * [ntp] enable/disable NTP long jump according to reboot type (sonic-net#4577) * [ntp] enable/disable NTP long jump according to reboot type - Enable NTP long jump after cold reboot. - Disable NTP long jump after warrm/fast reboot. Signed-off-by: Ying Xie <ying.xie@microsoft.com> * fix typo * further refactoring * use sonic-db-cli instead * [arista]: remove the soc property disabling sram scan (sonic-net#4623) * Changes to support config-setup service for multi-npu (sonic-net#4609) * Changes to support config-setup service for multi-npu platforms. For Multi-npu we are not supporting as of now config initializtion and ZTP. It will support creating config db from minigraph or using config db from previous file system Signed-off-by: Abhishek Dosi <abdosi@microsoft.com> * Address Review Comments. * Address Review comments * Address Review Comments of using pyhton based config load_minigraph/ config save/config reload from shell scripts so that we don't duplicate code. Also while running from shell we will skip stop/start services done by those commands. * Updated to use python command so no code duplication. * [config]: Fix the device type and internal bgp session status for multi NPU platforms (sonic-net#4600) * The following changes for multi-npu platforms are done - Set the type in device_metadata for asic configuration to be same as host - Set the admin-status of internal bgp sessions as up Signed-off-by: Arvindsrinivasan Lakshmi Narasimhan <arlakshm@microsoft.com> * Adding new BGP peer groups PEER_V4_INT and PEER_V6_INT. (sonic-net#4620) * Adding new BGP peer groups PEER_V4_INT and PEER_V6_INT. The internal BGP sessions will be added to this peer group while the external BGP sessions will be added to the exising PEER_V4 and PEER_V6 peer group. * Check for "ASIC" keyword in the hostname to identify the internal neighbors. * [submodule update] sonic-swss with PR [vnet] Fix IP2ME route creation logic for BITMAP VNET interface (sonic-net#1284) * [submodule update] sonic-util Revert "[config] Add 'interface transceiver' subgroup with 'lpmode' and 'reset' subcommands (sonic-net#904)" Multi-asic changes for config bgp commands and utilities. (sonic-net#910) * [submodule update] sonic-rest API's PR#39 Setup module versioning Add support for get all Vlans (sonic-net#37) * Update golang version for 1.11.5 to 1.14.2 (sonic-net#4520) Co-authored-by: Myron Sosyak <49795530+msosyak@users.noreply.github.com> Co-authored-by: Srideep <srideep_devireddy@dell.com> Co-authored-by: paavaanan <paavaanan_t_n@dell.com> Co-authored-by: Guohan Lu <lguohan@gmail.com> Co-authored-by: pavel-shirshov <pavelsh@microsoft.com> Co-authored-by: abdosi <58047199+abdosi@users.noreply.github.com> Co-authored-by: arlakshm <55814491+arlakshm@users.noreply.github.com> Co-authored-by: Santhosh Kumar T <53558409+santhosh-kt@users.noreply.github.com> Co-authored-by: Andriy Kokhan <43479230+akokhan@users.noreply.github.com> Co-authored-by: Danny Allen <daall@microsoft.com> Co-authored-by: Abhishek Dosi <abdosi@microsoft.com> Co-authored-by: Qi Luo <qiluo-msft@users.noreply.github.com> Co-authored-by: Ying Xie <yxieca@users.noreply.github.com> Co-authored-by: Samuel Angebault <staphylo@arista.com> Co-authored-by: judyjoseph <53951155+judyjoseph@users.noreply.github.com>
1 parent 4a502ca commit 906745c

File tree

44 files changed

+1174
-118
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+1174
-118
lines changed

‎build_debian.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@ sudo LANG=C chroot $FILESYSTEM_ROOT rm /tmp/docker.gpg
200200
sudo LANG=C chroot $FILESYSTEM_ROOT add-apt-repository \
201201
"deb [arch=$CONFIGURED_ARCH] https://download.docker.com/linux/debian stretch stable"
202202
sudo LANG=C chroot $FILESYSTEM_ROOT apt-get update
203-
sudo LANG=C chroot $FILESYSTEM_ROOT apt-get -y install docker-ce=${DOCKER_VERSION}
203+
sudo LANG=C chroot $FILESYSTEM_ROOT apt-get -y install docker-ce=${DOCKER_VERSION} docker-ce-cli=${DOCKER_VERSION}
204204
sudo LANG=C chroot $FILESYSTEM_ROOT apt-get -y remove software-properties-common gnupg2
205205

206206
if [ "$INSTALL_KUBERNETES" == "y" ]

‎device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/td3-a7050cx3-32s-32x100G.config.bcm

-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ port_phy_addr=0xff
3535
robust_hash_disable_egress_vlan=1
3636
robust_hash_disable_mpls=1
3737
robust_hash_disable_vlan=1
38-
sram_scan_enable=0
3938
stable_size=0x5500000
4039
tdma_timeout_usec=15000000
4140
tslam_timeout_usec=15000000

‎device/arista/x86_64-arista_7060px4_32/Arista-7060PX4-C64/th3-a7060px4-32-64x100G.config.bcm

-1
Original file line numberDiff line numberDiff line change
@@ -872,7 +872,6 @@ port_phy_addr_147.0=0xff
872872
robust_hash_disable_egress_vlan.0=1
873873
robust_hash_disable_mpls.0=1
874874
robust_hash_disable_vlan.0=1
875-
sram_scan_enable.0=0
876875
tdma_timeout_usec.0=15000000
877876
tslam_timeout_usec.0=15000000
878877

‎device/arista/x86_64-arista_7060px4_32/Arista-7060PX4-O32/th3-a7060px4-o32-32x400G.config.bcm

-1
Original file line numberDiff line numberDiff line change
@@ -744,7 +744,6 @@ port_phy_addr_143.0=0xff
744744
robust_hash_disable_egress_vlan.0=1
745745
robust_hash_disable_mpls.0=1
746746
robust_hash_disable_vlan.0=1
747-
sram_scan_enable.0=0
748747
tdma_timeout_usec.0=15000000
749748
tslam_timeout_usec.0=15000000
750749

‎device/barefoot/x86_64-accton_wedge100bf_32x-r0/pmon_daemon_control.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{
2+
"skip_fancontrol": true,
23
"skip_ledd": true,
34
"skip_xcvrd": false,
45
"skip_psud": false,
5-
"skip_syseepromd": false
6+
"skip_syseepromd": false
67
}

‎device/barefoot/x86_64-accton_wedge100bf_65x-r0/pmon_daemon_control.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{
2+
"skip_fancontrol": true,
23
"skip_ledd": true,
34
"skip_xcvrd": false,
45
"skip_psud": false,
5-
"skip_syseepromd": false
6+
"skip_syseepromd": false
67
}

‎device/dell/x86_64-dell_s6000_s1220-r0/sensors.conf

+4-4
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
# tmp75-i2c-11-4e is an ambient temperature sensor.
88

99
chip "tmp75-*"
10-
set temp1_max 50
11-
set temp1_max_hyst 25
10+
set temp1_max 80
11+
set temp1_max_hyst 70
1212

1313
# emc1403-i2c-10-4d has following temperature sensors:
1414
# temp1: CPU0 external Temp Sensor
@@ -32,5 +32,5 @@ chip "jc42-*"
3232
set temp1_crit 85
3333

3434
chip "dni_dps460-*"
35-
set temp1_max 50
36-
set temp2_max 50
35+
set temp1_max 80
36+
set temp2_max 80

‎device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-C8D48/buffers.json.j2

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
{%- set default_topo = 't1' %}
2+
{%- include 'buffers_config.j2' %}

‎device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-C8D48/buffers_defaults_t0.j2

+37
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
2+
{%- set default_cable = '40m' %}
3+
4+
{%- macro generate_buffer_pool_and_profiles() %}
5+
"BUFFER_POOL": {
6+
"ingress_lossless_pool": {
7+
"size": "28550336",
8+
"type": "ingress",
9+
"mode": "dynamic",
10+
"xoff": "4194112"
11+
},
12+
"egress_pool": {
13+
"size": "28550336",
14+
"type": "egress",
15+
"mode": "static"
16+
}
17+
},
18+
"BUFFER_PROFILE": {
19+
"ingress_lossy_profile": {
20+
"pool":"[BUFFER_POOL|ingress_lossless_pool]",
21+
"size":"0",
22+
"dynamic_th":"3"
23+
},
24+
"egress_lossless_profile": {
25+
"pool":"[BUFFER_POOL|egress_pool]",
26+
"size":"0",
27+
"mode": "static",
28+
"static_th":"32744448"
29+
},
30+
"egress_lossy_profile": {
31+
"pool":"[BUFFER_POOL|egress_pool]",
32+
"size":"0",
33+
"mode": "dynamic",
34+
"dynamic_th":"3"
35+
}
36+
},
37+
{%- endmacro %}

‎device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-C8D48/buffers_defaults_t1.j2

+37
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
2+
{%- set default_cable = '40m' %}
3+
4+
{%- macro generate_buffer_pool_and_profiles() %}
5+
"BUFFER_POOL": {
6+
"ingress_lossless_pool": {
7+
"size": "28550336",
8+
"type": "ingress",
9+
"mode": "dynamic",
10+
"xoff": "4194112"
11+
},
12+
"egress_pool": {
13+
"size": "28550336",
14+
"type": "egress",
15+
"mode": "static"
16+
}
17+
},
18+
"BUFFER_PROFILE": {
19+
"ingress_lossy_profile": {
20+
"pool":"[BUFFER_POOL|ingress_lossless_pool]",
21+
"size":"0",
22+
"dynamic_th":"3"
23+
},
24+
"egress_lossless_profile": {
25+
"pool":"[BUFFER_POOL|egress_pool]",
26+
"size":"0",
27+
"mode": "static",
28+
"static_th":"32744448"
29+
},
30+
"egress_lossy_profile": {
31+
"pool":"[BUFFER_POOL|egress_pool]",
32+
"size":"0",
33+
"mode": "dynamic",
34+
"dynamic_th":"3"
35+
}
36+
},
37+
{%- endmacro %}

‎device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-C8D48/custom_led.bin

468 Bytes
Binary file not shown.

‎device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-C8D48/linkscan_led_fw.bin

4.64 KB
Binary file not shown.

‎device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-C8D48/pg_profile_lookup.ini

+17
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
# PG lossless profiles.
2+
# speed cable size xon xoff threshold xon_offset
3+
10000 5m 1248 2288 35776 -3 2288
4+
25000 5m 1248 2288 53248 -3 2288
5+
40000 5m 1248 2288 66560 -3 2288
6+
50000 5m 1248 2288 90272 -3 2288
7+
100000 5m 1248 2288 165568 -3 2288
8+
10000 40m 1248 2288 37024 -3 2288
9+
25000 40m 1248 2288 53248 -3 2288
10+
40000 40m 1248 2288 71552 -3 2288
11+
50000 40m 1248 2288 96096 -3 2288
12+
100000 40m 1248 2288 177632 -3 2288
13+
10000 300m 1248 2288 46176 -3 2288
14+
25000 300m 1248 2288 79040 -3 2288
15+
40000 300m 1248 2288 108160 -3 2288
16+
50000 300m 1248 2288 141856 -3 2288
17+
100000 300m 1248 2288 268736 -3 2288

‎device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-C8D48/port_config.ini

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

‎device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-C8D48/qos.json.j2

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{%- include 'qos_config.j2' %}

‎device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-C8D48/sai.profile

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/td3-s5232f-8x100G+48x50G.config.bcm

‎device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-C8D48/sai_preinit_cmd.soc

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
m0 load 0 0x0 /usr/share/sonic/hwsku/linkscan_led_fw.bin
2+
m0 load 0 0x3800 /usr/share/sonic/hwsku/custom_led.bin

0 commit comments

Comments
 (0)