2 files changed, 121 insertions, 73 deletions
diff --git a/meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config/witherspoon/config.json b/meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config/witherspoon/config.json
new file mode 100644
index 000000000..5923ccc42
--- /dev/null
+++ b/meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config/witherspoon/config.json
@@ -0,0 +1,121 @@
+{
+   "fans": [
+      {
+         "inventory": "/system/chassis/motherboard/fan0",
+         "functional_delay": 5,
+         "allowed_out_of_range_time": 30,
+         "deviation": 15,
+         "num_sensors_nonfunc_for_fan_nonfunc": 1,
+         "sensors": [
+            {
+               "name": "fan0_0",
+               "has_target": true
+            },
+            {
+               "name": "fan0_1",
+               "has_target": false
+            }
+         ]
+      },
+      {
+         "inventory": "/system/chassis/motherboard/fan1",
+         "functional_delay": 5,
+         "allowed_out_of_range_time": 30,
+         "deviation": 15,
+         "num_sensors_nonfunc_for_fan_nonfunc": 1,
+         "sensors": [
+            {
+               "name": "fan1_0",
+               "has_target": true
+            },
+            {
+               "name": "fan1_1",
+               "has_target": false
+            }
+         ],
+         "condition": {
+            "name": "propertiesMatch",
+            "properties": [
+               {
+                  "object": "/xyz/openbmc_project/inventory/system/chassis",
+                  "interface": "xyz.openbmc_project.Inventory.Decorator.CoolingType",
+                  "property": {
+                     "name": "WaterCooled",
+                     "type": "bool",
+                     "value": false
+                  }
+               }
+            ]
+         }
+      },
+      {
+         "inventory": "/system/chassis/motherboard/fan2",
+         "functional_delay": 5,
+         "allowed_out_of_range_time": 30,
+         "deviation": 15,
+         "num_sensors_nonfunc_for_fan_nonfunc": 1,
+         "sensors": [
+            {
+               "name": "fan2_0",
+               "has_target": true
+            },
+            {
+               "name": "fan2_1",
+               "has_target": false
+            }
+         ]
+      },
+      {
+         "inventory": "/system/chassis/motherboard/fan3",
+         "functional_delay": 5,
+         "allowed_out_of_range_time": 30,
+         "deviation": 15,
+         "num_sensors_nonfunc_for_fan_nonfunc": 1,
+         "sensors": [
+            {
+               "name": "fan3_0",
+               "has_target": true
+            },
+            {
+               "name": "fan3_1",
+               "has_target": false
+            }
+         ]
+      }
+   ],
+   "sensor_trust_groups": [
+      {
+         "class": "NonzeroSpeed",
+         "group": [
+            {
+               "name": "fan0_1"
+            },
+            {
+               "name": "fan1_1"
+            },
+            {
+               "name": "fan2_1"
+            },
+            {
+               "name": "fan3_1"
+            },
+            {
+               "name": "fan0_0",
+               "in_trust": false
+            },
+            {
+               "name": "fan1_0",
+               "in_trust": false
+            },
+            {
+               "name": "fan2_0",
+               "in_trust": false
+            },
+            {
+               "name": "fan3_0",
+               "in_trust": false
+            }
+         ]
+      }
+   ]
+}
diff --git a/meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config/witherspoon/monitor.yaml b/meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config/witherspoon/monitor.yaml
deleted file mode 100644
index 5db7966fa..000000000
--- a/meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config/witherspoon/monitor.yaml
+++ /dev/null
@@ -1,73 +0,0 @@
-fans:
-  - inventory: /system/chassis/motherboard/fan0
-    functional_delay: 5
-    allowed_out_of_range_time: 30
-    deviation: 15
-    num_sensors_nonfunc_for_fan_nonfunc: 1
-    sensors:
-      - name: fan0_0
-        has_target: true
-      - name: fan0_1
-        has_target: false
-
-  - inventory: /system/chassis/motherboard/fan1
-    functional_delay: 5
-    allowed_out_of_range_time: 30
-    deviation: 15
-    num_sensors_nonfunc_for_fan_nonfunc: 1
-    sensors:
-      - name: fan1_0
-        has_target: true
-      - name: fan1_1
-        has_target: false
-    # Create fan1 inventory & sensors on air cooled only
-    condition:
-      name: propertiesMatch
-      properties:
-        - object: /xyz/openbmc_project/inventory/system/chassis
-          interface: xyz.openbmc_project.Inventory.Decorator.CoolingType
-          property:
-              name: WaterCooled
-              type: bool
-              value: false
-
-  - inventory: /system/chassis/motherboard/fan2
-    functional_delay: 5
-    allowed_out_of_range_time: 30
-    deviation: 15
-    num_sensors_nonfunc_for_fan_nonfunc: 1
-    sensors:
-      - name: fan2_0
-        has_target: true
-      - name: fan2_1
-        has_target: false
-
-  - inventory: /system/chassis/motherboard/fan3
-    functional_delay: 5
-    allowed_out_of_range_time: 30
-    deviation: 15
-    num_sensors_nonfunc_for_fan_nonfunc: 1
-    sensors:
-      - name: fan3_0
-        has_target: true
-      - name: fan3_1
-        has_target: false
-
-sensor_trust_groups:
-  - class: NonzeroSpeed
-    group:
-        # Include all _1 fans to determine trust
-      - name: fan0_1
-      - name: fan1_1
-      - name: fan2_1
-      - name: fan3_1
-        # Add all _0 fans to be included in trust result effects,
-        # but not in determining trust
-      - name: fan0_0
-        in_trust: false
-      - name: fan1_0
-        in_trust: false
-      - name: fan2_0
-        in_trust: false
-      - name: fan3_0
-        in_trust: false