[Platform][AS4625-54P][AS4630-54NPE][AS5835-54T/54X][AS9726-32D] Fix …

…psu_fans pytest failed in test_set_fans_led and test_get_fans_target_speed
edge-core · Sep 30, 2024 · 469a059 · 469a059
1 parent 1708468
commit 469a059
Show file tree

Hide file tree

Showing 5 changed files with 70 additions and 10 deletions.
diff --git a/device/accton/x86_64-accton_as4625_54p-r0/platform.json b/device/accton/x86_64-accton_as4625_54p-r0/platform.json
@@ -113,7 +113,13 @@
                 "name": "PSU-1",
                 "fans": [
                     {
-                        "name": "PSU-1 FAN-1"
+                        "name": "PSU-1 FAN-1",
+                        "speed": {
+                            "controllable": false
+                        },
+                        "status_led": {
+                            "controllable": false
+                        }
                     }
                 ],
                 "thermals": [
@@ -141,7 +147,13 @@
                 "name": "PSU-2",
                 "fans": [
                     {
-                        "name": "PSU-2 FAN-1"
+                        "name": "PSU-2 FAN-1",
+                        "speed": {
+                            "controllable": false
+                        },
+                        "status_led": {
+                            "controllable": false
+                        }
                     }
                 ],
                 "thermals": [

diff --git a/device/accton/x86_64-accton_as4630_54npe-r0/platform.json b/device/accton/x86_64-accton_as4630_54npe-r0/platform.json
@@ -120,7 +120,13 @@
                 },
                 "fans": [
                     {
-                        "name": "PSU-1 FAN-1"
+                        "name": "PSU-1 FAN-1",
+                        "speed": {
+                            "controllable": false
+                        },
+                        "status_led": {
+                            "controllable": false
+                        }
                     }
                 ],
                 "thermals": [
@@ -140,7 +146,13 @@
                 },
                 "fans": [
                     {
-                        "name": "PSU-2 FAN-1"
+                        "name": "PSU-2 FAN-1",
+                        "speed": {
+                            "controllable": false
+                        },
+                        "status_led": {
+                            "controllable": false
+                        }
                     }
                 ],
                 "thermals": [

diff --git a/device/accton/x86_64-accton_as5835_54t-r0/platform.json b/device/accton/x86_64-accton_as5835_54t-r0/platform.json
@@ -282,7 +282,13 @@
                 },
                 "fans": [
                     {
-                        "name": "PSU-1 FAN-1"
+                        "name": "PSU-1 FAN-1",
+                        "speed": {
+                            "controllable": false
+                        },
+                        "status_led": {
+                            "controllable": false
+                        }
                     }
                 ],
                 "thermals": [
@@ -305,7 +311,13 @@
                 },
                 "fans": [
                     {
-                        "name": "PSU-2 FAN-1"
+                        "name": "PSU-2 FAN-1",
+                        "speed": {
+                            "controllable": false
+                        },
+                        "status_led": {
+                            "controllable": false
+                        }
                     }
                 ],
                 "thermals": [

diff --git a/device/accton/x86_64-accton_as5835_54x-r0/platform.json b/device/accton/x86_64-accton_as5835_54x-r0/platform.json
@@ -205,7 +205,13 @@
                 "name": "PSU-1",
                 "fans": [
                     {
-                        "name": "PSU-1 FAN-1"
+                        "name": "PSU-1 FAN-1",
+                        "speed": {
+                            "controllable": false
+                        },
+                        "status_led": {
+                            "controllable": false
+                        }
                     }
                 ],
                 "thermals": [
@@ -225,7 +231,13 @@
                 "name": "PSU-2",
                 "fans": [
                     {
-                        "name": "PSU-2 FAN-1"
+                        "name": "PSU-2 FAN-1",
+                        "speed": {
+                            "controllable": false
+                        },
+                        "status_led": {
+                            "controllable": false
+                        }
                     }
                 ],
                 "thermals": [

diff --git a/device/accton/x86_64-accton_as9726_32d-r0/platform.json b/device/accton/x86_64-accton_as9726_32d-r0/platform.json
@@ -334,7 +334,13 @@
                 "name": "PSU-1",
                 "fans": [
                     {
-                        "name": "PSU-1 FAN-1"
+                        "name": "PSU-1 FAN-1",
+                        "speed": {
+                            "controllable": false
+                        },
+                        "status_led": {
+                            "controllable": false
+                        }
                     }
                 ],
                 "thermals": [
@@ -354,7 +360,13 @@
                 "name": "PSU-2",
                 "fans": [
                     {
-                        "name": "PSU-2 FAN-1"
+                        "name": "PSU-2 FAN-1",
+                        "speed": {
+                            "controllable": false
+                        },
+                        "status_led": {
+                            "controllable": false
+                        }
                     }
                 ],
                 "thermals": [