From b510ab611bf67fa3586db79addc8383f8c331676 Mon Sep 17 00:00:00 2001
From: "Evgeny Alekseev (IBS Group)" <ealekseev@ibs.sila.ru>
Date: Fri, 17 Jun 2022 12:26:17 +0300
Subject: [Mod]SILA-Baseboard, SILA-Fans.json rename fans acc to SILA

Rename Fans according to SILA docs.
Move Airflow sensor to SILA-FANS.json
---
 .../entity-manager/SILA-Baseboard.json             | 20 ----------
 .../configuration/entity-manager/SILA-Fans.json    | 46 ++++++++++++++++++++--
 2 files changed, 43 insertions(+), 23 deletions(-)

diff --git a/meta-ibs/meta-ast2500/recipes-phosphor/configuration/entity-manager/SILA-Baseboard.json b/meta-ibs/meta-ast2500/recipes-phosphor/configuration/entity-manager/SILA-Baseboard.json
index 86e5ca2d9f..9081fd84fa 100644
--- a/meta-ibs/meta-ast2500/recipes-phosphor/configuration/entity-manager/SILA-Baseboard.json
+++ b/meta-ibs/meta-ast2500/recipes-phosphor/configuration/entity-manager/SILA-Baseboard.json
@@ -466,26 +466,6 @@
             },
             "Type": "HostCpuUtilization"
         },
-        {
-            "C1": 92.16,
-            "C2": 107.52,
-            "MaxCFM": 17.5,
-            "Name": "System Airflow",
-            "TachMaxPercent": 100,
-            "TachMinPercent": 20,
-            "Tachs": [
-                "Fan CPU1b",
-                "Fan 0",
-                "Fan chassis 1",
-                "Fan chassis 2",
-                "Fan chassis 3",
-                "Fan chassis 4",
-                "Fan CPU1a",
-                "Fan CPU2a",
-                "Fan CPU2b"
-            ],
-            "Type": "CFMSensor"
-        },
         {
             "Name": "Node Manager Sensor",
             "Type": "NMSensor"
diff --git a/meta-ibs/meta-ast2500/recipes-phosphor/configuration/entity-manager/SILA-Fans.json b/meta-ibs/meta-ast2500/recipes-phosphor/configuration/entity-manager/SILA-Fans.json
index d63f803381..758ad66c7a 100644
--- a/meta-ibs/meta-ast2500/recipes-phosphor/configuration/entity-manager/SILA-Fans.json
+++ b/meta-ibs/meta-ast2500/recipes-phosphor/configuration/entity-manager/SILA-Fans.json
@@ -1,12 +1,32 @@
 {
     "Exposes": [
+        {
+            "C1": 92.16,
+            "C2": 107.52,
+            "MaxCFM": 17.5,
+            "Name": "System Airflow",
+            "TachMaxPercent": 100,
+            "TachMinPercent": 20,
+            "Tachs": [
+                "System Fan 1",
+                "",
+                "",
+                "",
+                "System Fan 2",
+                "System Fan 3",
+                "CPU2 Fan",
+                "",
+                "CPU1 Fan"
+            ],
+            "Type": "CFMSensor"
+        },
         {
             "Connector": {
                 "Pwm": 0,
                 "Tachs": [0]
             },
             "Index": 0,
-            "Name": "Fan CPU1b",
+            "Name": "System Fan 1",
             "Description": "J2K3",
             "Type": "AspeedFan"
         },
@@ -16,7 +36,7 @@
                 "Tachs": [4]
             },
             "Index": 4,
-            "Name": "Fan chassis 3",
+            "Name": "System Fan 2",
             "Description": "J4K3",
             "Type": "AspeedFan"
         },
@@ -26,10 +46,30 @@
                 "Tachs": [5]
             },
             "Index": 5,
-            "Name": "Fan chassis 4",
+            "Name": "System Fan 3",
             "Description": "J4K4",
             "Type": "AspeedFan"
         },
+        {
+            "Connector": {
+                "Pwm": 6,
+                "Tachs": [8]
+            },
+            "Index": 6,
+            "Name": "CPU1 Fan",
+            "Description": "J6K1",
+            "Type": "AspeedFan"
+        },
+        {
+            "Connector": {
+                "Pwm": 7,
+                "Tachs": [6]
+            },
+            "Index": 7,
+            "Name": "CPU2 Fan",
+            "Description": "J6A1",
+            "Type": "AspeedFan"
+        },
         {
             "Address": "0x4e",
             "Bus": 6,
-- 
cgit v1.2.3