prettier: re-format

Prettier is enabled in openbmc-build-scripts on Markdown, JSON, and YAML
files to have consistent formatting for these file types.  Re-run the
formatter on the whole repository.

Change-Id: I961ec77b2617da3e097e64e0d8e8980bb7e5b426
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
diff --git a/control/config_files/p10bmc/ibm,rainier-1s4u/events.json b/control/config_files/p10bmc/ibm,rainier-1s4u/events.json
index 8dc7408..520e0cb 100644
--- a/control/config_files/p10bmc/ibm,rainier-1s4u/events.json
+++ b/control/config_files/p10bmc/ibm,rainier-1s4u/events.json
@@ -1,1146 +1,1146 @@
 [
-   {
-     // Hold fans at the given target when a number of fans are missing.
-     "name": "fan(s) missing",
-     "groups": [
-       {
-         "name": "fan inventory",
-         "interface": "xyz.openbmc_project.Inventory.Item",
-         "property": { "name": "Present" }
-       }
-     ],
-     "triggers": [
-       {
-         "class": "init",
-         "method": "get_properties"
-       },
-       {
-         "class": "signal",
-         "signal": "properties_changed"
-       }
-     ],
-     "actions": [
-       {
-         "name": "count_state_before_target",
-         "count": 1,
-         "state": false,
-         "target": 10400
-       }
-     ]
-   },
-   {
-     // Hold fans at the given target when a number of rotors are nonfunctional.
-     "name": "fan rotor(s) faulted",
-     "groups": [
-       {
-         "name": "fan0 rotor inventory",
-         "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
-         "property": { "name": "Functional" }
-       },
-       {
-         "name": "fan1 rotor inventory",
-         "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
-         "property": { "name": "Functional" }
-       },
-       {
-         "name": "fan2 rotor inventory",
-         "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
-         "property": { "name": "Functional" }
-       },
-       {
-         "name": "fan4 rotor inventory",
-         "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
-         "property": { "name": "Functional" }
-       }
-     ],
-     "triggers": [
-       {
-         "class": "init",
-         "method": "get_properties"
-       },
-       {
-         "class": "signal",
-         "signal": "properties_changed"
-       }
-     ],
-     "actions": [
-       {
-         "name": "count_state_before_target",
-         "count": 1,
-         "state": false,
-         "target": 10400
-       }
-     ]
-   },
-   {
-     // Hold fans at the given target when any critical service
-     // is not running for 5 seconds.
-     "name": "service(s) missing",
-     "groups": [
-       {
-         "name": "fan inventory",
-         "interface": "xyz.openbmc_project.Inventory.Item",
-         "property": { "name": "Present" }
-       },
-       {
-         "name": "occ objects",
-         "interface": "org.open_power.OCC.Status",
-         "property": { "name": "OccActive" }
-       },
-       {
-         "name": "nvme temps",
-         "interface": "xyz.openbmc_project.Sensor.Value",
-         "property": { "name": "Value" }
-       },
-       {
-         "name": "planar temps",
-         "interface": "xyz.openbmc_project.Sensor.Value",
-         "property": { "name": "Value" }
-       },
-       {
-         "name": "flett temps",
-         "interface": "xyz.openbmc_project.Sensor.Value",
-         "property": { "name": "Value" }
-       },
-       {
-         "name": "pcie cable card temps",
-         "interface": "xyz.openbmc_project.Sensor.Value",
-         "property": { "name": "Value" }
-       },
-       {
-         "name": "ambient temp",
-         "interface": "xyz.openbmc_project.Sensor.Value",
-         "property": { "name": "Value" }
-       }
-     ],
-     "triggers": [
-       {
-         "class": "init",
-         "method": "name_has_owner"
-       },
-       {
-         "class": "signal",
-         "signal": "name_owner_changed"
-       }
-     ],
-     "actions": [
-       {
-         "name": "call_actions_based_on_timer",
-         "timer": {
-           "interval": 5000000,
-           "type": "oneshot"
-         },
-         "actions": [
-           {
-             "name": "set_target_on_missing_owner",
-             "groups": [
-               {
-                 "name": "fan inventory",
-                 "interface": "xyz.openbmc_project.Inventory.Item",
-                 "property": { "name": "Present" }
-               },
-               {
-                 "name": "occ objects",
-                 "interface": "org.open_power.OCC.Status",
-                 "property": { "name": "OccActive" }
-               },
-               {
-                 "name": "nvme temps",
-                 "interface": "xyz.openbmc_project.Sensor.Value",
-                 "property": { "name": "Value" }
-               },
-               {
-                 "name": "planar temps",
-                 "interface": "xyz.openbmc_project.Sensor.Value",
-                 "property": { "name": "Value" }
-               },
-               {
-                 "name": "flett temps",
-                 "interface": "xyz.openbmc_project.Sensor.Value",
-                 "property": { "name": "Value" }
-               },
-               {
-                 "name": "pcie cable card temps",
-                 "interface": "xyz.openbmc_project.Sensor.Value",
-                 "property": { "name": "Value" }
-               },
-               {
-                 "name": "ambient temp",
-                 "interface": "xyz.openbmc_project.Sensor.Value",
-                 "property": { "name": "Value" }
-               }
-             ],
-             "target": 10400
-           }
-         ]
-       }
-     ]
-   },
-   {
-    // Set a fan floor if an OCC isn't active
-    "name": "Non-active OCC(s)",
-    "groups": [
-      {
-        "name": "occ objects",
-        "interface": "org.open_power.OCC.Status",
-        "property": {
-          "name": "OccActive"
-        }
-      }
-    ],
-    "triggers": [
-      {
-        "class": "signal",
-        "signal": "properties_changed"
-      },
-      {
-        "class": "signal",
-        "signal": "interfaces_added"
-      },
-      {
-        "class": "init",
-        "method": "get_properties"
-      }
-    ],
-    "actions": [
-      {
-        "name": "count_state_floor",
-        "count": 1,
-        "state": false,
-        "floor": 10400
-      }
-    ]
-  },
-  {
-    // Set a raised fan floor when any temperature sensor is nonfunctional
-    "name": "Nonfunctional temperature sensors",
-    "groups": [
-      {
-        "name": "proc0 core temps",
-        "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
-        "property": { "name": "Functional" }
-      },
-      {
-        "name": "proc1 core temps",
-        "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
-        "property": { "name": "Functional" }
-      },
-      {
-        "name": "proc0 ioring temp",
-        "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
-        "property": { "name": "Functional" }
-      },
-      {
-        "name": "proc1 ioring temp",
-        "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
-        "property": { "name": "Functional" }
-      },
-      {
-        "name": "dram temps",
-        "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
-        "property": { "name": "Functional" }
-      },
-      {
-        "name": "pmic temps",
-        "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
-        "property": { "name": "Functional" }
-      },
-      {
-        "name": "internal memory buffer temps",
-        "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
-        "property": { "name": "Functional" }
-      },
-      {
-        "name": "dram and external memory buffer temps",
-        "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
-        "property": { "name": "Functional" }
-      },
-      {
-        "name": "external memory buffer temps",
-        "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
-        "property": { "name": "Functional" }
-      },
-      {
-        "name": "vdd vrm temps",
-        "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
-        "property": { "name": "Functional" }
-      },
-      {
-        "name": "nvme temps",
-        "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
-        "property": { "name": "Functional" }
-      },
-      {
-        "name": "planar temps",
-        "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
-        "property": { "name": "Functional" }
-      },
-      {
-        "name": "flett temps",
-        "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
-        "property": { "name": "Functional" }
-      },
-      {
-        "name": "pcie cable card temps",
-        "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
-        "property": { "name": "Functional" }
-      },
-      {
-        "name": "ambient temp",
-        "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
-        "property": { "name": "Functional" }
-      }
-    ],
-    "triggers": [
-      {
-        "class": "signal",
-        "signal": "properties_changed"
-      },
-      {
-        "class": "signal",
-        "signal": "interfaces_added"
-      },
-      {
-        "class": "signal",
-        "signal": "interfaces_removed"
-      },
-      {
-        "class": "init",
-        "method": "get_properties"
-      }
-    ],
-    "actions": [
-      {
-        "name": "count_state_floor",
-        "count": 1,
-        "state": false,
-        "floor": 10400
-      }
-    ]
-  },
-  {
-     "name": "Set Proc 0 Core DVFS parameter",
-     "groups": [
-       {
-         "name": "proc 0 core dvfs temp",
-         "interface": "xyz.openbmc_project.Sensor.Value",
-         "property": { "name": "Value" }
-       }
-     ],
-     "triggers": [
-       {
-         "class": "init",
-         "method": "get_properties"
-       },
-       {
-         "class": "signal",
-         "signal": "interfaces_added"
-       },
-       {
-         "class": "signal",
-         "signal": "properties_changed"
-       }
-     ],
-     "actions": [
-       {
-         "name": "set_parameter_from_group_max",
-         "parameter_name": "proc_0_core_dvfs_increase_temp",
-         "modifier": {
-             "operator": "minus",
-             "value": 10
-         }
-       },
-       {
-         "name": "set_parameter_from_group_max",
-         "parameter_name": "proc_0_core_dvfs_decrease_temp",
-         "modifier": {
-             "operator": "minus",
-             "value": 13
-         }
-       }
-     ]
-   },
-   {
-     "name": "Set Proc 1 Core DVFS parameter",
-     "groups": [
-       {
-         "name": "proc 1 core dvfs temp",
-         "interface": "xyz.openbmc_project.Sensor.Value",
-         "property": { "name": "Value" }
-       }
-     ],
-     "triggers": [
-       {
-         "class": "init",
-         "method": "get_properties"
-       },
-       {
-         "class": "signal",
-         "signal": "interfaces_added"
-       },
-       {
-         "class": "signal",
-         "signal": "properties_changed"
-       }
-     ],
-     "actions": [
-       {
-         "name": "set_parameter_from_group_max",
-         "parameter_name": "proc_1_core_dvfs_increase_temp",
-         "modifier": {
-             "operator": "minus",
-             "value": 10
-         }
-       },
-       {
-         "name": "set_parameter_from_group_max",
-         "parameter_name": "proc_1_core_dvfs_decrease_temp",
-         "modifier": {
-             "operator": "minus",
-             "value": 13
-         }
-       }
-     ]
-   },
-   {
-     "name": "Set Proc 0 IO Ring DVFS parameter",
-     "groups": [
-       {
-         "name": "proc 0 ioring dvfs temp",
-         "interface": "xyz.openbmc_project.Sensor.Value",
-         "property": { "name": "Value" }
-       }
-     ],
-     "triggers": [
-       {
-         "class": "init",
-         "method": "get_properties"
-       },
-       {
-         "class": "signal",
-         "signal": "interfaces_added"
-       },
-       {
-         "class": "signal",
-         "signal": "properties_changed"
-       }
-     ],
-     "actions": [
-       {
-         "name": "set_parameter_from_group_max",
-         "parameter_name": "proc_0_ioring_dvfs_increase_temp",
-         "modifier": {
-             "operator": "minus",
-             "value": 10
-         }
-       },
-       {
-         "name": "set_parameter_from_group_max",
-         "parameter_name": "proc_0_ioring_dvfs_decrease_temp",
-         "modifier": {
-             "operator": "minus",
-             "value": 13
-         }
-       }
-     ]
-   },
-   {
-     "name": "Set Proc 1 IO Ring DVFS parameter",
-     "groups": [
-       {
-         "name": "proc 1 ioring dvfs temp",
-         "interface": "xyz.openbmc_project.Sensor.Value",
-         "property": { "name": "Value" }
-       }
-     ],
-     "triggers": [
-       {
-         "class": "init",
-         "method": "get_properties"
-       },
-       {
-         "class": "signal",
-         "signal": "interfaces_added"
-       },
-       {
-         "class": "signal",
-         "signal": "properties_changed"
-       }
-     ],
-     "actions": [
-       {
-         "name": "set_parameter_from_group_max",
-         "parameter_name": "proc_1_ioring_dvfs_increase_temp",
-         "modifier": {
-             "operator": "minus",
-             "value": 10
-         }
-       },
-       {
-         "name": "set_parameter_from_group_max",
-         "parameter_name": "proc_1_ioring_dvfs_decrease_temp",
-         "modifier": {
-             "operator": "minus",
-             "value": 13
-         }
-       }
-     ]
-   },
-   {
-     // Collect group temperatures each iteration the repeating timer expires
-     "name": "Fan control timer loop",
-     "groups": [
-       {
-         "name": "proc0 core temps",
-         "interface": "xyz.openbmc_project.Sensor.Value",
-         "property": { "name": "Value" }
-       },
-       {
-         "name": "proc1 core temps",
-         "interface": "xyz.openbmc_project.Sensor.Value",
-         "property": { "name": "Value" }
-       },
-       {
-         "name": "proc0 ioring temp",
-         "interface": "xyz.openbmc_project.Sensor.Value",
-         "property": { "name": "Value" }
-       },
-       {
-         "name": "proc1 ioring temp",
-         "interface": "xyz.openbmc_project.Sensor.Value",
-         "property": { "name": "Value" }
-       },
-       {
-         "name": "dram temps",
-         "interface": "xyz.openbmc_project.Sensor.Value",
-         "property": { "name": "Value" }
-       },
-       {
-         "name": "pmic temps",
-         "interface": "xyz.openbmc_project.Sensor.Value",
-         "property": { "name": "Value" }
-       },
-       {
-         "name": "internal memory buffer temps",
-         "interface": "xyz.openbmc_project.Sensor.Value",
-         "property": { "name": "Value" }
-       },
-       {
-         "name": "dram and external memory buffer temps",
-         "interface": "xyz.openbmc_project.Sensor.Value",
-         "property": { "name": "Value" }
-       },
-       {
-         "name": "external memory buffer temps",
-         "interface": "xyz.openbmc_project.Sensor.Value",
-         "property": { "name": "Value" }
-       },
-       {
-         "name": "vdd vrm temps",
-         "interface": "xyz.openbmc_project.Sensor.Value",
-         "property": { "name": "Value" }
-       },
-       {
-         "name": "nvme temps",
-         "interface": "xyz.openbmc_project.Sensor.Value",
-         "property": { "name": "Value" }
-       },
-       {
-         "name": "planar temps",
-         "interface": "xyz.openbmc_project.Sensor.Value",
-         "property": { "name": "Value" }
-       },
-       {
-         "name": "flett temps",
-         "interface": "xyz.openbmc_project.Sensor.Value",
-         "property": { "name": "Value" }
-       },
-       {
-         "name": "pcie cable card temps",
-         "interface": "xyz.openbmc_project.Sensor.Value",
-         "property": { "name": "Value" }
-       }
-     ],
-     "triggers": [
-       {
-         "class": "timer",
-         "type": "repeating",
-         "interval": 2000000,
-         "preload_groups": true
-       }
-     ],
-     "actions": [
-       {
-         "name": "set_net_increase_target",
-         "groups": [
-           {
-             "name": "proc0 core temps",
-             "interface": "xyz.openbmc_project.Sensor.Value",
-             "property": { "name": "Value" }
-           }
-         ],
-         "state_parameter_name": "proc_0_core_dvfs_increase_temp",
-         "delta": 300
-       },
-       {
-         "name": "set_net_increase_target",
-         "groups": [
-           {
-             "name": "proc1 core temps",
-             "interface": "xyz.openbmc_project.Sensor.Value",
-             "property": { "name": "Value" }
-           }
-         ],
-         "state_parameter_name": "proc_1_core_dvfs_increase_temp",
-         "delta": 300
-       },
-       {
-         "name": "set_net_increase_target",
-         "groups": [
-           {
-             "name": "proc0 ioring temp",
-             "interface": "xyz.openbmc_project.Sensor.Value",
-             "property": { "name": "Value" }
-           }
-         ],
-         "state_parameter_name": "proc_0_ioring_dvfs_increase_temp",
-         "delta": 300
-       },
-       {
-         "name": "set_net_increase_target",
-         "groups": [
-           {
-             "name": "proc1 ioring temp",
-             "interface": "xyz.openbmc_project.Sensor.Value",
-             "property": { "name": "Value" }
-           }
-         ],
-         "state_parameter_name": "proc_1_ioring_dvfs_increase_temp",
-         "delta": 300
-       },
-       {
-         "name": "set_net_increase_target",
-         "groups": [
-           {
-             "name": "dram temps",
-             "interface": "xyz.openbmc_project.Sensor.Value",
-             "property": { "name": "Value" }
-           }
-         ],
-         "state": 63.0,
-         "delta": 200
-       },
-       {
-         "name": "set_net_increase_target",
-         "groups": [
-           {
-             "name": "pmic temps",
-             "interface": "xyz.openbmc_project.Sensor.Value",
-             "property": { "name": "Value" }
-           }
-         ],
-         "state": 65.0,
-         "delta": 200
-       },
-       {
-         "name": "set_net_increase_target",
-         "groups": [
-           {
-             "name": "internal memory buffer temps",
-             "interface": "xyz.openbmc_project.Sensor.Value",
-             "property": { "name": "Value" }
-           }
-         ],
-         "state": 74.0,
-         "delta": 200
-       },
-       {
-         "name": "set_net_increase_target",
-         "groups": [
-           {
-             "name": "dram and external memory buffer temps",
-             "interface": "xyz.openbmc_project.Sensor.Value",
-             "property": { "name": "Value" }
-           }
-         ],
-         "state": 66.0,
-         "delta": 200
-       },
-       {
-         "name": "set_net_increase_target",
-         "groups": [
-           {
-             "name": "external memory buffer temps",
-             "interface": "xyz.openbmc_project.Sensor.Value",
-             "property": { "name": "Value" }
-           }
-         ],
-         "state": 60.0,
-         "delta": 200
-       },
-       {
-         "name": "set_net_increase_target",
-         "groups": [
-           {
-             "name": "vdd vrm temps",
-             "interface": "xyz.openbmc_project.Sensor.Value",
-             "property": { "name": "Value" }
-           }
-         ],
-         "state": 82.0,
-         "delta": 300
-       },
-       {
-         "name": "set_net_increase_target",
-         "groups": [
-           {
-             "name": "nvme temps",
-             "interface": "xyz.openbmc_project.Sensor.Value",
-             "property": { "name": "Value" }
-           }
-         ],
-         "state": 58.0,
-         "delta": 200
-       },
-       {
-         "name": "set_net_increase_target",
-         "groups": [
-           {
-             "name": "planar temps",
-             "interface": "xyz.openbmc_project.Sensor.Value",
-             "property": { "name": "Value" }
-           }
-         ],
-         "state": 65.0,
-         "delta": 255
-       },
-       {
-         "name": "set_net_increase_target",
-         "groups": [
-           {
-             "name": "flett temps",
-             "interface": "xyz.openbmc_project.Sensor.Value",
-             "property": { "name": "Value" }
-           }
-         ],
-         "state": 80.0,
-         "delta": 200
-       },
-       {
-         "name": "set_net_increase_target",
-         "groups": [
-           {
-             "name": "pcie cable card temps",
-             "interface": "xyz.openbmc_project.Sensor.Value",
-             "property": { "name": "Value" }
-           }
-         ],
-         "state": 70.0,
-         "delta": 255
-       },
-       {
-         "name": "set_net_decrease_target",
-         "groups": [
-           {
-             "name": "proc0 core temps",
-             "interface": "xyz.openbmc_project.Sensor.Value",
-             "property": { "name": "Value" }
-           }
-         ],
-         "state_parameter_name": "proc_0_core_dvfs_decrease_temp",
-         "delta": 50
-       },
-       {
-         "name": "set_net_decrease_target",
-         "groups": [
-           {
-             "name": "proc1 core temps",
-             "interface": "xyz.openbmc_project.Sensor.Value",
-             "property": { "name": "Value" }
-           }
-         ],
-         "state_parameter_name": "proc_1_core_dvfs_decrease_temp",
-         "delta": 50
-       },
-       {
-         "name": "set_net_decrease_target",
-         "groups": [
-           {
-             "name": "proc0 ioring temp",
-             "interface": "xyz.openbmc_project.Sensor.Value",
-             "property": { "name": "Value" }
-           }
-         ],
-         "state_parameter_name": "proc_0_ioring_dvfs_decrease_temp",
-         "delta": 50
-       },
-       {
-         "name": "set_net_decrease_target",
-         "groups": [
-           {
-             "name": "proc1 ioring temp",
-             "interface": "xyz.openbmc_project.Sensor.Value",
-             "property": { "name": "Value" }
-           }
-         ],
-         "state_parameter_name": "proc_1_ioring_dvfs_decrease_temp",
-         "delta": 50
-       },
-       {
-         "name": "set_net_decrease_target",
-         "groups": [
-           {
-             "name": "dram temps",
-             "interface": "xyz.openbmc_project.Sensor.Value",
-             "property": { "name": "Value" }
-           }
-         ],
-         "state": 60.0,
-         "delta": 50
-       },
-       {
-         "name": "set_net_decrease_target",
-         "groups": [
-           {
-             "name": "pmic temps",
-             "interface": "xyz.openbmc_project.Sensor.Value",
-             "property": { "name": "Value" }
-           }
-         ],
-         "state": 62.0,
-         "delta": 50
-       },
-       {
-         "name": "set_net_decrease_target",
-         "groups": [
-           {
-             "name": "internal memory buffer temps",
-             "interface": "xyz.openbmc_project.Sensor.Value",
-             "property": { "name": "Value" }
-           }
-         ],
-         "state": 71.0,
-         "delta": 50
-       },
-       {
-         "name": "set_net_decrease_target",
-         "groups": [
-           {
-             "name": "dram and external memory buffer temps",
-             "interface": "xyz.openbmc_project.Sensor.Value",
-             "property": { "name": "Value" }
-           }
-         ],
-         "state": 63.0,
-         "delta": 50
-       },
-       {
-         "name": "set_net_decrease_target",
-         "groups": [
-           {
-             "name": "external memory buffer temps",
-             "interface": "xyz.openbmc_project.Sensor.Value",
-             "property": { "name": "Value" }
-           }
-         ],
-         "state": 57.0,
-         "delta": 50
-       },
-       {
-         "name": "set_net_decrease_target",
-         "groups": [
-           {
-             "name": "vdd vrm temps",
-             "interface": "xyz.openbmc_project.Sensor.Value",
-             "property": { "name": "Value" }
-           }
-         ],
-         "state": 79.0,
-         "delta": 50
-       },
-       {
-         "name": "set_net_decrease_target",
-         "groups": [
-           {
-             "name": "nvme temps",
-             "interface": "xyz.openbmc_project.Sensor.Value",
-             "property": { "name": "Value" }
-           }
-         ],
-         "state": 55.0,
-         "delta": 50
-       },
-       {
-         "name": "set_net_decrease_target",
-         "groups": [
-           {
-             "name": "planar temps",
-             "interface": "xyz.openbmc_project.Sensor.Value",
-             "property": { "name": "Value" }
-           }
-         ],
-         "state": 60.0,
-         "delta": 50
-       },
-       {
-         "name": "set_net_decrease_target",
-         "groups": [
-           {
-             "name": "flett temps",
-             "interface": "xyz.openbmc_project.Sensor.Value",
-             "property": { "name": "Value" }
-           }
-         ],
-         "state": 75.0,
-         "delta": 40
-       },
-       {
-         "name": "set_net_decrease_target",
-         "groups": [
-           {
-             "name": "pcie cable card temps",
-             "interface": "xyz.openbmc_project.Sensor.Value",
-             "property": { "name": "Value" }
-           }
-         ],
-         "state": 65.0,
-         "delta": 50
-       }
-     ]
-   },
-   {
-     // Remove NVMe temperature objects from cache when they are removed from
-     // dbus. There's no need to react to their removal.
-     "name": "remove nvme objects",
-     "groups": [
-       {
-         "name": "nvme temps",
-         "interface": "xyz.openbmc_project.Sensor.Value",
-         "property": { "name": "Value" }
-       },
-       {
-        "name": "nvme temps",
-        "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
-        "property": { "name": "Functional" }
-       }
-     ],
-     "triggers": [
-       {
-         "class": "signal",
-         "signal": "interfaces_removed"
-       }
-     ]
-   },
-   {
-     "name": "set pcie floor index",
-     "groups": [
-       {
-         "name": "pcie slots",
-         "interface": "xyz.openbmc_project.State.Decorator.PowerState",
-         "property": {
-           "name": "PowerState"
-         }
-       },
-       {
-         "name": "pcie cards",
-         "interface": "xyz.openbmc_project.Inventory.Item.PCIeDevice",
-         "property": {
-           "name": "Function0DeviceId"
-         }
-       },
-       {
-         "name": "pcie cards",
-         "interface": "xyz.openbmc_project.Inventory.Item.PCIeDevice",
-         "property": {
-           "name": "Function0VendorId"
-         }
-       },
-       {
-         "name": "pcie cards",
-         "interface": "xyz.openbmc_project.Inventory.Item.PCIeDevice",
-         "property": {
-           "name": "Function0SubsystemId"
-         }
-       },
-       {
-         "name": "pcie cards",
-         "interface": "xyz.openbmc_project.Inventory.Item.PCIeDevice",
-         "property": {
-           "name": "Function0SubsystemVendorId"
-         }
-       }
-     ],
-     "triggers": [
-       {
-         "class": "init",
-         "method": "get_properties"
-       },
-       {
-         "class": "signal",
-         "signal": "properties_changed"
-       },
-       {
-         "class": "signal",
-         "signal": "interfaces_added"
-       }
-     ],
-     "actions": [
-       {
-         "name": "pcie_card_floors",
-         "use_config_specific_files": true,
-         "settle_time": 2
-       }
-     ]
-   },
-   {
-     "name": "Set altitude offset parameter",
-     "groups": [
-       {
-         "name": "altitude",
-         "interface": "xyz.openbmc_project.Sensor.Value",
-         "property": { "name": "Value" }
-       }
-     ],
-     "triggers": [
-       {
-         "class": "init",
-         "method": "get_properties"
-       },
-       {
-         "class": "signal",
-         "signal": "interfaces_added"
-       },
-       {
-         // Refresh altitude every 24hrs
-         "class": "timer",
-         "type": "repeating",
-         "interval": 86400000000,
-         "preload_groups": true
-       }
-     ],
-     "actions": [
-       {
-         "name": "set_parameter_from_group_max",
-         "parameter_name": "altitude_offset",
-         "modifier": {
-           "operator": "less_than",
-           "default_value": 3000,
-           "value": [
-             { "arg_value": 1000, "parameter_value": 0 },
-             { "arg_value": 1900, "parameter_value": 1000 },
-             { "arg_value": 2800, "parameter_value": 2000 }
-           ]
-         }
-       }
-     ]
-   },
-   {
-     "name": "Fan floors",
-     "groups": [
-      {
-        "name": "ambient temp",
-        "interface": "xyz.openbmc_project.Sensor.Value",
-        "property": { "name": "Value" }
-      },
-      {
-        "name": "power mode",
-        "interface": "xyz.openbmc_project.Control.Power.Mode",
-        "property": { "name": "PowerMode" }
-      }
-     ],
-     "triggers": [
-       {
-         "class": "init",
-         "method": "get_properties"
-       },
-       {
-         "class": "signal",
-         "signal": "properties_changed"
-       },
-       {
-         "class": "signal",
-         "signal": "interfaces_added"
-       },
-       {
-         "class": "parameter",
-         "parameter": "pcie_floor_index"
-       },
-       {
-         "class": "parameter",
-         "parameter": "altitude_offset"
-       }
-     ],
-     "actions": [
-       {
-         "name": "mapped_floor",
-         "key_group": "ambient temp",
-         "fan_floors": [
-          {
-            // Entry valid for ambient temp < 27
-            "key": 27,
-            "default_floor": 3700,
-            "floor_offset_parameter": "altitude_offset",
-            "floors": [
-              {
-                "parameter": "pcie_floor_index",
-                "floors": [
-                  { "value": 1, "floor": 6000 },
-                  { "value": 2, "floor": 7000 },
-                  { "value": 3, "floor": 8000 }
-                ]
-              }
-            ]
-          },
-          {
-            // Entry valid for ambient temp < 32
-            "key": 32,
-            "default_floor": 5000,
-            "floor_offset_parameter": "altitude_offset",
-            "floors": [
-              {
-                "parameter": "pcie_floor_index",
-                "floors": [
-                  { "value": 1, "floor": 7000 },
-                  { "value": 2, "floor": 9000 },
-                  { "value": 3, "floor": 9500 }
-                ]
-              }
-            ]
-          },
-          {
-            // Entry valid for ambient temp < 37
-            "key": 37,
-            "default_floor": 6000,
-            "floor_offset_parameter": "altitude_offset",
-            "floors": [
-              {
-                "parameter": "pcie_floor_index",
-                "floors": [
-                  { "value": 1, "floor": 9000 },
-                  { "value": 2, "floor": 9500 },
-                  { "value": 3, "floor": 10400 }
-                ]
-              }
-            ]
-          },
-          {
-            // Entry valid for ambient temp < 42
-            "key": 42,
-            "default_floor": 8000,
-            "floor_offset_parameter": "altitude_offset",
-            "floors": [
-              {
-                "parameter": "pcie_floor_index",
-                "floors": [
-                  { "value": 1, "floor": 9500 },
-                  { "value": 2, "floor": 10400 },
-                  { "value": 3, "floor": 10400 }
-                ]
-              }
-            ]
-          }
+    {
+        // Hold fans at the given target when a number of fans are missing.
+        "name": "fan(s) missing",
+        "groups": [
+            {
+                "name": "fan inventory",
+                "interface": "xyz.openbmc_project.Inventory.Item",
+                "property": { "name": "Present" }
+            }
+        ],
+        "triggers": [
+            {
+                "class": "init",
+                "method": "get_properties"
+            },
+            {
+                "class": "signal",
+                "signal": "properties_changed"
+            }
+        ],
+        "actions": [
+            {
+                "name": "count_state_before_target",
+                "count": 1,
+                "state": false,
+                "target": 10400
+            }
         ]
-       }
-     ]
-   }
+    },
+    {
+        // Hold fans at the given target when a number of rotors are nonfunctional.
+        "name": "fan rotor(s) faulted",
+        "groups": [
+            {
+                "name": "fan0 rotor inventory",
+                "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
+                "property": { "name": "Functional" }
+            },
+            {
+                "name": "fan1 rotor inventory",
+                "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
+                "property": { "name": "Functional" }
+            },
+            {
+                "name": "fan2 rotor inventory",
+                "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
+                "property": { "name": "Functional" }
+            },
+            {
+                "name": "fan4 rotor inventory",
+                "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
+                "property": { "name": "Functional" }
+            }
+        ],
+        "triggers": [
+            {
+                "class": "init",
+                "method": "get_properties"
+            },
+            {
+                "class": "signal",
+                "signal": "properties_changed"
+            }
+        ],
+        "actions": [
+            {
+                "name": "count_state_before_target",
+                "count": 1,
+                "state": false,
+                "target": 10400
+            }
+        ]
+    },
+    {
+        // Hold fans at the given target when any critical service
+        // is not running for 5 seconds.
+        "name": "service(s) missing",
+        "groups": [
+            {
+                "name": "fan inventory",
+                "interface": "xyz.openbmc_project.Inventory.Item",
+                "property": { "name": "Present" }
+            },
+            {
+                "name": "occ objects",
+                "interface": "org.open_power.OCC.Status",
+                "property": { "name": "OccActive" }
+            },
+            {
+                "name": "nvme temps",
+                "interface": "xyz.openbmc_project.Sensor.Value",
+                "property": { "name": "Value" }
+            },
+            {
+                "name": "planar temps",
+                "interface": "xyz.openbmc_project.Sensor.Value",
+                "property": { "name": "Value" }
+            },
+            {
+                "name": "flett temps",
+                "interface": "xyz.openbmc_project.Sensor.Value",
+                "property": { "name": "Value" }
+            },
+            {
+                "name": "pcie cable card temps",
+                "interface": "xyz.openbmc_project.Sensor.Value",
+                "property": { "name": "Value" }
+            },
+            {
+                "name": "ambient temp",
+                "interface": "xyz.openbmc_project.Sensor.Value",
+                "property": { "name": "Value" }
+            }
+        ],
+        "triggers": [
+            {
+                "class": "init",
+                "method": "name_has_owner"
+            },
+            {
+                "class": "signal",
+                "signal": "name_owner_changed"
+            }
+        ],
+        "actions": [
+            {
+                "name": "call_actions_based_on_timer",
+                "timer": {
+                    "interval": 5000000,
+                    "type": "oneshot"
+                },
+                "actions": [
+                    {
+                        "name": "set_target_on_missing_owner",
+                        "groups": [
+                            {
+                                "name": "fan inventory",
+                                "interface": "xyz.openbmc_project.Inventory.Item",
+                                "property": { "name": "Present" }
+                            },
+                            {
+                                "name": "occ objects",
+                                "interface": "org.open_power.OCC.Status",
+                                "property": { "name": "OccActive" }
+                            },
+                            {
+                                "name": "nvme temps",
+                                "interface": "xyz.openbmc_project.Sensor.Value",
+                                "property": { "name": "Value" }
+                            },
+                            {
+                                "name": "planar temps",
+                                "interface": "xyz.openbmc_project.Sensor.Value",
+                                "property": { "name": "Value" }
+                            },
+                            {
+                                "name": "flett temps",
+                                "interface": "xyz.openbmc_project.Sensor.Value",
+                                "property": { "name": "Value" }
+                            },
+                            {
+                                "name": "pcie cable card temps",
+                                "interface": "xyz.openbmc_project.Sensor.Value",
+                                "property": { "name": "Value" }
+                            },
+                            {
+                                "name": "ambient temp",
+                                "interface": "xyz.openbmc_project.Sensor.Value",
+                                "property": { "name": "Value" }
+                            }
+                        ],
+                        "target": 10400
+                    }
+                ]
+            }
+        ]
+    },
+    {
+        // Set a fan floor if an OCC isn't active
+        "name": "Non-active OCC(s)",
+        "groups": [
+            {
+                "name": "occ objects",
+                "interface": "org.open_power.OCC.Status",
+                "property": {
+                    "name": "OccActive"
+                }
+            }
+        ],
+        "triggers": [
+            {
+                "class": "signal",
+                "signal": "properties_changed"
+            },
+            {
+                "class": "signal",
+                "signal": "interfaces_added"
+            },
+            {
+                "class": "init",
+                "method": "get_properties"
+            }
+        ],
+        "actions": [
+            {
+                "name": "count_state_floor",
+                "count": 1,
+                "state": false,
+                "floor": 10400
+            }
+        ]
+    },
+    {
+        // Set a raised fan floor when any temperature sensor is nonfunctional
+        "name": "Nonfunctional temperature sensors",
+        "groups": [
+            {
+                "name": "proc0 core temps",
+                "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
+                "property": { "name": "Functional" }
+            },
+            {
+                "name": "proc1 core temps",
+                "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
+                "property": { "name": "Functional" }
+            },
+            {
+                "name": "proc0 ioring temp",
+                "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
+                "property": { "name": "Functional" }
+            },
+            {
+                "name": "proc1 ioring temp",
+                "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
+                "property": { "name": "Functional" }
+            },
+            {
+                "name": "dram temps",
+                "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
+                "property": { "name": "Functional" }
+            },
+            {
+                "name": "pmic temps",
+                "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
+                "property": { "name": "Functional" }
+            },
+            {
+                "name": "internal memory buffer temps",
+                "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
+                "property": { "name": "Functional" }
+            },
+            {
+                "name": "dram and external memory buffer temps",
+                "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
+                "property": { "name": "Functional" }
+            },
+            {
+                "name": "external memory buffer temps",
+                "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
+                "property": { "name": "Functional" }
+            },
+            {
+                "name": "vdd vrm temps",
+                "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
+                "property": { "name": "Functional" }
+            },
+            {
+                "name": "nvme temps",
+                "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
+                "property": { "name": "Functional" }
+            },
+            {
+                "name": "planar temps",
+                "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
+                "property": { "name": "Functional" }
+            },
+            {
+                "name": "flett temps",
+                "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
+                "property": { "name": "Functional" }
+            },
+            {
+                "name": "pcie cable card temps",
+                "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
+                "property": { "name": "Functional" }
+            },
+            {
+                "name": "ambient temp",
+                "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
+                "property": { "name": "Functional" }
+            }
+        ],
+        "triggers": [
+            {
+                "class": "signal",
+                "signal": "properties_changed"
+            },
+            {
+                "class": "signal",
+                "signal": "interfaces_added"
+            },
+            {
+                "class": "signal",
+                "signal": "interfaces_removed"
+            },
+            {
+                "class": "init",
+                "method": "get_properties"
+            }
+        ],
+        "actions": [
+            {
+                "name": "count_state_floor",
+                "count": 1,
+                "state": false,
+                "floor": 10400
+            }
+        ]
+    },
+    {
+        "name": "Set Proc 0 Core DVFS parameter",
+        "groups": [
+            {
+                "name": "proc 0 core dvfs temp",
+                "interface": "xyz.openbmc_project.Sensor.Value",
+                "property": { "name": "Value" }
+            }
+        ],
+        "triggers": [
+            {
+                "class": "init",
+                "method": "get_properties"
+            },
+            {
+                "class": "signal",
+                "signal": "interfaces_added"
+            },
+            {
+                "class": "signal",
+                "signal": "properties_changed"
+            }
+        ],
+        "actions": [
+            {
+                "name": "set_parameter_from_group_max",
+                "parameter_name": "proc_0_core_dvfs_increase_temp",
+                "modifier": {
+                    "operator": "minus",
+                    "value": 10
+                }
+            },
+            {
+                "name": "set_parameter_from_group_max",
+                "parameter_name": "proc_0_core_dvfs_decrease_temp",
+                "modifier": {
+                    "operator": "minus",
+                    "value": 13
+                }
+            }
+        ]
+    },
+    {
+        "name": "Set Proc 1 Core DVFS parameter",
+        "groups": [
+            {
+                "name": "proc 1 core dvfs temp",
+                "interface": "xyz.openbmc_project.Sensor.Value",
+                "property": { "name": "Value" }
+            }
+        ],
+        "triggers": [
+            {
+                "class": "init",
+                "method": "get_properties"
+            },
+            {
+                "class": "signal",
+                "signal": "interfaces_added"
+            },
+            {
+                "class": "signal",
+                "signal": "properties_changed"
+            }
+        ],
+        "actions": [
+            {
+                "name": "set_parameter_from_group_max",
+                "parameter_name": "proc_1_core_dvfs_increase_temp",
+                "modifier": {
+                    "operator": "minus",
+                    "value": 10
+                }
+            },
+            {
+                "name": "set_parameter_from_group_max",
+                "parameter_name": "proc_1_core_dvfs_decrease_temp",
+                "modifier": {
+                    "operator": "minus",
+                    "value": 13
+                }
+            }
+        ]
+    },
+    {
+        "name": "Set Proc 0 IO Ring DVFS parameter",
+        "groups": [
+            {
+                "name": "proc 0 ioring dvfs temp",
+                "interface": "xyz.openbmc_project.Sensor.Value",
+                "property": { "name": "Value" }
+            }
+        ],
+        "triggers": [
+            {
+                "class": "init",
+                "method": "get_properties"
+            },
+            {
+                "class": "signal",
+                "signal": "interfaces_added"
+            },
+            {
+                "class": "signal",
+                "signal": "properties_changed"
+            }
+        ],
+        "actions": [
+            {
+                "name": "set_parameter_from_group_max",
+                "parameter_name": "proc_0_ioring_dvfs_increase_temp",
+                "modifier": {
+                    "operator": "minus",
+                    "value": 10
+                }
+            },
+            {
+                "name": "set_parameter_from_group_max",
+                "parameter_name": "proc_0_ioring_dvfs_decrease_temp",
+                "modifier": {
+                    "operator": "minus",
+                    "value": 13
+                }
+            }
+        ]
+    },
+    {
+        "name": "Set Proc 1 IO Ring DVFS parameter",
+        "groups": [
+            {
+                "name": "proc 1 ioring dvfs temp",
+                "interface": "xyz.openbmc_project.Sensor.Value",
+                "property": { "name": "Value" }
+            }
+        ],
+        "triggers": [
+            {
+                "class": "init",
+                "method": "get_properties"
+            },
+            {
+                "class": "signal",
+                "signal": "interfaces_added"
+            },
+            {
+                "class": "signal",
+                "signal": "properties_changed"
+            }
+        ],
+        "actions": [
+            {
+                "name": "set_parameter_from_group_max",
+                "parameter_name": "proc_1_ioring_dvfs_increase_temp",
+                "modifier": {
+                    "operator": "minus",
+                    "value": 10
+                }
+            },
+            {
+                "name": "set_parameter_from_group_max",
+                "parameter_name": "proc_1_ioring_dvfs_decrease_temp",
+                "modifier": {
+                    "operator": "minus",
+                    "value": 13
+                }
+            }
+        ]
+    },
+    {
+        // Collect group temperatures each iteration the repeating timer expires
+        "name": "Fan control timer loop",
+        "groups": [
+            {
+                "name": "proc0 core temps",
+                "interface": "xyz.openbmc_project.Sensor.Value",
+                "property": { "name": "Value" }
+            },
+            {
+                "name": "proc1 core temps",
+                "interface": "xyz.openbmc_project.Sensor.Value",
+                "property": { "name": "Value" }
+            },
+            {
+                "name": "proc0 ioring temp",
+                "interface": "xyz.openbmc_project.Sensor.Value",
+                "property": { "name": "Value" }
+            },
+            {
+                "name": "proc1 ioring temp",
+                "interface": "xyz.openbmc_project.Sensor.Value",
+                "property": { "name": "Value" }
+            },
+            {
+                "name": "dram temps",
+                "interface": "xyz.openbmc_project.Sensor.Value",
+                "property": { "name": "Value" }
+            },
+            {
+                "name": "pmic temps",
+                "interface": "xyz.openbmc_project.Sensor.Value",
+                "property": { "name": "Value" }
+            },
+            {
+                "name": "internal memory buffer temps",
+                "interface": "xyz.openbmc_project.Sensor.Value",
+                "property": { "name": "Value" }
+            },
+            {
+                "name": "dram and external memory buffer temps",
+                "interface": "xyz.openbmc_project.Sensor.Value",
+                "property": { "name": "Value" }
+            },
+            {
+                "name": "external memory buffer temps",
+                "interface": "xyz.openbmc_project.Sensor.Value",
+                "property": { "name": "Value" }
+            },
+            {
+                "name": "vdd vrm temps",
+                "interface": "xyz.openbmc_project.Sensor.Value",
+                "property": { "name": "Value" }
+            },
+            {
+                "name": "nvme temps",
+                "interface": "xyz.openbmc_project.Sensor.Value",
+                "property": { "name": "Value" }
+            },
+            {
+                "name": "planar temps",
+                "interface": "xyz.openbmc_project.Sensor.Value",
+                "property": { "name": "Value" }
+            },
+            {
+                "name": "flett temps",
+                "interface": "xyz.openbmc_project.Sensor.Value",
+                "property": { "name": "Value" }
+            },
+            {
+                "name": "pcie cable card temps",
+                "interface": "xyz.openbmc_project.Sensor.Value",
+                "property": { "name": "Value" }
+            }
+        ],
+        "triggers": [
+            {
+                "class": "timer",
+                "type": "repeating",
+                "interval": 2000000,
+                "preload_groups": true
+            }
+        ],
+        "actions": [
+            {
+                "name": "set_net_increase_target",
+                "groups": [
+                    {
+                        "name": "proc0 core temps",
+                        "interface": "xyz.openbmc_project.Sensor.Value",
+                        "property": { "name": "Value" }
+                    }
+                ],
+                "state_parameter_name": "proc_0_core_dvfs_increase_temp",
+                "delta": 300
+            },
+            {
+                "name": "set_net_increase_target",
+                "groups": [
+                    {
+                        "name": "proc1 core temps",
+                        "interface": "xyz.openbmc_project.Sensor.Value",
+                        "property": { "name": "Value" }
+                    }
+                ],
+                "state_parameter_name": "proc_1_core_dvfs_increase_temp",
+                "delta": 300
+            },
+            {
+                "name": "set_net_increase_target",
+                "groups": [
+                    {
+                        "name": "proc0 ioring temp",
+                        "interface": "xyz.openbmc_project.Sensor.Value",
+                        "property": { "name": "Value" }
+                    }
+                ],
+                "state_parameter_name": "proc_0_ioring_dvfs_increase_temp",
+                "delta": 300
+            },
+            {
+                "name": "set_net_increase_target",
+                "groups": [
+                    {
+                        "name": "proc1 ioring temp",
+                        "interface": "xyz.openbmc_project.Sensor.Value",
+                        "property": { "name": "Value" }
+                    }
+                ],
+                "state_parameter_name": "proc_1_ioring_dvfs_increase_temp",
+                "delta": 300
+            },
+            {
+                "name": "set_net_increase_target",
+                "groups": [
+                    {
+                        "name": "dram temps",
+                        "interface": "xyz.openbmc_project.Sensor.Value",
+                        "property": { "name": "Value" }
+                    }
+                ],
+                "state": 63.0,
+                "delta": 200
+            },
+            {
+                "name": "set_net_increase_target",
+                "groups": [
+                    {
+                        "name": "pmic temps",
+                        "interface": "xyz.openbmc_project.Sensor.Value",
+                        "property": { "name": "Value" }
+                    }
+                ],
+                "state": 65.0,
+                "delta": 200
+            },
+            {
+                "name": "set_net_increase_target",
+                "groups": [
+                    {
+                        "name": "internal memory buffer temps",
+                        "interface": "xyz.openbmc_project.Sensor.Value",
+                        "property": { "name": "Value" }
+                    }
+                ],
+                "state": 74.0,
+                "delta": 200
+            },
+            {
+                "name": "set_net_increase_target",
+                "groups": [
+                    {
+                        "name": "dram and external memory buffer temps",
+                        "interface": "xyz.openbmc_project.Sensor.Value",
+                        "property": { "name": "Value" }
+                    }
+                ],
+                "state": 66.0,
+                "delta": 200
+            },
+            {
+                "name": "set_net_increase_target",
+                "groups": [
+                    {
+                        "name": "external memory buffer temps",
+                        "interface": "xyz.openbmc_project.Sensor.Value",
+                        "property": { "name": "Value" }
+                    }
+                ],
+                "state": 60.0,
+                "delta": 200
+            },
+            {
+                "name": "set_net_increase_target",
+                "groups": [
+                    {
+                        "name": "vdd vrm temps",
+                        "interface": "xyz.openbmc_project.Sensor.Value",
+                        "property": { "name": "Value" }
+                    }
+                ],
+                "state": 82.0,
+                "delta": 300
+            },
+            {
+                "name": "set_net_increase_target",
+                "groups": [
+                    {
+                        "name": "nvme temps",
+                        "interface": "xyz.openbmc_project.Sensor.Value",
+                        "property": { "name": "Value" }
+                    }
+                ],
+                "state": 58.0,
+                "delta": 200
+            },
+            {
+                "name": "set_net_increase_target",
+                "groups": [
+                    {
+                        "name": "planar temps",
+                        "interface": "xyz.openbmc_project.Sensor.Value",
+                        "property": { "name": "Value" }
+                    }
+                ],
+                "state": 65.0,
+                "delta": 255
+            },
+            {
+                "name": "set_net_increase_target",
+                "groups": [
+                    {
+                        "name": "flett temps",
+                        "interface": "xyz.openbmc_project.Sensor.Value",
+                        "property": { "name": "Value" }
+                    }
+                ],
+                "state": 80.0,
+                "delta": 200
+            },
+            {
+                "name": "set_net_increase_target",
+                "groups": [
+                    {
+                        "name": "pcie cable card temps",
+                        "interface": "xyz.openbmc_project.Sensor.Value",
+                        "property": { "name": "Value" }
+                    }
+                ],
+                "state": 70.0,
+                "delta": 255
+            },
+            {
+                "name": "set_net_decrease_target",
+                "groups": [
+                    {
+                        "name": "proc0 core temps",
+                        "interface": "xyz.openbmc_project.Sensor.Value",
+                        "property": { "name": "Value" }
+                    }
+                ],
+                "state_parameter_name": "proc_0_core_dvfs_decrease_temp",
+                "delta": 50
+            },
+            {
+                "name": "set_net_decrease_target",
+                "groups": [
+                    {
+                        "name": "proc1 core temps",
+                        "interface": "xyz.openbmc_project.Sensor.Value",
+                        "property": { "name": "Value" }
+                    }
+                ],
+                "state_parameter_name": "proc_1_core_dvfs_decrease_temp",
+                "delta": 50
+            },
+            {
+                "name": "set_net_decrease_target",
+                "groups": [
+                    {
+                        "name": "proc0 ioring temp",
+                        "interface": "xyz.openbmc_project.Sensor.Value",
+                        "property": { "name": "Value" }
+                    }
+                ],
+                "state_parameter_name": "proc_0_ioring_dvfs_decrease_temp",
+                "delta": 50
+            },
+            {
+                "name": "set_net_decrease_target",
+                "groups": [
+                    {
+                        "name": "proc1 ioring temp",
+                        "interface": "xyz.openbmc_project.Sensor.Value",
+                        "property": { "name": "Value" }
+                    }
+                ],
+                "state_parameter_name": "proc_1_ioring_dvfs_decrease_temp",
+                "delta": 50
+            },
+            {
+                "name": "set_net_decrease_target",
+                "groups": [
+                    {
+                        "name": "dram temps",
+                        "interface": "xyz.openbmc_project.Sensor.Value",
+                        "property": { "name": "Value" }
+                    }
+                ],
+                "state": 60.0,
+                "delta": 50
+            },
+            {
+                "name": "set_net_decrease_target",
+                "groups": [
+                    {
+                        "name": "pmic temps",
+                        "interface": "xyz.openbmc_project.Sensor.Value",
+                        "property": { "name": "Value" }
+                    }
+                ],
+                "state": 62.0,
+                "delta": 50
+            },
+            {
+                "name": "set_net_decrease_target",
+                "groups": [
+                    {
+                        "name": "internal memory buffer temps",
+                        "interface": "xyz.openbmc_project.Sensor.Value",
+                        "property": { "name": "Value" }
+                    }
+                ],
+                "state": 71.0,
+                "delta": 50
+            },
+            {
+                "name": "set_net_decrease_target",
+                "groups": [
+                    {
+                        "name": "dram and external memory buffer temps",
+                        "interface": "xyz.openbmc_project.Sensor.Value",
+                        "property": { "name": "Value" }
+                    }
+                ],
+                "state": 63.0,
+                "delta": 50
+            },
+            {
+                "name": "set_net_decrease_target",
+                "groups": [
+                    {
+                        "name": "external memory buffer temps",
+                        "interface": "xyz.openbmc_project.Sensor.Value",
+                        "property": { "name": "Value" }
+                    }
+                ],
+                "state": 57.0,
+                "delta": 50
+            },
+            {
+                "name": "set_net_decrease_target",
+                "groups": [
+                    {
+                        "name": "vdd vrm temps",
+                        "interface": "xyz.openbmc_project.Sensor.Value",
+                        "property": { "name": "Value" }
+                    }
+                ],
+                "state": 79.0,
+                "delta": 50
+            },
+            {
+                "name": "set_net_decrease_target",
+                "groups": [
+                    {
+                        "name": "nvme temps",
+                        "interface": "xyz.openbmc_project.Sensor.Value",
+                        "property": { "name": "Value" }
+                    }
+                ],
+                "state": 55.0,
+                "delta": 50
+            },
+            {
+                "name": "set_net_decrease_target",
+                "groups": [
+                    {
+                        "name": "planar temps",
+                        "interface": "xyz.openbmc_project.Sensor.Value",
+                        "property": { "name": "Value" }
+                    }
+                ],
+                "state": 60.0,
+                "delta": 50
+            },
+            {
+                "name": "set_net_decrease_target",
+                "groups": [
+                    {
+                        "name": "flett temps",
+                        "interface": "xyz.openbmc_project.Sensor.Value",
+                        "property": { "name": "Value" }
+                    }
+                ],
+                "state": 75.0,
+                "delta": 40
+            },
+            {
+                "name": "set_net_decrease_target",
+                "groups": [
+                    {
+                        "name": "pcie cable card temps",
+                        "interface": "xyz.openbmc_project.Sensor.Value",
+                        "property": { "name": "Value" }
+                    }
+                ],
+                "state": 65.0,
+                "delta": 50
+            }
+        ]
+    },
+    {
+        // Remove NVMe temperature objects from cache when they are removed from
+        // dbus. There's no need to react to their removal.
+        "name": "remove nvme objects",
+        "groups": [
+            {
+                "name": "nvme temps",
+                "interface": "xyz.openbmc_project.Sensor.Value",
+                "property": { "name": "Value" }
+            },
+            {
+                "name": "nvme temps",
+                "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
+                "property": { "name": "Functional" }
+            }
+        ],
+        "triggers": [
+            {
+                "class": "signal",
+                "signal": "interfaces_removed"
+            }
+        ]
+    },
+    {
+        "name": "set pcie floor index",
+        "groups": [
+            {
+                "name": "pcie slots",
+                "interface": "xyz.openbmc_project.State.Decorator.PowerState",
+                "property": {
+                    "name": "PowerState"
+                }
+            },
+            {
+                "name": "pcie cards",
+                "interface": "xyz.openbmc_project.Inventory.Item.PCIeDevice",
+                "property": {
+                    "name": "Function0DeviceId"
+                }
+            },
+            {
+                "name": "pcie cards",
+                "interface": "xyz.openbmc_project.Inventory.Item.PCIeDevice",
+                "property": {
+                    "name": "Function0VendorId"
+                }
+            },
+            {
+                "name": "pcie cards",
+                "interface": "xyz.openbmc_project.Inventory.Item.PCIeDevice",
+                "property": {
+                    "name": "Function0SubsystemId"
+                }
+            },
+            {
+                "name": "pcie cards",
+                "interface": "xyz.openbmc_project.Inventory.Item.PCIeDevice",
+                "property": {
+                    "name": "Function0SubsystemVendorId"
+                }
+            }
+        ],
+        "triggers": [
+            {
+                "class": "init",
+                "method": "get_properties"
+            },
+            {
+                "class": "signal",
+                "signal": "properties_changed"
+            },
+            {
+                "class": "signal",
+                "signal": "interfaces_added"
+            }
+        ],
+        "actions": [
+            {
+                "name": "pcie_card_floors",
+                "use_config_specific_files": true,
+                "settle_time": 2
+            }
+        ]
+    },
+    {
+        "name": "Set altitude offset parameter",
+        "groups": [
+            {
+                "name": "altitude",
+                "interface": "xyz.openbmc_project.Sensor.Value",
+                "property": { "name": "Value" }
+            }
+        ],
+        "triggers": [
+            {
+                "class": "init",
+                "method": "get_properties"
+            },
+            {
+                "class": "signal",
+                "signal": "interfaces_added"
+            },
+            {
+                // Refresh altitude every 24hrs
+                "class": "timer",
+                "type": "repeating",
+                "interval": 86400000000,
+                "preload_groups": true
+            }
+        ],
+        "actions": [
+            {
+                "name": "set_parameter_from_group_max",
+                "parameter_name": "altitude_offset",
+                "modifier": {
+                    "operator": "less_than",
+                    "default_value": 3000,
+                    "value": [
+                        { "arg_value": 1000, "parameter_value": 0 },
+                        { "arg_value": 1900, "parameter_value": 1000 },
+                        { "arg_value": 2800, "parameter_value": 2000 }
+                    ]
+                }
+            }
+        ]
+    },
+    {
+        "name": "Fan floors",
+        "groups": [
+            {
+                "name": "ambient temp",
+                "interface": "xyz.openbmc_project.Sensor.Value",
+                "property": { "name": "Value" }
+            },
+            {
+                "name": "power mode",
+                "interface": "xyz.openbmc_project.Control.Power.Mode",
+                "property": { "name": "PowerMode" }
+            }
+        ],
+        "triggers": [
+            {
+                "class": "init",
+                "method": "get_properties"
+            },
+            {
+                "class": "signal",
+                "signal": "properties_changed"
+            },
+            {
+                "class": "signal",
+                "signal": "interfaces_added"
+            },
+            {
+                "class": "parameter",
+                "parameter": "pcie_floor_index"
+            },
+            {
+                "class": "parameter",
+                "parameter": "altitude_offset"
+            }
+        ],
+        "actions": [
+            {
+                "name": "mapped_floor",
+                "key_group": "ambient temp",
+                "fan_floors": [
+                    {
+                        // Entry valid for ambient temp < 27
+                        "key": 27,
+                        "default_floor": 3700,
+                        "floor_offset_parameter": "altitude_offset",
+                        "floors": [
+                            {
+                                "parameter": "pcie_floor_index",
+                                "floors": [
+                                    { "value": 1, "floor": 6000 },
+                                    { "value": 2, "floor": 7000 },
+                                    { "value": 3, "floor": 8000 }
+                                ]
+                            }
+                        ]
+                    },
+                    {
+                        // Entry valid for ambient temp < 32
+                        "key": 32,
+                        "default_floor": 5000,
+                        "floor_offset_parameter": "altitude_offset",
+                        "floors": [
+                            {
+                                "parameter": "pcie_floor_index",
+                                "floors": [
+                                    { "value": 1, "floor": 7000 },
+                                    { "value": 2, "floor": 9000 },
+                                    { "value": 3, "floor": 9500 }
+                                ]
+                            }
+                        ]
+                    },
+                    {
+                        // Entry valid for ambient temp < 37
+                        "key": 37,
+                        "default_floor": 6000,
+                        "floor_offset_parameter": "altitude_offset",
+                        "floors": [
+                            {
+                                "parameter": "pcie_floor_index",
+                                "floors": [
+                                    { "value": 1, "floor": 9000 },
+                                    { "value": 2, "floor": 9500 },
+                                    { "value": 3, "floor": 10400 }
+                                ]
+                            }
+                        ]
+                    },
+                    {
+                        // Entry valid for ambient temp < 42
+                        "key": 42,
+                        "default_floor": 8000,
+                        "floor_offset_parameter": "altitude_offset",
+                        "floors": [
+                            {
+                                "parameter": "pcie_floor_index",
+                                "floors": [
+                                    { "value": 1, "floor": 9500 },
+                                    { "value": 2, "floor": 10400 },
+                                    { "value": 3, "floor": 10400 }
+                                ]
+                            }
+                        ]
+                    }
+                ]
+            }
+        ]
+    }
 ]
diff --git a/control/config_files/p10bmc/ibm,rainier-1s4u/groups.json b/control/config_files/p10bmc/ibm,rainier-1s4u/groups.json
index eb4d172..fa19473 100644
--- a/control/config_files/p10bmc/ibm,rainier-1s4u/groups.json
+++ b/control/config_files/p10bmc/ibm,rainier-1s4u/groups.json
@@ -1,375 +1,373 @@
 [
- {
-   "name": "fan inventory",
-   "members": [
-     "/xyz/openbmc_project/inventory/system/chassis/motherboard/fan0",
-     "/xyz/openbmc_project/inventory/system/chassis/motherboard/fan1",
-     "/xyz/openbmc_project/inventory/system/chassis/motherboard/fan2",
-     "/xyz/openbmc_project/inventory/system/chassis/motherboard/fan4"
-   ]
- },
- {
-   "name": "fan0 rotor inventory",
-   "members": [
-     "/xyz/openbmc_project/inventory/system/chassis/motherboard/fan0/fan0_0"
-   ]
- },
- {
-   "name": "fan1 rotor inventory",
-   "members": [
-     "/xyz/openbmc_project/inventory/system/chassis/motherboard/fan1/fan1_0"
-   ]
- },
- {
-   "name": "fan2 rotor inventory",
-   "members": [
-     "/xyz/openbmc_project/inventory/system/chassis/motherboard/fan2/fan2_0"
-   ]
- },
- {
-   "name": "fan4 rotor inventory",
-   "members": [
-     "/xyz/openbmc_project/inventory/system/chassis/motherboard/fan4/fan4_0"
-   ]
- },
- {
-   "name": "occ objects",
-   "service": "org.open_power.OCC.Control",
-   "members": [
-     "/org/open_power/control/occ0",
-     "/org/open_power/control/occ1"
-   ]
- },
- {
-   "name": "proc0 core temps",
-   "service": "org.open_power.OCC.Control",
-   "members": [
-     "/xyz/openbmc_project/sensors/temperature/proc0_core0_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc0_core0_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc0_core1_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc0_core1_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc0_core2_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc0_core2_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc0_core3_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc0_core3_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc0_core4_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc0_core4_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc0_core5_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc0_core5_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc0_core6_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc0_core6_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc0_core7_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc0_core7_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc0_core8_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc0_core8_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc0_core9_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc0_core9_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc0_core10_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc0_core10_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc0_core11_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc0_core11_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc0_core12_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc0_core12_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc0_core13_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc0_core13_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc0_core14_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc0_core14_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc0_core15_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc0_core15_1_temp"
-   ]
- },
- {
-   "name": "proc1 core temps",
-   "service": "org.open_power.OCC.Control",
-   "members": [
-     "/xyz/openbmc_project/sensors/temperature/proc1_core0_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc1_core0_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc1_core1_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc1_core1_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc1_core2_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc1_core2_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc1_core3_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc1_core3_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc1_core4_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc1_core4_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc1_core5_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc1_core5_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc1_core6_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc1_core6_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc1_core7_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc1_core7_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc1_core8_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc1_core8_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc1_core9_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc1_core9_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc1_core10_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc1_core10_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc1_core11_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc1_core11_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc1_core12_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc1_core12_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc1_core13_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc1_core13_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc1_core14_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc1_core14_1_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc1_core15_0_temp",
-     "/xyz/openbmc_project/sensors/temperature/proc1_core15_1_temp"
-   ]
- },
- {
-   "name": "proc0 ioring temp",
-   "service": "org.open_power.OCC.Control",
-   "members": [
-     "/xyz/openbmc_project/sensors/temperature/proc0_ioring_temp"
-   ]
- },
- {
-   "name": "proc1 ioring temp",
-   "service": "org.open_power.OCC.Control",
-   "members": [
-     "/xyz/openbmc_project/sensors/temperature/proc1_ioring_temp"
-   ]
- },
- {
-   "name": "dram temps",
-   "service": "org.open_power.OCC.Control",
-   "members": [
-     "/xyz/openbmc_project/sensors/temperature/dimm0_dram_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm1_dram_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm2_dram_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm3_dram_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm4_dram_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm5_dram_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm6_dram_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm7_dram_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm8_dram_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm9_dram_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm10_dram_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm11_dram_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm12_dram_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm13_dram_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm14_dram_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm15_dram_temp"
-   ]
- },
- {
-   "name": "pmic temps",
-   "service": "org.open_power.OCC.Control",
-   "members": [
-     "/xyz/openbmc_project/sensors/temperature/dimm0_pmic_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm1_pmic_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm2_pmic_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm3_pmic_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm4_pmic_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm5_pmic_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm6_pmic_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm7_pmic_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm8_pmic_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm9_pmic_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm10_pmic_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm11_pmic_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm12_pmic_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm13_pmic_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm14_pmic_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm15_pmic_temp"
-   ]
- },
- {
-   "name": "internal memory buffer temps",
-   "service": "org.open_power.OCC.Control",
-   "members": [
-     "/xyz/openbmc_project/sensors/temperature/dimm0_intmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm1_intmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm2_intmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm3_intmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm4_intmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm5_intmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm6_intmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm7_intmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm8_intmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm9_intmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm10_intmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm11_intmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm12_intmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm13_intmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm14_intmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm15_intmb_temp"
-   ]
- },
- {
-   // Repurposed as DRAM temperature sensors for 4U DDIMMs
-   "name": "dram and external memory buffer temps",
-   "service": "org.open_power.OCC.Control",
-   "members": [
-     "/xyz/openbmc_project/sensors/temperature/dimm0_dram_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm1_dram_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm2_dram_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm3_dram_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm4_dram_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm5_dram_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm6_dram_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm7_dram_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm8_dram_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm9_dram_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm10_dram_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm11_dram_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm12_dram_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm13_dram_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm14_dram_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm15_dram_extmb_temp"
-   ]
- },
- {
-   // Repurposed as PMIC temperature sensors for 4U DDIMMs
-   "name": "external memory buffer temps",
-   "service": "org.open_power.OCC.Control",
-   "members": [
-     "/xyz/openbmc_project/sensors/temperature/dimm0_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm1_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm2_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm3_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm4_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm5_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm6_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm7_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm8_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm9_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm10_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm11_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm12_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm13_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm14_extmb_temp",
-     "/xyz/openbmc_project/sensors/temperature/dimm15_extmb_temp"
-   ]
- },
- {
-   "name": "vdd vrm temps",
-   "service": "org.open_power.OCC.Control",
-   "members": [
-     "/xyz/openbmc_project/sensors/temperature/vrm_vdd0_temp",
-     "/xyz/openbmc_project/sensors/temperature/vrm_vdd1_temp"
-   ]
- },
- {
-   "name": "proc 0 core dvfs temp",
-   "service": "org.open_power.OCC.Control",
-   "members": [
-      "/xyz/openbmc_project/sensors/temperature/proc0_core_dvfs_temp"
-    ]
- },
- {
-   "name": "proc 1 core dvfs temp",
-   "service": "org.open_power.OCC.Control",
-   "members": [
-      "/xyz/openbmc_project/sensors/temperature/proc1_core_dvfs_temp"
-    ]
- },
- {
-   "name": "proc 0 ioring dvfs temp",
-   "service": "org.open_power.OCC.Control",
-   "members": [
-      "/xyz/openbmc_project/sensors/temperature/proc0_ioring_dvfs_temp"
-    ]
- },
- {
-   "name": "proc 1 ioring dvfs temp",
-   "service": "org.open_power.OCC.Control",
-   "members": [
-      "/xyz/openbmc_project/sensors/temperature/proc1_ioring_dvfs_temp"
-    ]
- },
- {
-   "name": "nvme temps",
-   "service": "xyz.openbmc_project.NVMeSensor",
-   "members": [
-     "/xyz/openbmc_project/sensors/temperature/NVMe_1_Temp",
-     "/xyz/openbmc_project/sensors/temperature/NVMe_2_Temp",
-     "/xyz/openbmc_project/sensors/temperature/NVMe_3_Temp",
-     "/xyz/openbmc_project/sensors/temperature/NVMe_4_Temp",
-     "/xyz/openbmc_project/sensors/temperature/NVMe_5_Temp",
-     "/xyz/openbmc_project/sensors/temperature/NVMe_6_Temp",
-     "/xyz/openbmc_project/sensors/temperature/NVMe_7_Temp",
-     "/xyz/openbmc_project/sensors/temperature/NVMe_8_Temp",
-     "/xyz/openbmc_project/sensors/temperature/NVMe_9_Temp",
-     "/xyz/openbmc_project/sensors/temperature/NVMe_10_Temp",
-     "/xyz/openbmc_project/sensors/temperature/NVMe_11_Temp",
-     "/xyz/openbmc_project/sensors/temperature/NVMe_12_Temp",
-     "/xyz/openbmc_project/sensors/temperature/NVMe_13_Temp",
-     "/xyz/openbmc_project/sensors/temperature/NVMe_14_Temp",
-     "/xyz/openbmc_project/sensors/temperature/NVMe_15_Temp",
-     "/xyz/openbmc_project/sensors/temperature/NVMe_16_Temp",
-     "/xyz/openbmc_project/sensors/temperature/NVMe_17_Temp",
-     "/xyz/openbmc_project/sensors/temperature/NVMe_18_Temp",
-     "/xyz/openbmc_project/sensors/temperature/NVMe_19_Temp",
-     "/xyz/openbmc_project/sensors/temperature/NVMe_20_Temp",
-     "/xyz/openbmc_project/sensors/temperature/NVMe_21_Temp",
-     "/xyz/openbmc_project/sensors/temperature/NVMe_22_Temp",
-     "/xyz/openbmc_project/sensors/temperature/NVMe_23_Temp",
-     "/xyz/openbmc_project/sensors/temperature/NVMe_24_Temp"
-   ]
- },
- {
-   "name": "planar temps",
-   "service": "xyz.openbmc_project.HwmonTempSensor",
-   "members": [
-     "/xyz/openbmc_project/sensors/temperature/PCIE_0_Temp",
-     "/xyz/openbmc_project/sensors/temperature/PCIE_1_Temp"
-   ]
- },
- {
-   "name": "flett temps",
-   "service": "xyz.openbmc_project.HwmonTempSensor",
-   "members": [
-       "/xyz/openbmc_project/sensors/temperature/NVMe_JBOF_Card_C8_Temp",
-       "/xyz/openbmc_project/sensors/temperature/NVMe_JBOF_Card_C10_Temp",
-       "/xyz/openbmc_project/sensors/temperature/NVMe_JBOF_Card_C11_Temp"
-   ]
- },
- {
-   // Bear Lake card
-   "name": "pcie cable card temps",
-   "service": "xyz.openbmc_project.HwmonTempSensor",
-   "members": [
-       "/xyz/openbmc_project/sensors/temperature/PCIe_Cable_Card_C7_Temp",
-       "/xyz/openbmc_project/sensors/temperature/PCIe_Cable_Card_C9_Temp",
-       "/xyz/openbmc_project/sensors/temperature/PCIe_Cable_Card_C10_Temp",
-       "/xyz/openbmc_project/sensors/temperature/PCIe_Cable_Card_C11_Temp"
-   ]
- },
- {
-   "name": "ambient temp",
-   "service": "xyz.openbmc_project.VirtualSensor",
-   "members": [
-      "/xyz/openbmc_project/sensors/temperature/Ambient_Virtual_Temp"
-   ]
- },
- {
-   "name": "pcie cards",
-   "members": [
-     "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot6/pcie_card6",
-     "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot7/pcie_card7",
-     "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot8/pcie_card8",
-     "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot9/pcie_card9",
-     "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot10/pcie_card10",
-     "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot11/pcie_card11"
-   ]
- },
- {
-   "name": "pcie slots",
-   "members": [
-     "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot6",
-     "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot7",
-     "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot8",
-     "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot9",
-     "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot10",
-     "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot11"
-   ]
- },
- {
-   "name": "power mode",
-   "service": "org.open_power.OCC.Control",
-   "members": [
-     "/xyz/openbmc_project/control/host0/power_mode"
-   ]
- }
+    {
+        "name": "fan inventory",
+        "members": [
+            "/xyz/openbmc_project/inventory/system/chassis/motherboard/fan0",
+            "/xyz/openbmc_project/inventory/system/chassis/motherboard/fan1",
+            "/xyz/openbmc_project/inventory/system/chassis/motherboard/fan2",
+            "/xyz/openbmc_project/inventory/system/chassis/motherboard/fan4"
+        ]
+    },
+    {
+        "name": "fan0 rotor inventory",
+        "members": [
+            "/xyz/openbmc_project/inventory/system/chassis/motherboard/fan0/fan0_0"
+        ]
+    },
+    {
+        "name": "fan1 rotor inventory",
+        "members": [
+            "/xyz/openbmc_project/inventory/system/chassis/motherboard/fan1/fan1_0"
+        ]
+    },
+    {
+        "name": "fan2 rotor inventory",
+        "members": [
+            "/xyz/openbmc_project/inventory/system/chassis/motherboard/fan2/fan2_0"
+        ]
+    },
+    {
+        "name": "fan4 rotor inventory",
+        "members": [
+            "/xyz/openbmc_project/inventory/system/chassis/motherboard/fan4/fan4_0"
+        ]
+    },
+    {
+        "name": "occ objects",
+        "service": "org.open_power.OCC.Control",
+        "members": [
+            "/org/open_power/control/occ0",
+            "/org/open_power/control/occ1"
+        ]
+    },
+    {
+        "name": "proc0 core temps",
+        "service": "org.open_power.OCC.Control",
+        "members": [
+            "/xyz/openbmc_project/sensors/temperature/proc0_core0_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc0_core0_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc0_core1_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc0_core1_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc0_core2_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc0_core2_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc0_core3_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc0_core3_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc0_core4_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc0_core4_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc0_core5_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc0_core5_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc0_core6_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc0_core6_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc0_core7_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc0_core7_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc0_core8_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc0_core8_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc0_core9_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc0_core9_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc0_core10_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc0_core10_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc0_core11_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc0_core11_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc0_core12_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc0_core12_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc0_core13_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc0_core13_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc0_core14_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc0_core14_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc0_core15_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc0_core15_1_temp"
+        ]
+    },
+    {
+        "name": "proc1 core temps",
+        "service": "org.open_power.OCC.Control",
+        "members": [
+            "/xyz/openbmc_project/sensors/temperature/proc1_core0_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc1_core0_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc1_core1_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc1_core1_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc1_core2_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc1_core2_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc1_core3_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc1_core3_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc1_core4_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc1_core4_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc1_core5_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc1_core5_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc1_core6_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc1_core6_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc1_core7_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc1_core7_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc1_core8_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc1_core8_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc1_core9_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc1_core9_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc1_core10_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc1_core10_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc1_core11_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc1_core11_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc1_core12_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc1_core12_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc1_core13_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc1_core13_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc1_core14_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc1_core14_1_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc1_core15_0_temp",
+            "/xyz/openbmc_project/sensors/temperature/proc1_core15_1_temp"
+        ]
+    },
+    {
+        "name": "proc0 ioring temp",
+        "service": "org.open_power.OCC.Control",
+        "members": [
+            "/xyz/openbmc_project/sensors/temperature/proc0_ioring_temp"
+        ]
+    },
+    {
+        "name": "proc1 ioring temp",
+        "service": "org.open_power.OCC.Control",
+        "members": [
+            "/xyz/openbmc_project/sensors/temperature/proc1_ioring_temp"
+        ]
+    },
+    {
+        "name": "dram temps",
+        "service": "org.open_power.OCC.Control",
+        "members": [
+            "/xyz/openbmc_project/sensors/temperature/dimm0_dram_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm1_dram_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm2_dram_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm3_dram_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm4_dram_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm5_dram_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm6_dram_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm7_dram_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm8_dram_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm9_dram_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm10_dram_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm11_dram_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm12_dram_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm13_dram_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm14_dram_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm15_dram_temp"
+        ]
+    },
+    {
+        "name": "pmic temps",
+        "service": "org.open_power.OCC.Control",
+        "members": [
+            "/xyz/openbmc_project/sensors/temperature/dimm0_pmic_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm1_pmic_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm2_pmic_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm3_pmic_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm4_pmic_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm5_pmic_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm6_pmic_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm7_pmic_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm8_pmic_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm9_pmic_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm10_pmic_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm11_pmic_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm12_pmic_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm13_pmic_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm14_pmic_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm15_pmic_temp"
+        ]
+    },
+    {
+        "name": "internal memory buffer temps",
+        "service": "org.open_power.OCC.Control",
+        "members": [
+            "/xyz/openbmc_project/sensors/temperature/dimm0_intmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm1_intmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm2_intmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm3_intmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm4_intmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm5_intmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm6_intmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm7_intmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm8_intmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm9_intmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm10_intmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm11_intmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm12_intmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm13_intmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm14_intmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm15_intmb_temp"
+        ]
+    },
+    {
+        // Repurposed as DRAM temperature sensors for 4U DDIMMs
+        "name": "dram and external memory buffer temps",
+        "service": "org.open_power.OCC.Control",
+        "members": [
+            "/xyz/openbmc_project/sensors/temperature/dimm0_dram_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm1_dram_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm2_dram_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm3_dram_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm4_dram_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm5_dram_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm6_dram_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm7_dram_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm8_dram_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm9_dram_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm10_dram_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm11_dram_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm12_dram_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm13_dram_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm14_dram_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm15_dram_extmb_temp"
+        ]
+    },
+    {
+        // Repurposed as PMIC temperature sensors for 4U DDIMMs
+        "name": "external memory buffer temps",
+        "service": "org.open_power.OCC.Control",
+        "members": [
+            "/xyz/openbmc_project/sensors/temperature/dimm0_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm1_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm2_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm3_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm4_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm5_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm6_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm7_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm8_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm9_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm10_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm11_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm12_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm13_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm14_extmb_temp",
+            "/xyz/openbmc_project/sensors/temperature/dimm15_extmb_temp"
+        ]
+    },
+    {
+        "name": "vdd vrm temps",
+        "service": "org.open_power.OCC.Control",
+        "members": [
+            "/xyz/openbmc_project/sensors/temperature/vrm_vdd0_temp",
+            "/xyz/openbmc_project/sensors/temperature/vrm_vdd1_temp"
+        ]
+    },
+    {
+        "name": "proc 0 core dvfs temp",
+        "service": "org.open_power.OCC.Control",
+        "members": [
+            "/xyz/openbmc_project/sensors/temperature/proc0_core_dvfs_temp"
+        ]
+    },
+    {
+        "name": "proc 1 core dvfs temp",
+        "service": "org.open_power.OCC.Control",
+        "members": [
+            "/xyz/openbmc_project/sensors/temperature/proc1_core_dvfs_temp"
+        ]
+    },
+    {
+        "name": "proc 0 ioring dvfs temp",
+        "service": "org.open_power.OCC.Control",
+        "members": [
+            "/xyz/openbmc_project/sensors/temperature/proc0_ioring_dvfs_temp"
+        ]
+    },
+    {
+        "name": "proc 1 ioring dvfs temp",
+        "service": "org.open_power.OCC.Control",
+        "members": [
+            "/xyz/openbmc_project/sensors/temperature/proc1_ioring_dvfs_temp"
+        ]
+    },
+    {
+        "name": "nvme temps",
+        "service": "xyz.openbmc_project.NVMeSensor",
+        "members": [
+            "/xyz/openbmc_project/sensors/temperature/NVMe_1_Temp",
+            "/xyz/openbmc_project/sensors/temperature/NVMe_2_Temp",
+            "/xyz/openbmc_project/sensors/temperature/NVMe_3_Temp",
+            "/xyz/openbmc_project/sensors/temperature/NVMe_4_Temp",
+            "/xyz/openbmc_project/sensors/temperature/NVMe_5_Temp",
+            "/xyz/openbmc_project/sensors/temperature/NVMe_6_Temp",
+            "/xyz/openbmc_project/sensors/temperature/NVMe_7_Temp",
+            "/xyz/openbmc_project/sensors/temperature/NVMe_8_Temp",
+            "/xyz/openbmc_project/sensors/temperature/NVMe_9_Temp",
+            "/xyz/openbmc_project/sensors/temperature/NVMe_10_Temp",
+            "/xyz/openbmc_project/sensors/temperature/NVMe_11_Temp",
+            "/xyz/openbmc_project/sensors/temperature/NVMe_12_Temp",
+            "/xyz/openbmc_project/sensors/temperature/NVMe_13_Temp",
+            "/xyz/openbmc_project/sensors/temperature/NVMe_14_Temp",
+            "/xyz/openbmc_project/sensors/temperature/NVMe_15_Temp",
+            "/xyz/openbmc_project/sensors/temperature/NVMe_16_Temp",
+            "/xyz/openbmc_project/sensors/temperature/NVMe_17_Temp",
+            "/xyz/openbmc_project/sensors/temperature/NVMe_18_Temp",
+            "/xyz/openbmc_project/sensors/temperature/NVMe_19_Temp",
+            "/xyz/openbmc_project/sensors/temperature/NVMe_20_Temp",
+            "/xyz/openbmc_project/sensors/temperature/NVMe_21_Temp",
+            "/xyz/openbmc_project/sensors/temperature/NVMe_22_Temp",
+            "/xyz/openbmc_project/sensors/temperature/NVMe_23_Temp",
+            "/xyz/openbmc_project/sensors/temperature/NVMe_24_Temp"
+        ]
+    },
+    {
+        "name": "planar temps",
+        "service": "xyz.openbmc_project.HwmonTempSensor",
+        "members": [
+            "/xyz/openbmc_project/sensors/temperature/PCIE_0_Temp",
+            "/xyz/openbmc_project/sensors/temperature/PCIE_1_Temp"
+        ]
+    },
+    {
+        "name": "flett temps",
+        "service": "xyz.openbmc_project.HwmonTempSensor",
+        "members": [
+            "/xyz/openbmc_project/sensors/temperature/NVMe_JBOF_Card_C8_Temp",
+            "/xyz/openbmc_project/sensors/temperature/NVMe_JBOF_Card_C10_Temp",
+            "/xyz/openbmc_project/sensors/temperature/NVMe_JBOF_Card_C11_Temp"
+        ]
+    },
+    {
+        // Bear Lake card
+        "name": "pcie cable card temps",
+        "service": "xyz.openbmc_project.HwmonTempSensor",
+        "members": [
+            "/xyz/openbmc_project/sensors/temperature/PCIe_Cable_Card_C7_Temp",
+            "/xyz/openbmc_project/sensors/temperature/PCIe_Cable_Card_C9_Temp",
+            "/xyz/openbmc_project/sensors/temperature/PCIe_Cable_Card_C10_Temp",
+            "/xyz/openbmc_project/sensors/temperature/PCIe_Cable_Card_C11_Temp"
+        ]
+    },
+    {
+        "name": "ambient temp",
+        "service": "xyz.openbmc_project.VirtualSensor",
+        "members": [
+            "/xyz/openbmc_project/sensors/temperature/Ambient_Virtual_Temp"
+        ]
+    },
+    {
+        "name": "pcie cards",
+        "members": [
+            "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot6/pcie_card6",
+            "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot7/pcie_card7",
+            "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot8/pcie_card8",
+            "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot9/pcie_card9",
+            "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot10/pcie_card10",
+            "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot11/pcie_card11"
+        ]
+    },
+    {
+        "name": "pcie slots",
+        "members": [
+            "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot6",
+            "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot7",
+            "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot8",
+            "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot9",
+            "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot10",
+            "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot11"
+        ]
+    },
+    {
+        "name": "power mode",
+        "service": "org.open_power.OCC.Control",
+        "members": ["/xyz/openbmc_project/control/host0/power_mode"]
+    }
 ]
diff --git a/control/config_files/p10bmc/ibm,rainier-1s4u/pcie_cards.json b/control/config_files/p10bmc/ibm,rainier-1s4u/pcie_cards.json
index 9c8dd19..650dd9e 100644
--- a/control/config_files/p10bmc/ibm,rainier-1s4u/pcie_cards.json
+++ b/control/config_files/p10bmc/ibm,rainier-1s4u/pcie_cards.json
@@ -1,196 +1,196 @@
 {
-  "cards": [
-    {
-      "name": "PHYP had errors getting IDs",
-      "vendor_id": "0xFFFF",
-      "device_id": "0xFFFF",
-      "subsystem_vendor_id": "0xFFFF",
-      "subsystem_id": "0xFFFF",
-      "floor_index": 3
-    },
-    {
-      "name": "Flett",
-      "vendor_id": "0x1014",
-      "device_id": "0x04F2",
-      "subsystem_vendor_id": "0x1014",
-      "subsystem_id": "0x0007",
-      "has_temp_sensor": true
-    },
-    {
-      "name": "Bear Lake and Bear River",
-      "vendor_id": "0x1014",
-      "device_id": "0x04F2",
-      "subsystem_vendor_id": "0x1014",
-      "subsystem_id": "0x0004",
-      "has_temp_sensor": true
-    },
-    {
-      "name": "GTO",
-      "vendor_id": "0x1014",
-      "device_id": "0x034A",
-      "subsystem_vendor_id": "0x1014",
-      "subsystem_id": "0x033B",
-      "floor_index": 2
-    },
-    {
-      "name": "ZR1",
-      "vendor_id": "0x1014",
-      "device_id": "0x034A",
-      "subsystem_vendor_id": "0x1014",
-      "subsystem_id": "0x035E",
-      "floor_index": 2
-    },
-    {
-      "name": "Z06",
-      "vendor_id": "0x1014",
-      "device_id": "0x034A",
-      "subsystem_vendor_id": "0x1014",
-      "subsystem_id": "0x0355",
-      "floor_index": 2
-    },
-    {
-      "name": "Bolt PCIe3 NVMe Flash Adapter II x8 1.6TB",
-      "vendor_id": "0x144D",
-      "device_id": "0xA822",
-      "subsystem_vendor_id": "0x1014",
-      "subsystem_id": "0x0621",
-      "floor_index": 2
-    },
-    {
-      "name": "Bolt PCIe3 NVMe Flash Adapter II x8 3.2TB",
-      "vendor_id": "0x144D",
-      "device_id": "0xA822",
-      "subsystem_vendor_id": "0x1014",
-      "subsystem_id": "0x0622",
-      "floor_index": 2
-    },
-    {
-      "name": "Bolt PCIe3 NVMe Flash Adapter II x8 6.4TB",
-      "vendor_id": "0x144D",
-      "device_id": "0xA822",
-      "subsystem_vendor_id": "0x1014",
-      "subsystem_id": "0x0629",
-      "floor_index": 2
-    },
-    {
-      "name": "Bolt PCIe3 NVMe Flash Adapter III x8 1.6TB",
-      "vendor_id": "0x144D",
-      "device_id": "0xA822",
-      "subsystem_vendor_id": "0x1014",
-      "subsystem_id": "0x064A",
-      "floor_index": 2
-    },
-    {
-      "name": "Bolt PCIe3 NVMe Flash Adapter III x8 3.2TB",
-      "vendor_id": "0x144D",
-      "device_id": "0xA822",
-      "subsystem_vendor_id": "0x1014",
-      "subsystem_id": "0x064B",
-      "floor_index": 2
-    },
-    {
-      "name": "Bolt PCIe3 NVMe Flash Adapter III x8 6.4TB",
-      "vendor_id": "0x144D",
-      "device_id": "0xA822",
-      "subsystem_vendor_id": "0x1014",
-      "subsystem_id": "0x064C",
-      "floor_index": 2
-    },
-    {
-      "name": "Sentry",
-      "vendor_id": "0x1014",
-      "device_id": "0x0466",
-      "subsystem_vendor_id": "0x1014",
-      "subsystem_id": "0x0466",
-      "floor_index": 2
-    },
-    {
-      "name": "Haleakala EN 2Port 100Gb",
-      "vendor_id": "0x15B3",
-      "device_id": "0x1019",
-      "subsystem_vendor_id": "0x1014",
-      "subsystem_id": "0x0635",
-      "floor_index": 1
-    },
-    {
-      "name": "Cedar Lake 100G 2port",
-      "vendor_id": "0x15B3",
-      "device_id": "0x101D",
-      "subsystem_vendor_id": "0x1014",
-      "subsystem_id": "0x06A6",
-      "floor_index": 3
-    },
-    {
-      "name": "Cedar Lake Crypto 100G 2port",
-      "vendor_id": "0x15B3",
-      "device_id": "0x101D",
-      "subsystem_vendor_id": "0x1014",
-      "subsystem_id": "0x06A5",
-      "floor_index": 3
-    },
-    {
-      "name": "Crater Lake 200G 2Port",
-      "vendor_id": "0x15B3",
-      "device_id": "0x101D",
-      "subsystem_vendor_id": "0x1014",
-      "subsystem_id": "0x06A4",
-      "floor_index": 3
-    },
-    {
-      "name": "Crater Lake Crypto 200G 2Port",
-      "vendor_id": "0x15B3",
-      "device_id": "0x101D",
-      "subsystem_vendor_id": "0x1014",
-      "subsystem_id": "0x06A3",
-      "floor_index": 3
-    },
-    {
-      "name": "Kona PCIe4 NVMe U.2 Flash Adapter x8 1.6TB",
-      "vendor_id": "0x144D",
-      "device_id": "0xA824",
-      "subsystem_vendor_id": "0x1014",
-      "subsystem_id": "0x0682",
-      "floor_index": 2
-    },
-    {
-      "name": "Kona PCIe4 NVMe U.2 Flash Adapter x8 3.2TB",
-      "vendor_id": "0x144D",
-      "device_id": "0xA824",
-      "subsystem_vendor_id": "0x1014",
-      "subsystem_id": "0x0683",
-      "floor_index": 2
-    },
-    {
-      "name": "Kona PCIe4 NVMe U.2 Flash Adapter x8 6.4TB",
-      "vendor_id": "0x144D",
-      "device_id": "0xA824",
-      "subsystem_vendor_id": "0x1014",
-      "subsystem_id": "0x0684",
-      "floor_index": 2
-    },
-    {
-      "name": "Castello",
-      "vendor_id": "0x1014",
-      "device_id": "0x0611",
-      "subsystem_vendor_id": "0x1014",
-      "subsystem_id": "0x0611",
-      "floor_index": 3
-    },
-    {
-      "name": "Puntfish",
-      "vendor_id": "0x1077",
-      "device_id": "0x2271",
-      "subsystem_vendor_id": "0x1014",
-      "subsystem_id": "0x069E",
-      "floor_index": 1
-    },
-    {
-      "name": "Bluefish",
-      "vendor_id": "0x10DF",
-      "device_id": "0xE300",
-      "subsystem_vendor_id": "0x1014",
-      "subsystem_id": "0x0614",
-      "floor_index": 1
-    }
-  ]
+    "cards": [
+        {
+            "name": "PHYP had errors getting IDs",
+            "vendor_id": "0xFFFF",
+            "device_id": "0xFFFF",
+            "subsystem_vendor_id": "0xFFFF",
+            "subsystem_id": "0xFFFF",
+            "floor_index": 3
+        },
+        {
+            "name": "Flett",
+            "vendor_id": "0x1014",
+            "device_id": "0x04F2",
+            "subsystem_vendor_id": "0x1014",
+            "subsystem_id": "0x0007",
+            "has_temp_sensor": true
+        },
+        {
+            "name": "Bear Lake and Bear River",
+            "vendor_id": "0x1014",
+            "device_id": "0x04F2",
+            "subsystem_vendor_id": "0x1014",
+            "subsystem_id": "0x0004",
+            "has_temp_sensor": true
+        },
+        {
+            "name": "GTO",
+            "vendor_id": "0x1014",
+            "device_id": "0x034A",
+            "subsystem_vendor_id": "0x1014",
+            "subsystem_id": "0x033B",
+            "floor_index": 2
+        },
+        {
+            "name": "ZR1",
+            "vendor_id": "0x1014",
+            "device_id": "0x034A",
+            "subsystem_vendor_id": "0x1014",
+            "subsystem_id": "0x035E",
+            "floor_index": 2
+        },
+        {
+            "name": "Z06",
+            "vendor_id": "0x1014",
+            "device_id": "0x034A",
+            "subsystem_vendor_id": "0x1014",
+            "subsystem_id": "0x0355",
+            "floor_index": 2
+        },
+        {
+            "name": "Bolt PCIe3 NVMe Flash Adapter II x8 1.6TB",
+            "vendor_id": "0x144D",
+            "device_id": "0xA822",
+            "subsystem_vendor_id": "0x1014",
+            "subsystem_id": "0x0621",
+            "floor_index": 2
+        },
+        {
+            "name": "Bolt PCIe3 NVMe Flash Adapter II x8 3.2TB",
+            "vendor_id": "0x144D",
+            "device_id": "0xA822",
+            "subsystem_vendor_id": "0x1014",
+            "subsystem_id": "0x0622",
+            "floor_index": 2
+        },
+        {
+            "name": "Bolt PCIe3 NVMe Flash Adapter II x8 6.4TB",
+            "vendor_id": "0x144D",
+            "device_id": "0xA822",
+            "subsystem_vendor_id": "0x1014",
+            "subsystem_id": "0x0629",
+            "floor_index": 2
+        },
+        {
+            "name": "Bolt PCIe3 NVMe Flash Adapter III x8 1.6TB",
+            "vendor_id": "0x144D",
+            "device_id": "0xA822",
+            "subsystem_vendor_id": "0x1014",
+            "subsystem_id": "0x064A",
+            "floor_index": 2
+        },
+        {
+            "name": "Bolt PCIe3 NVMe Flash Adapter III x8 3.2TB",
+            "vendor_id": "0x144D",
+            "device_id": "0xA822",
+            "subsystem_vendor_id": "0x1014",
+            "subsystem_id": "0x064B",
+            "floor_index": 2
+        },
+        {
+            "name": "Bolt PCIe3 NVMe Flash Adapter III x8 6.4TB",
+            "vendor_id": "0x144D",
+            "device_id": "0xA822",
+            "subsystem_vendor_id": "0x1014",
+            "subsystem_id": "0x064C",
+            "floor_index": 2
+        },
+        {
+            "name": "Sentry",
+            "vendor_id": "0x1014",
+            "device_id": "0x0466",
+            "subsystem_vendor_id": "0x1014",
+            "subsystem_id": "0x0466",
+            "floor_index": 2
+        },
+        {
+            "name": "Haleakala EN 2Port 100Gb",
+            "vendor_id": "0x15B3",
+            "device_id": "0x1019",
+            "subsystem_vendor_id": "0x1014",
+            "subsystem_id": "0x0635",
+            "floor_index": 1
+        },
+        {
+            "name": "Cedar Lake 100G 2port",
+            "vendor_id": "0x15B3",
+            "device_id": "0x101D",
+            "subsystem_vendor_id": "0x1014",
+            "subsystem_id": "0x06A6",
+            "floor_index": 3
+        },
+        {
+            "name": "Cedar Lake Crypto 100G 2port",
+            "vendor_id": "0x15B3",
+            "device_id": "0x101D",
+            "subsystem_vendor_id": "0x1014",
+            "subsystem_id": "0x06A5",
+            "floor_index": 3
+        },
+        {
+            "name": "Crater Lake 200G 2Port",
+            "vendor_id": "0x15B3",
+            "device_id": "0x101D",
+            "subsystem_vendor_id": "0x1014",
+            "subsystem_id": "0x06A4",
+            "floor_index": 3
+        },
+        {
+            "name": "Crater Lake Crypto 200G 2Port",
+            "vendor_id": "0x15B3",
+            "device_id": "0x101D",
+            "subsystem_vendor_id": "0x1014",
+            "subsystem_id": "0x06A3",
+            "floor_index": 3
+        },
+        {
+            "name": "Kona PCIe4 NVMe U.2 Flash Adapter x8 1.6TB",
+            "vendor_id": "0x144D",
+            "device_id": "0xA824",
+            "subsystem_vendor_id": "0x1014",
+            "subsystem_id": "0x0682",
+            "floor_index": 2
+        },
+        {
+            "name": "Kona PCIe4 NVMe U.2 Flash Adapter x8 3.2TB",
+            "vendor_id": "0x144D",
+            "device_id": "0xA824",
+            "subsystem_vendor_id": "0x1014",
+            "subsystem_id": "0x0683",
+            "floor_index": 2
+        },
+        {
+            "name": "Kona PCIe4 NVMe U.2 Flash Adapter x8 6.4TB",
+            "vendor_id": "0x144D",
+            "device_id": "0xA824",
+            "subsystem_vendor_id": "0x1014",
+            "subsystem_id": "0x0684",
+            "floor_index": 2
+        },
+        {
+            "name": "Castello",
+            "vendor_id": "0x1014",
+            "device_id": "0x0611",
+            "subsystem_vendor_id": "0x1014",
+            "subsystem_id": "0x0611",
+            "floor_index": 3
+        },
+        {
+            "name": "Puntfish",
+            "vendor_id": "0x1077",
+            "device_id": "0x2271",
+            "subsystem_vendor_id": "0x1014",
+            "subsystem_id": "0x069E",
+            "floor_index": 1
+        },
+        {
+            "name": "Bluefish",
+            "vendor_id": "0x10DF",
+            "device_id": "0xE300",
+            "subsystem_vendor_id": "0x1014",
+            "subsystem_id": "0x0614",
+            "floor_index": 1
+        }
+    ]
 }