meta-facebook: move virtual sensor config json into platform layers

Description:
Most platforms need some sort of phosphor-virtual-sensor config, but some
install multiple.  Modify the common bbappend so it can be reused and
with a minimal bbappend most platforms can add their own config in the
platform layer.

Tested:
Build service on changed platforms- pass

Change-Id: I77f4be1519325c0ebb00d0dc9a2f4e104601f62b
Signed-off-by: Delphine CC Chiu <Delphine_CC_Chiu@wiwynn.com>
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>

5 files changed, 12 insertions, 402 deletions

diff --git a/meta-facebook/recipes-phosphor/sensors/phosphor-virtual-sensor/bletchley/bletchley_sensor_config.json b/meta-facebook/recipes-phosphor/sensors/phosphor-virtual-sensor/bletchley/bletchley_sensor_config.json
deleted file mode 100644
index fe51488c70..0000000000
--- a/meta-facebook/recipes-phosphor/sensors/phosphor-virtual-sensor/bletchley/bletchley_sensor_config.json
+++ /dev/null
@@ -1 +0,0 @@
-[]
diff --git a/meta-facebook/recipes-phosphor/sensors/phosphor-virtual-sensor/greatlakes/greatlakes_sensor_config.json b/meta-facebook/recipes-phosphor/sensors/phosphor-virtual-sensor/greatlakes/greatlakes_sensor_config.json
deleted file mode 100644
index 10c739d31c..0000000000
--- a/meta-facebook/recipes-phosphor/sensors/phosphor-virtual-sensor/greatlakes/greatlakes_sensor_config.json
+++ /dev/null
@@ -1,314 +0,0 @@
-[
-  {
-    "Desc": {
-      "Name": "BB_ADC_FAN_OUTPUT_CURR_A",
-      "SensorType": "current",
-      "MinValue": 0
-    },
-
-    "Threshold": {
-      "CriticalHigh": 28.6,
-      "HardShutdownHigh": 39.2
-    },
-
-    "Params": {
-      "ConstParam": [
-        {
-          "ParamName": "P1",
-          "Value": 0.157
-        },
-        {
-          "ParamName": "P2",
-          "Value": 0.33
-        },
-        {
-          "ParamName": "P3",
-          "Value": 2.5
-        },
-        {
-          "ParamName": "P4",
-          "Value": 0.96
-        },
-        {
-          "ParamName": "P5",
-          "Value": 0.15
-        }
-      ],
-
-      "DbusParam": [
-        {
-          "ParamName": "P6",
-          "Desc": {
-            "Name": "BB_ADC_FAN_ISENSE_VOLT_V",
-            "SensorType": "voltage"
-          }
-        }
-      ]
-    },
-
-    "Expression": "( P6 / P1 / P2 - P3 ) * P4 + P5"
-  },
-  {
-    "Desc": {
-      "Name": "BB_ADC_NIC_OUTPUT_CURR_A",
-      "SensorType": "current"
-    },
-
-    "Threshold": {
-      "CriticalHigh": 6.6,
-      "HardShutdownHigh": 8.15
-    },
-
-    "Params": {
-      "ConstParam": [
-        {
-          "ParamName": "P1",
-          "Value": 0.183
-        }
-      ],
-
-      "DbusParam": [
-        {
-          "ParamName": "P2",
-          "Desc": {
-            "Name": "BB_ADC_NIC_ISENSE_VOLT_V",
-            "SensorType": "voltage"
-          }
-        }
-      ]
-    },
-
-    "Expression": "P2 / P1"
-  },
-  {
-    "Desc": {
-      "Name": "BB_NIC_PWR_W",
-      "SensorType": "power"
-    },
-
-    "Threshold": {
-      "CriticalHigh": 82.5,
-      "HardShutdownHigh": 101.875
-    },
-
-    "Params": {
-      "ConstParam": [
-        {
-          "ParamName": "P1",
-          "Value": 0.183
-        }
-      ],
-
-      "DbusParam": [
-        {
-          "ParamName": "P2",
-          "Desc": {
-            "Name": "BB_ADC_NIC_P12V_VOLT_V",
-            "SensorType": "voltage"
-          }
-        },
-        {
-          "ParamName": "P3",
-          "Desc": {
-            "Name": "BB_ADC_NIC_ISENSE_VOLT_V",
-            "SensorType": "voltage"
-          }
-        }
-      ]
-    },
-
-    "Expression": "P2 * ( P3 / P1 )"
-  },
-  {
-    "Desc": {
-      "Name": "BB_MEDUSA_VDELTA_VOLT_V",
-      "SensorType": "voltage"
-    },
-
-    "Threshold": {
-        "CriticalHigh": 0.5
-    },
-
-    "Params": {
-        "DbusParam": [
-            {
-                "ParamName": "P1",
-                "Desc": {
-                    "Name": "BB_MEDUSA_INPUT_VOLT_V",
-                    "SensorType": "voltage"
-                }
-            },
-            {
-                "ParamName": "P2",
-                "Desc": {
-                    "Name": "BB_MEDUSA_OUTPUT_VOLT_V",
-                    "SensorType": "voltage"
-                }
-            }
-        ]
-    },
-
-    "Expression": "P1 - P2"
-  },
-  {
-    "Desc": {
-      "Name": "BB_CPU_PDB_VDELTA_VOLT_V",
-      "SensorType": "voltage",
-      "MinValue": 0
-    },
-
-    "Threshold": {
-        "CriticalHigh": 0.8
-    },
-
-    "Params": {
-        "DbusParam": [
-            {
-                "ParamName": "P1",
-                "Desc": {
-                    "Name": "BB_MEDUSA_OUTPUT_VOLT_V",
-                    "SensorType": "voltage"
-                }
-            },
-            {
-                "ParamName": "P2",
-                "Desc": {
-                    "Name": "BB_HSC_INPUT_VOLT_V",
-                    "SensorType": "voltage"
-                }
-            }
-        ]
-    },
-
-    "Expression": "P1 - P2"
-  },
-  {
-    "Desc": {
-      "Name": "BB_FAN_PWR_W",
-      "SensorType": "power",
-      "MinValue": 0
-    },
-
-    "Threshold": {
-      "CriticalHigh": 396.825,
-      "HardShutdownHigh": 544.88
-    },
-
-    "Params": {
-        "ConstParam": [
-          {
-            "ParamName": "P1",
-            "Value": 0.157
-          },
-          {
-            "ParamName": "P2",
-            "Value": 0.33
-          },
-          {
-            "ParamName": "P3",
-            "Value": 2.5
-          },
-          {
-            "ParamName": "P4",
-            "Value": 0.96
-          },
-          {
-            "ParamName": "P5",
-            "Value": 0.15
-          }
-        ],
-
-        "DbusParam": [
-          {
-            "ParamName": "P6",
-            "Desc": {
-              "Name": "BB_ADC_FAN_ISENSE_VOLT_V",
-              "SensorType": "voltage"
-            }
-          },
-          {
-            "ParamName": "P7",
-              "Desc": {
-                  "Name": "BB_MEDUSA_OUTPUT_VOLT_V",
-                  "SensorType": "voltage"
-              }
-          }
-        ]
-    },
-
-    "Expression": "(( P6 / P1 / P2 - P3 ) * P4 + P5 ) * P7"
-  },
-  {
-    "Desc": {
-      "Name": "BB_SYSTEM_AIRFLOW_CFM",
-      "SensorType": "airflow",
-      "MinValue": 0
-    },
-
-    "Params": {
-        "ConstParam": [
-          {
-            "ParamName": "rotor_single_or_duo",
-            "Value": 1
-          },
-          {
-            "ParamName": "max_support_rotor_per_fan",
-            "Value": 2
-          },
-          {
-            "ParamName": "gradient_single",
-            "Value": 0.0203
-          },
-          {
-            "ParamName": "gradient_duo",
-            "Value": 0
-          },
-          {
-            "ParamName": "displacement_single",
-            "Value": -9.9157
-          },
-          {
-            "ParamName": "displacement_duo",
-            "Value": 0
-          }
-        ],
-
-        "DbusParam": [
-          {
-            "ParamName": "rpm1",
-            "Desc": {
-              "Name": "BB_FAN0_TACH_RPM",
-              "SensorType": "fan_tach"
-            }
-          },
-          {
-            "ParamName": "rpm2",
-            "Desc": {
-              "Name": "BB_FAN1_TACH_RPM",
-              "SensorType": "fan_tach"
-            }
-          },
-          {
-            "ParamName": "rpm3",
-            "Desc": {
-              "Name": "BB_FAN2_TACH_RPM",
-              "SensorType": "fan_tach"
-            }
-          },
-          {
-            "ParamName": "rpm4",
-            "Desc": {
-              "Name": "BB_FAN3_TACH_RPM",
-              "SensorType": "fan_tach"
-            }
-          }
-        ]
-    },
-
-    "Expression": [
-      "(max_support_rotor_per_fan - 1) * (max_support_rotor_per_fan - 2) == 0 ? ",
-      "((rotor_single_or_duo % 2) * (gradient_single * avg(rpm1, rpm2, rpm3, rpm4) + displacement_single)) + ",
-      "(((rotor_single_or_duo - 1) % 2) * (gradient_duo * avg(rpm1, rpm2, rpm3, rpm4) + displacement_duo)) : 0"
-    ]
-  }
-]
diff --git a/meta-facebook/recipes-phosphor/sensors/phosphor-virtual-sensor/tiogapass/tiogapass_sensor_config.json b/meta-facebook/recipes-phosphor/sensors/phosphor-virtual-sensor/tiogapass/tiogapass_sensor_config.json
deleted file mode 100644
index 17dacba11e..0000000000
--- a/meta-facebook/recipes-phosphor/sensors/phosphor-virtual-sensor/tiogapass/tiogapass_sensor_config.json
+++ /dev/null
@@ -1,39 +0,0 @@
-[
-    {
-        "Desc": {
-            "Name": "Virtual_Inlet_Temp",
-            "SensorType": "temperature"
-        },
-        "Threshold": {
-            "CriticalHigh": 90,
-            "CriticalLow": 20,
-            "WarningHigh": 70,
-            "WarningLow": 30
-        },
-        "Params": {
-            "ConstParam": [
-                {
-                    "ParamName": "P1",
-                    "Value": 1.1
-                }
-            ],
-            "DbusParam": [
-                {
-                    "ParamName": "P2",
-                    "Desc": {
-                        "Name": "MB_INLET_TEMP",
-                        "SensorType": "temperature"
-                    }
-                },
-                {
-                    "ParamName": "P3",
-                    "Desc": {
-                        "Name": "MB_FAN0_TACH",
-                        "SensorType": "fan_tach"
-                    }
-                }
-            ]
-        },
-        "Expression": "P1 * (P2 + 5 - P3 * 0.01)"
-    }
-]
diff --git a/meta-facebook/recipes-phosphor/sensors/phosphor-virtual-sensor/yosemitev2/yosemitev2_sensor_config.json b/meta-facebook/recipes-phosphor/sensors/phosphor-virtual-sensor/yosemitev2/yosemitev2_sensor_config.json
deleted file mode 100644
index 8864f9c019..0000000000
--- a/meta-facebook/recipes-phosphor/sensors/phosphor-virtual-sensor/yosemitev2/yosemitev2_sensor_config.json
+++ /dev/null
@@ -1,43 +0,0 @@
-[
-    {
-        "Desc": {
-            "Name": "Virtual_CFM_Sensor",
-            "SensorType": "airflow"
-        },
-        "Threshold": {
-            "CriticalHigh": 40,
-            "CriticalLow": 10,
-            "WarningHigh": 30,
-            "WarningLow": 15
-        },
-        "Params": {
-            "ConstParam": [
-                {
-                    "ParamName": "P1",
-                    "Value": 0.00565
-                },
-                {
-                    "ParamName": "P2",
-                    "Value": 3.7427
-                }
-            ],
-            "DbusParam": [
-                {
-                    "ParamName": "P3",
-                    "Desc": {
-                        "Name": "SP_FAN0_TACH",
-                        "SensorType": "fan_tach"
-                    }
-                },
-                {
-                    "ParamName": "P4",
-                    "Desc": {
-                        "Name": "SP_FAN1_TACH",
-                        "SensorType": "fan_tach"
-                    }
-                }
-            ]
-        },
-        "Expression": "(P3 * P1) + (P4 * P1) - P2"
-    }
-]
diff --git a/meta-facebook/recipes-phosphor/sensors/phosphor-virtual-sensor_%.bbappend b/meta-facebook/recipes-phosphor/sensors/phosphor-virtual-sensor_%.bbappend
index 301766d312..c428550e14 100644
--- a/meta-facebook/recipes-phosphor/sensors/phosphor-virtual-sensor_%.bbappend
+++ b/meta-facebook/recipes-phosphor/sensors/phosphor-virtual-sensor_%.bbappend
@@ -1,11 +1,18 @@
-FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}/${MACHINE}:"
+SENSOR_CONFIGS ?= "virtual_sensor_config.json"
 
-SRC_URI:append = " file://${MACHINE}_sensor_config.json"
+SRC_URI:append = "\
+    ${@ ' '.join([ 'file://' + x for x in d.getVar('SENSOR_CONFIGS').split()])} \
+    "
 
 do_install:append() {
+    # Delete the default one from Meson.
+    if [ -e "${D}${datadir}/phosphor-virtual-sensor/virtual_sensor_config.json" ]; then
+        rm "${D}${datadir}/phosphor-virtual-sensor/virtual_sensor_config.json"
+    fi
 
+    # Install the ones from our meta-layer.
     install -d ${D}${datadir}/phosphor-virtual-sensor
-
-    install -m 0644 -D ${WORKDIR}/${MACHINE}_sensor_config.json \
-                   ${D}${datadir}/phosphor-virtual-sensor/virtual_sensor_config.json
+    for s in ${SENSOR_CONFIGS}; do
+        install -m 0644 ${WORKDIR}/$s ${D}${datadir}/phosphor-virtual-sensor
+    done
 }