From 629f4459d79d16d8a2b30d95f1c94b8982977d61 Mon Sep 17 00:00:00 2001 From: Kebo Liu Date: Sat, 8 May 2021 00:42:40 +0800 Subject: [PATCH] [Mellanox] Align PSU fan name in platform.json with latest change in PR #7490 (#7557) The PSU fan name convention was changed from "psu_{}_fan_{}" to "psu{}_fan{}" in PR #7490, platform.json need to be changed and aligned. --- device/mellanox/x86_64-mlnx_msn2410-r0/platform.json | 4 ++-- device/mellanox/x86_64-mlnx_msn2700-r0/platform.json | 4 ++-- device/mellanox/x86_64-mlnx_msn2740-r0/platform.json | 4 ++-- device/mellanox/x86_64-mlnx_msn3420-r0/platform.json | 4 ++-- device/mellanox/x86_64-mlnx_msn3700-r0/platform.json | 4 ++-- device/mellanox/x86_64-mlnx_msn3700c-r0/platform.json | 4 ++-- device/mellanox/x86_64-mlnx_msn3800-r0/platform.json | 4 ++-- device/mellanox/x86_64-mlnx_msn4410-r0/platform.json | 4 ++-- device/mellanox/x86_64-mlnx_msn4600-r0/platform.json | 4 ++-- device/mellanox/x86_64-mlnx_msn4600c-r0/platform.json | 4 ++-- device/mellanox/x86_64-mlnx_msn4700-r0/platform.json | 4 ++-- 11 files changed, 22 insertions(+), 22 deletions(-) diff --git a/device/mellanox/x86_64-mlnx_msn2410-r0/platform.json b/device/mellanox/x86_64-mlnx_msn2410-r0/platform.json index f0e6f6f320..10ac345814 100644 --- a/device/mellanox/x86_64-mlnx_msn2410-r0/platform.json +++ b/device/mellanox/x86_64-mlnx_msn2410-r0/platform.json @@ -73,7 +73,7 @@ "name": "PSU 1", "fans": [ { - "name": "psu_1_fan_1" + "name": "psu1_fan1" } ], "thermals": [ @@ -86,7 +86,7 @@ "name": "PSU 2", "fans": [ { - "name": "psu_2_fan_1" + "name": "psu2_fan1" } ], "thermals": [ diff --git a/device/mellanox/x86_64-mlnx_msn2700-r0/platform.json b/device/mellanox/x86_64-mlnx_msn2700-r0/platform.json index 4cf282b46c..09445f7fe9 100644 --- a/device/mellanox/x86_64-mlnx_msn2700-r0/platform.json +++ b/device/mellanox/x86_64-mlnx_msn2700-r0/platform.json @@ -73,7 +73,7 @@ "name": "PSU 1", "fans": [ { - "name": "psu_1_fan_1" + "name": "psu1_fan1" } ], "thermals": [ @@ -86,7 +86,7 @@ "name": "PSU 2", "fans": [ { - "name": "psu_2_fan_1" + "name": "psu2_fan1" } ], "thermals": [ diff --git a/device/mellanox/x86_64-mlnx_msn2740-r0/platform.json b/device/mellanox/x86_64-mlnx_msn2740-r0/platform.json index 33821ad83b..e7847ee285 100644 --- a/device/mellanox/x86_64-mlnx_msn2740-r0/platform.json +++ b/device/mellanox/x86_64-mlnx_msn2740-r0/platform.json @@ -58,7 +58,7 @@ "name": "PSU 1", "fans": [ { - "name": "psu_1_fan_1" + "name": "psu1_fan1" } ], "thermals": [ @@ -71,7 +71,7 @@ "name": "PSU 2", "fans": [ { - "name": "psu_2_fan_1" + "name": "psu2_fan1" } ], "thermals": [ diff --git a/device/mellanox/x86_64-mlnx_msn3420-r0/platform.json b/device/mellanox/x86_64-mlnx_msn3420-r0/platform.json index 339e40e79f..415d7de70e 100644 --- a/device/mellanox/x86_64-mlnx_msn3420-r0/platform.json +++ b/device/mellanox/x86_64-mlnx_msn3420-r0/platform.json @@ -84,7 +84,7 @@ "name": "PSU 1", "fans": [ { - "name": "psu_1_fan_1" + "name": "psu1_fan1" } ], "thermals": [ @@ -97,7 +97,7 @@ "name": "PSU 2", "fans": [ { - "name": "psu_2_fan_1" + "name": "psu2_fan1" } ], "thermals": [ diff --git a/device/mellanox/x86_64-mlnx_msn3700-r0/platform.json b/device/mellanox/x86_64-mlnx_msn3700-r0/platform.json index 36ee7fac87..ffb0d93cd3 100644 --- a/device/mellanox/x86_64-mlnx_msn3700-r0/platform.json +++ b/device/mellanox/x86_64-mlnx_msn3700-r0/platform.json @@ -95,7 +95,7 @@ "name": "PSU 1", "fans": [ { - "name": "psu_1_fan_1" + "name": "psu1_fan1" } ], "thermals": [ @@ -108,7 +108,7 @@ "name": "PSU 2", "fans": [ { - "name": "psu_2_fan_1" + "name": "psu2_fan1" } ], "thermals": [ diff --git a/device/mellanox/x86_64-mlnx_msn3700c-r0/platform.json b/device/mellanox/x86_64-mlnx_msn3700c-r0/platform.json index 9b62165447..821b8204e7 100644 --- a/device/mellanox/x86_64-mlnx_msn3700c-r0/platform.json +++ b/device/mellanox/x86_64-mlnx_msn3700c-r0/platform.json @@ -73,7 +73,7 @@ "name": "PSU 1", "fans": [ { - "name": "psu_1_fan_1" + "name": "psu1_fan1" } ], "thermals": [ @@ -86,7 +86,7 @@ "name": "PSU 2", "fans": [ { - "name": "psu_2_fan_1" + "name": "psu2_fan1" } ], "thermals": [ diff --git a/device/mellanox/x86_64-mlnx_msn3800-r0/platform.json b/device/mellanox/x86_64-mlnx_msn3800-r0/platform.json index ed61222366..3c458e4e1c 100644 --- a/device/mellanox/x86_64-mlnx_msn3800-r0/platform.json +++ b/device/mellanox/x86_64-mlnx_msn3800-r0/platform.json @@ -56,7 +56,7 @@ "name": "PSU 1", "fans": [ { - "name": "psu_1_fan_1" + "name": "psu1_fan1" } ], "thermals": [ @@ -69,7 +69,7 @@ "name": "PSU 2", "fans": [ { - "name": "psu_2_fan_1" + "name": "psu2_fan1" } ], "thermals": [ diff --git a/device/mellanox/x86_64-mlnx_msn4410-r0/platform.json b/device/mellanox/x86_64-mlnx_msn4410-r0/platform.json index d50fc6f5c6..c4836d4b23 100644 --- a/device/mellanox/x86_64-mlnx_msn4410-r0/platform.json +++ b/device/mellanox/x86_64-mlnx_msn4410-r0/platform.json @@ -95,7 +95,7 @@ "name": "PSU 1", "fans": [ { - "name": "psu_1_fan_1" + "name": "psu1_fan1" } ], "thermals": [ @@ -108,7 +108,7 @@ "name": "PSU 2", "fans": [ { - "name": "psu_2_fan_1" + "name": "psu2_fan1" } ], "thermals": [ diff --git a/device/mellanox/x86_64-mlnx_msn4600-r0/platform.json b/device/mellanox/x86_64-mlnx_msn4600-r0/platform.json index 9794c0d94a..033b58cb81 100644 --- a/device/mellanox/x86_64-mlnx_msn4600-r0/platform.json +++ b/device/mellanox/x86_64-mlnx_msn4600-r0/platform.json @@ -53,7 +53,7 @@ "name": "PSU 1", "fans": [ { - "name": "psu_1_fan_1" + "name": "psu1_fan1" } ], "thermals": [ @@ -66,7 +66,7 @@ "name": "PSU 2", "fans": [ { - "name": "psu_2_fan_1" + "name": "psu2_fan1" } ], "thermals": [ diff --git a/device/mellanox/x86_64-mlnx_msn4600c-r0/platform.json b/device/mellanox/x86_64-mlnx_msn4600c-r0/platform.json index 37decda69d..691be91ab4 100644 --- a/device/mellanox/x86_64-mlnx_msn4600c-r0/platform.json +++ b/device/mellanox/x86_64-mlnx_msn4600c-r0/platform.json @@ -53,7 +53,7 @@ "name": "PSU 1", "fans": [ { - "name": "psu_1_fan_1" + "name": "psu1_fan1" } ], "thermals": [ @@ -66,7 +66,7 @@ "name": "PSU 2", "fans": [ { - "name": "psu_2_fan_1" + "name": "psu2_fan1" } ], "thermals": [ diff --git a/device/mellanox/x86_64-mlnx_msn4700-r0/platform.json b/device/mellanox/x86_64-mlnx_msn4700-r0/platform.json index a9c1c5dd05..9f0391fa35 100644 --- a/device/mellanox/x86_64-mlnx_msn4700-r0/platform.json +++ b/device/mellanox/x86_64-mlnx_msn4700-r0/platform.json @@ -95,7 +95,7 @@ "name": "PSU 1", "fans": [ { - "name": "psu_1_fan_1" + "name": "psu1_fan1" } ], "thermals": [ @@ -108,7 +108,7 @@ "name": "PSU 2", "fans": [ { - "name": "psu_2_fan_1" + "name": "psu2_fan1" } ], "thermals": [