Skip to content

Commit 2135c6e

Browse files
qnosqiluo-msft
authored andcommitted
[DX010 platform] fix dx010 platform testcase issues (#13595)
Why I did it 1. fix chassis test_set_fans_led case 2. fix chassis get_name case mismatch issue 3. fix fan_drawer test_set_fans_speed 4. fix component test_components test case How I did it Add corresponding configuration into chassis json file How to verify it Run platform tests cases to verify these failure cases
1 parent 9731aa3 commit 2135c6e

File tree

5 files changed

+92
-13
lines changed

5 files changed

+92
-13
lines changed

device/celestica/x86_64-cel_seastone-r0/platform.json

+74-11
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"chassis": {
3-
"name": "Celestica-DX010-C32",
3+
"name": "DX010",
44
"status_led": {
55
"controllable": true,
66
"colors": ["green", "off"]
@@ -18,6 +18,9 @@
1818
{
1919
"name": "CPLD4"
2020
},
21+
{
22+
"name": "CPLD5"
23+
},
2124
{
2225
"name": "BIOS"
2326
}
@@ -123,10 +126,22 @@
123126
},
124127
"fans": [
125128
{
126-
"name": "FAN-1F"
129+
"name": "FAN-1F",
130+
"status_led": {
131+
"controllable": false
132+
},
133+
"speed": {
134+
"controllable": false
135+
}
127136
},
128137
{
129-
"name": "FAN-1R"
138+
"name": "FAN-1R",
139+
"status_led": {
140+
"controllable": false
141+
},
142+
"speed": {
143+
"controllable": false
144+
}
130145
}
131146
]
132147
},
@@ -138,10 +153,22 @@
138153
},
139154
"fans": [
140155
{
141-
"name": "FAN-2F"
156+
"name": "FAN-2F",
157+
"status_led": {
158+
"controllable": false
159+
},
160+
"speed": {
161+
"controllable": false
162+
}
142163
},
143164
{
144-
"name": "FAN-2R"
165+
"name": "FAN-2R",
166+
"status_led": {
167+
"controllable": false
168+
},
169+
"speed": {
170+
"controllable": false
171+
}
145172
}
146173
]
147174
},
@@ -153,10 +180,22 @@
153180
},
154181
"fans": [
155182
{
156-
"name": "FAN-3F"
183+
"name": "FAN-3F",
184+
"status_led": {
185+
"controllable": false
186+
},
187+
"speed": {
188+
"controllable": false
189+
}
157190
},
158191
{
159-
"name": "FAN-3R"
192+
"name": "FAN-3R",
193+
"status_led": {
194+
"controllable": false
195+
},
196+
"speed": {
197+
"controllable": false
198+
}
160199
}
161200
]
162201
},
@@ -168,10 +207,22 @@
168207
},
169208
"fans": [
170209
{
171-
"name": "FAN-4F"
210+
"name": "FAN-4F",
211+
"status_led": {
212+
"controllable": false
213+
},
214+
"speed": {
215+
"controllable": false
216+
}
172217
},
173218
{
174-
"name": "FAN-4R"
219+
"name": "FAN-4R",
220+
"status_led": {
221+
"controllable": false
222+
},
223+
"speed": {
224+
"controllable": false
225+
}
175226
}
176227
]
177228
},
@@ -183,10 +234,22 @@
183234
},
184235
"fans": [
185236
{
186-
"name": "FAN-5F"
237+
"name": "FAN-5F",
238+
"status_led": {
239+
"controllable": false
240+
},
241+
"speed": {
242+
"controllable": false
243+
}
187244
},
188245
{
189-
"name": "FAN-5R"
246+
"name": "FAN-5R",
247+
"status_led": {
248+
"controllable": false
249+
},
250+
"speed": {
251+
"controllable": false
252+
}
190253
}
191254
]
192255
}

device/celestica/x86_64-cel_seastone-r0/platform_components.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"chassis": {
3-
"Seastone-DX010": {
3+
"DX010": {
44
"component": {
55
"CPLD1": {},
66
"CPLD2": {},

device/celestica/x86_64-cel_seastone-r0/sonic_platform/chassis.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -270,7 +270,7 @@ def get_name(self):
270270
Returns:
271271
string: The name of the device
272272
"""
273-
return self._api_helper.hwsku
273+
return self._eeprom.get_product_name()
274274

275275
def get_presence(self):
276276
"""

device/celestica/x86_64-cel_seastone-r0/sonic_platform/eeprom.py

+3
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,9 @@ def _valid_tlv(self, eeprom_data):
131131
def get_eeprom(self):
132132
return self._valid_tlv(self._eeprom)
133133

134+
def get_product_name(self):
135+
return self._eeprom.get('0x21', NULL)
136+
134137
def get_pn(self):
135138
return self._eeprom.get('0x22', NULL)
136139

device/celestica/x86_64-cel_seastone-r0/sonic_platform/sfp.py

+13
Original file line numberDiff line numberDiff line change
@@ -2202,3 +2202,16 @@ def is_replaceable(self):
22022202
A boolean value, True if replaceable
22032203
"""
22042204
return True
2205+
2206+
def get_error_description(self):
2207+
"""
2208+
Retrives the error descriptions of the SFP module
2209+
Returns:
2210+
String that represents the current error descriptions of vendor specific errors
2211+
In case there are multiple errors, they should be joined by '|',
2212+
like: "Bad EEPROM|Unsupported cable"
2213+
"""
2214+
if not self.get_presence():
2215+
return self.SFP_STATUS_UNPLUGGED
2216+
2217+
return self.SFP_STATUS_OK

0 commit comments

Comments
 (0)