From 3396cca1a3c5f38231e34361c6b89c4bf821623c Mon Sep 17 00:00:00 2001
From: Samuel Angebault <staphylo@arista.com>
Date: Wed, 14 Jun 2023 13:19:28 -0700
Subject: [PATCH] [Arista] fix platform.json for a few devices (#15308)

Why I did it
sonic-mgmt is failing tests due to invalid test data in platform.json
Fwutil is upset the chassis name in the platform_component.json of the 7060CX-32S

How I did it
Fixed the aforementioned issues
---
 .../x86_64-arista_7050_qx32/platform.json     | 42 ++++++++-------
 .../x86_64-arista_7050_qx32s/platform.json    | 51 ++++++++++---------
 .../platform_components.json                  |  2 +-
 3 files changed, 51 insertions(+), 44 deletions(-)

diff --git a/device/arista/x86_64-arista_7050_qx32/platform.json b/device/arista/x86_64-arista_7050_qx32/platform.json
index 115de841943b..8772ce8b23db 100644
--- a/device/arista/x86_64-arista_7050_qx32/platform.json
+++ b/device/arista/x86_64-arista_7050_qx32/platform.json
@@ -53,37 +53,43 @@
         "psus": [
             {
                 "name": "psu1",
-                "fans": []
+                "fans": [
+                    {
+                        "name": "psu1/1",
+                        "speed": {
+                            "controllable": false
+                        }
+                    }
+                ]
             },
             {
                 "name": "psu2",
-                "fans": []
+                "fans": [
+                    {
+                        "name": "psu2/1",
+                        "speed": {
+                            "controllable": false
+                        }
+                    }
+                ]
             }
         ],
         "thermals": [
             {
-                "name": "Cpu temp sensor"
-            },
-            {
-                "name": "Board sensor"
-            },
-            {
-                "name": "Front-panel temp sensor"
-            },
-            {
-                "name": "Rear temp sensor"
-            },
-            {
-                "name": "Power supply 1 inlet temp sensor"
+                "name": "Cpu temp sensor",
+                "controllable": false
             },
             {
-                "name": "Power supply 1 internal sensor"
+                "name": "Board sensor",
+                "controllable": false
             },
             {
-                "name": "Power supply 2 inlet temp sensor"
+                "name": "Front-panel temp sensor",
+                "controllable": false
             },
             {
-                "name": "Power supply 2 internal sensor"
+                "name": "Rear temp sensor",
+                "controllable": false
             }
         ],
         "sfps": [
diff --git a/device/arista/x86_64-arista_7050_qx32s/platform.json b/device/arista/x86_64-arista_7050_qx32s/platform.json
index 0dd9b558d06f..56ee4a0dff25 100644
--- a/device/arista/x86_64-arista_7050_qx32s/platform.json
+++ b/device/arista/x86_64-arista_7050_qx32s/platform.json
@@ -40,46 +40,47 @@
         "psus": [
             {
                 "name": "psu1",
-                "fans": []
+                "fans": [
+                    {
+                        "name": "psu1/1",
+                        "speed": {
+                            "controllable": false
+                        }
+                    }
+                ]
             },
             {
                 "name": "psu2",
-                "fans": []
+                "fans": [
+                    {
+                        "name": "psu2/1",
+                        "speed": {
+                            "controllable": false
+                        }
+                    }
+                ]
             }
         ],
         "thermals": [
             {
-                "name": "Cpu temp sensor"
-            },
-            {
-                "name": "Cpu board temp sensor"
-            },
-            {
-                "name": "Back-panel temp sensor"
-            },
-            {
-                "name": "Board Sensor"
-            },
-            {
-                "name": "Front-panel temp sensor"
-            },
-            {
-                "name": "Power supply 1 hotspot sensor"
-            },
-            {
-                "name": "Power supply 1 inlet temp sensor"
+                "name": "Cpu temp sensor",
+                "controllable": false
             },
             {
-                "name": "Power supply 1 exhaust temp sensor"
+                "name": "Cpu board temp sensor",
+                "controllable": false
             },
             {
-                "name": "Power supply 2 hotspot sensor"
+                "name": "Back-panel temp sensor",
+                "controllable": false
             },
             {
-                "name": "Power supply 2 inlet temp sensor"
+                "name": "Board Sensor",
+                "controllable": false
             },
             {
-                "name": "Power supply 2 exhaust temp sensor"
+                "name": "Front-panel temp sensor",
+                "controllable": false
             }
         ],
         "sfps": [
diff --git a/device/arista/x86_64-arista_7060_cx32s/platform_components.json b/device/arista/x86_64-arista_7060_cx32s/platform_components.json
index d7647e359b86..b89e8017ca57 100644
--- a/device/arista/x86_64-arista_7060_cx32s/platform_components.json
+++ b/device/arista/x86_64-arista_7060_cx32s/platform_components.json
@@ -1,6 +1,6 @@
 {
     "chassis": {
-        "DCS-7050CX3-32S": {
+        "DCS-7060CX-32S": {
             "component": {
                 "Aboot()": {},
                 "Scd(addr=0000:02:00.0)": {},