matthew/sonic-buildimage
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

DellEMC: S6000, S6100, Z9332f - Add capabilities fields in platform.json (#9168)

Browse Source 
Why I did it
To include capabilities fields in platform.json of DellEMC S6000, S6100, Z9332f platforms.

How I did it
Add the capabilities fields in each platform's respective platform.json.

How to verify it
Ran sonic-mgmt platform api test cases that use capabilities fields and verified that the results are as expected.
This commit is contained in:
Arun Saravanan Balachandran 2021-11-15 21:38:40 +05:30 committed by GitHub
parent 0e057a4bb1
commit f4c3aa4a03
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 381 additions and 96 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

136
device/dell/x86_64-dell_s6000_s1220-r0/platform.json
View File

@ -1,6 +1,10 @@
{
"chassis": {
"name": "S6000",
"status_led": {
"controllable": true,
"colors": ["amber", "blinking amber", "green", "blinking green"]
},
"components": [
{
"name": "BIOS"
@ -17,55 +21,115 @@
],
"fans": [
{
"name": "FanTray1-Fan1"
"name": "FanTray1-Fan1",
"speed": {
"controllable": true,
"minimum": 40
}
},
{
"name": "FanTray1-Fan2"
"name": "FanTray1-Fan2",
"speed": {
"controllable": true,
"minimum": 40
}
},
{
"name": "FanTray2-Fan1"
"name": "FanTray2-Fan1",
"speed": {
"controllable": true,
"minimum": 40
}
},
{
"name": "FanTray2-Fan2"
"name": "FanTray2-Fan2",
"speed": {
"controllable": true,
"minimum": 40
}
},
{
"name": "FanTray3-Fan1"
"name": "FanTray3-Fan1",
"speed": {
"controllable": true,
"minimum": 40
}
},
{
"name": "FanTray3-Fan2"
"name": "FanTray3-Fan2",
"speed": {
"controllable": true,
"minimum": 40
}
}
],
"fan_drawers":[
{
"name": "FanTray1",
"status_led": {
"controllable": true,
"colors": ["amber", "green", "off"]
},
"fans": [
{
"name": "FanTray1-Fan1"
"name": "FanTray1-Fan1",
"speed": {
"controllable": true,
"minimum": 40
}
},
{
"name": "FanTray1-Fan2"
"name": "FanTray1-Fan2",
"speed": {
"controllable": true,
"minimum": 40
}
}
]
},
{
"name": "FanTray2",
"status_led": {
"controllable": true,
"colors": ["amber", "green", "off"]
},
"fans": [
{
"name": "FanTray2-Fan1"
"name": "FanTray2-Fan1",
"speed": {
"controllable": true,
"minimum": 40
}
},
{
"name": "FanTray2-Fan2"
"name": "FanTray2-Fan2",
"speed": {
"controllable": true,
"minimum": 40
}
}
]
},
{
"name": "FanTray3",
"status_led": {
"controllable": true,
"colors": ["amber", "green", "off"]
},
"fans": [
{
"name": "FanTray3-Fan1"
"name": "FanTray3-Fan1",
"speed": {
"controllable": true,
"minimum": 40
}
},
{
"name": "FanTray3-Fan2"
"name": "FanTray3-Fan2",
"speed": {
"controllable": true,
"minimum": 40
}
}
]
}
@ -73,55 +137,79 @@
"psus": [
{
"name": "PSU1",
"status_led": {
"controllable": false
},
"fans": [
{
"name": "PSU1 Fan"
"name": "PSU1 Fan",
"speed": {
"controllable": true,
"minimum": 40
}
}
],
"thermals": [
{
"name": "PSU1-Sensor 1"
"name": "PSU1-Sensor 1",
"controllable": false
},
{
"name": "PSU1-Sensor 2"
"name": "PSU1-Sensor 2",
"controllable": false
}
]
},
{
"name": "PSU2",
"status_led": {
"controllable": false
},
"fans": [
{
"name": "PSU2 Fan"
"name": "PSU2 Fan",
"speed": {
"controllable": true,
"minimum": 40
}
}
],
"thermals": [
{
"name": "PSU2-Sensor 1"
"name": "PSU2-Sensor 1",
"controllable": false
},
{
"name": "PSU2-Sensor 2"
"name": "PSU2-Sensor 2",
"controllable": false
}
]
}
],
"thermals": [
{
"name": "ASIC On-board"
"name": "ASIC On-board",
"controllable": false
},
{
"name": "NIC"
"name": "NIC",
"controllable": false
},
{
"name": "System Front"
"name": "System Front",
"controllable": false
},
{
"name": "DIMM"
"name": "DIMM",
"controllable": false
},
{
"name": "CPU Core 0"
"name": "CPU Core 0",
"controllable": false
},
{
"name": "CPU Core 1"
"name": "CPU Core 1",
"controllable": false
}
],
"modules": [],

102
device/dell/x86_64-dell_s6100_c2538-r0/platform.json
View File

@ -1,6 +1,10 @@
{
"chassis": {
"name": "S6100-ON",
"status_led": {
"controllable": true,
"colors": ["amber", "blinking amber", "green", "blinking green"]
},
"components": [
{
"name": "BIOS"
@ -14,48 +18,84 @@
],
"fans": [
{
"name": "FanTray1-Fan1"
"name": "FanTray1-Fan1",
"speed": {
"controllable": false
}
},
{
"name": "FanTray2-Fan1"
"name": "FanTray2-Fan1",
"speed": {
"controllable": false
}
},
{
"name": "FanTray3-Fan1"
"name": "FanTray3-Fan1",
"speed": {
"controllable": false
}
},
{
"name": "FanTray4-Fan1"
"name": "FanTray4-Fan1",
"speed": {
"controllable": false
}
}
],
"fan_drawers":[
{
"name": "FanTray1",
"status_led": {
"controllable": false
},
"fans": [
{
"name": "FanTray1-Fan1"
"name": "FanTray1-Fan1",
"speed": {
"controllable": false
}
}
]
},
{
"name": "FanTray2",
"status_led": {
"controllable": false
},
"fans": [
{
"name": "FanTray2-Fan1"
"name": "FanTray2-Fan1",
"speed": {
"controllable": false
}
}
]
},
{
"name": "FanTray3",
"status_led": {
"controllable": false
},
"fans": [
{
"name": "FanTray3-Fan1"
"name": "FanTray3-Fan1",
"speed": {
"controllable": false
}
}
]
},
{
"name": "FanTray4",
"status_led": {
"controllable": false
},
"fans": [
{
"name": "FanTray4-Fan1"
"name": "FanTray4-Fan1",
"speed": {
"controllable": false
}
}
]
}
@ -63,51 +103,73 @@
"psus": [
{
"name": "PSU1",
"status_led": {
"controllable": false
},
"fans": [
{
"name": "PSU1 Fan"
"name": "PSU1 Fan",
"speed": {
"controllable": false
}
}
]
},
{
"name": "PSU2",
"status_led": {
"controllable": false
},
"fans": [
{
"name": "PSU2 Fan"
"name": "PSU2 Fan",
"speed": {
"controllable": false
}
}
]
}
],
"thermals": [
{
"name": "CPU On-board"
"name": "CPU On-board",
"controllable": false
},
{
"name": "ASIC On-board Front"
"name": "ASIC On-board Front",
"controllable": false
},
{
"name": "System Front"
"name": "System Front",
"controllable": false
},
{
"name": "ASIC On-board Rear"
"name": "ASIC On-board Rear",
"controllable": false
},
{
"name": "Front GE board"
"name": "Front GE board",
"controllable": false
},
{
"name": "Front SFP+ board"
"name": "Front SFP+ board",
"controllable": false
},
{
"name": "CPU Core 0"
"name": "CPU Core 0",
"controllable": false
},
{
"name": "CPU Core 1"
"name": "CPU Core 1",
"controllable": false
},
{
"name": "CPU Core 2"
"name": "CPU Core 2",
"controllable": false
},
{
"name": "CPU Core 3"
"name": "CPU Core 3",
"controllable": false
}
],
"modules": [

225
device/dell/x86_64-dellemc_z9332f_d1508-r0/platform.json
View File

@ -1,6 +1,10 @@
{
"chassis": {
"name": "Z9332F-ON",
"status_led": {
"controllable": true,
"colors": ["green", "flashing green", "yellow", "flashing yellow"]
},
"components": [
{
"name": "BIOS"
@ -29,123 +33,228 @@
],
"fans": [
{
"name": "FanTray1-Fan1"
"name": "FanTray1-Fan1",
"speed": {
"controllable": false
}
},
{
"name": "FanTray1-Fan2"
"name": "FanTray1-Fan2",
"speed": {
"controllable": false
}
},
{
"name": "FanTray2-Fan1"
"name": "FanTray2-Fan1",
"speed": {
"controllable": false
}
},
{
"name": "FanTray2-Fan2"
"name": "FanTray2-Fan2",
"speed": {
"controllable": false
}
},
{
"name": "FanTray3-Fan1"
"name": "FanTray3-Fan1",
"speed": {
"controllable": false
}
},
{
"name": "FanTray3-Fan2"
"name": "FanTray3-Fan2",
"speed": {
"controllable": false
}
},
{
"name": "FanTray4-Fan1"
"name": "FanTray4-Fan1",
"speed": {
"controllable": false
}
},
{
"name": "FanTray4-Fan2"
"name": "FanTray4-Fan2",
"speed": {
"controllable": false
}
},
{
"name": "FanTray5-Fan1"
"name": "FanTray5-Fan1",
"speed": {
"controllable": false
}
},
{
"name": "FanTray5-Fan2"
"name": "FanTray5-Fan2",
"speed": {
"controllable": false
}
},
{
"name": "FanTray6-Fan1"
"name": "FanTray6-Fan1",
"speed": {
"controllable": false
}
},
{
"name": "FanTray6-Fan2"
"name": "FanTray6-Fan2",
"speed": {
"controllable": false
}
},
{
"name": "FanTray7-Fan1"
"name": "FanTray7-Fan1",
"speed": {
"controllable": false
}
},
{
"name": "FanTray7-Fan2"
"name": "FanTray7-Fan2",
"speed": {
"controllable": false
}
}
],
"fan_drawers":[
{
"name": "FanTray1",
"status_led": {
"controllable": false
},
"fans": [
{
"name": "FanTray1-Fan1"
"name": "FanTray1-Fan1",
"speed": {
"controllable": false
}
},
{
"name": "FanTray1-Fan2"
"name": "FanTray1-Fan2",
"speed": {
"controllable": false
}
}
]
},
{
"name": "FanTray2",
"status_led": {
"controllable": false
},
"fans": [
{
"name": "FanTray2-Fan1"
"name": "FanTray2-Fan1",
"speed": {
"controllable": false
}
},
{
"name": "FanTray2-Fan2"
"name": "FanTray2-Fan2",
"speed": {
"controllable": false
}
}
]
},
{
"name": "FanTray3",
"status_led": {
"controllable": false
},
"fans": [
{
"name": "FanTray3-Fan1"
"name": "FanTray3-Fan1",
"speed": {
"controllable": false
}
},
{
"name": "FanTray3-Fan2"
"name": "FanTray3-Fan2",
"speed": {
"controllable": false
}
}
]
},
{
"name": "FanTray4",
"status_led": {
"controllable": false
},
"fans": [
{
"name": "FanTray4-Fan1"
"name": "FanTray4-Fan1",
"speed": {
"controllable": false
}
},
{
"name": "FanTray4-Fan2"
"name": "FanTray4-Fan2",
"speed": {
"controllable": false
}
}
]
},
{
{
"name": "FanTray5",
"status_led": {
"controllable": false
},
"fans": [
{
"name": "FanTray5-Fan1"
"name": "FanTray5-Fan1",
"speed": {
"controllable": false
}
},
{
"name": "FanTray5-Fan2"
"name": "FanTray5-Fan2",
"speed": {
"controllable": false
}
}
]
},
{
"name": "FanTray6",
"status_led": {
"controllable": false
},
"fans": [
{
"name": "FanTray6-Fan1"
"name": "FanTray6-Fan1",
"speed": {
"controllable": false
}
},
{
"name": "FanTray6-Fan2"
"name": "FanTray6-Fan2",
"speed": {
"controllable": false
}
}
]
},
{
"name": "FanTray7",
"status_led": {
"controllable": false
},
"fans": [
{
"name": "FanTray7-Fan1"
"name": "FanTray7-Fan1",
"speed": {
"controllable": false
}
},
{
"name": "FanTray7-Fan2"
"name": "FanTray7-Fan2",
"speed": {
"controllable": false
}
}
]
}
@ -153,63 +262,89 @@
"psus": [
{
"name": "PSU1",
"status_led": {
"controllable": false
},
"fans": [
{
"name": "PSU1 Fan"
"name": "PSU1 Fan",
"speed": {
"controllable": false
}
}
]
},
{
"name": "PSU2",
"status_led": {
"controllable": false
},
"fans": [
{
"name": "PSU2 Fan"
"name": "PSU2 Fan",
"speed": {
"controllable": false
}
}
]
}
],
"thermals": [
{
"name": "CPU On-board"
"name": "CPU On-board",
"controllable": false
},
{
"name": "Baseboard U3"
"name": "Baseboard U3",
"controllable": false
},
{
"name": "SW Internal"
"name": "SW Internal",
"controllable": false
},
{
"name": "Fan U52"
"name": "Fan U52",
"controllable": false
},
{
"name": "Fan U17"
"name": "Fan U17",
"controllable": false
},
{
"name": "SW U52"
"name": "SW U52",
"controllable": false
},
{
"name": "SW U16"
"name": "SW U16",
"controllable": false
},
{
"name": "PSU1 Inlet"
"name": "PSU1 Inlet",
"controllable": false
},
{
"name": "PSU1 Hotspot"
"name": "PSU1 Hotspot",
"controllable": false
},
{
"name": "PSU2 Inlet"
"name": "PSU2 Inlet",
"controllable": false
},
{
"name": "PSU2 Hotspot"
"name": "PSU2 Hotspot",
"controllable": false
},
{
"name": "SW U04"
"name": "SW U04",
"controllable": false
},
{
"name": "SW U14"
"name": "SW U14",
"controllable": false
},
{
"name": "SW U4403"
"name": "SW U4403",
"controllable": false
}
],
"modules": [],

2
device/dell/x86_64-dellemc_z9332f_d1508-r0/system_health_monitoring_config.json
View File

@ -6,6 +6,6 @@
"led_color": {
"fault": "yellow",
"normal": "green",
"booting": "flash_green"
"booting": "flashing green"
}
}

12
platform/broadcom/sonic-platform-modules-dell/z9332f/sonic_platform/chassis.py
View File

@ -59,17 +59,17 @@ class Chassis(ChassisBase):
SYSLED_COLOR_TO_REG = {
"green": 0xd0,
"yellow": 0xe0,
"flash_green": 0xd2,
"flash_yellow": 0xe2
"flashing green": 0xd2,
"flashing yellow": 0xe2
}
REG_TO_SYSLED_COLOR = {
0xd0 : "green",
0xe0 : "yellow",
0xd2 : "flash_green",
0xd1 : "flash_green",
0xe2 : "flash_yellow",
0xe1 : "flash_yellow"
0xd2 : "flashing green",
0xd1 : "flashing green",
0xe2 : "flashing yellow",
0xe1 : "flashing yellow"
}
_global_port_pres_dict = {}