Remove Configuration interface prefix from utils APIs
This eliminates some repetitive verbosity from daemons that handle a lot
of different sensor types (such as hwmontempsensor and psusensor). It
also positions us to more cleanly use a single data structure for both
existing APIs like GetSensorConfiguration() and
setupPropertiesChangedMatches(), as well as upcoming I2C
device-management support.
Tested: hwmontempsensor and adcsensor on romed8hm3 continue to behave as
they did previously.
Signed-off-by: Zev Weiss <zev@bewilderbeest.net>
Change-Id: I9d80475ca4160c8d2ff0afab942709496d51238d
diff --git a/src/NVMeSensorMain.cpp b/src/NVMeSensorMain.cpp
index 71993d2..1398d3c 100644
--- a/src/NVMeSensorMain.cpp
+++ b/src/NVMeSensorMain.cpp
@@ -125,7 +125,8 @@
for (const auto& [interfacePath, sensorData] : sensorConfigurations)
{
// find base configuration
- auto sensorBase = sensorData.find(NVMeSensor::configType);
+ auto sensorBase =
+ sensorData.find(configInterfaceName(NVMeSensor::sensorType));
if (sensorBase == sensorData.end())
{
continue;
@@ -189,7 +190,7 @@
handleSensorConfigurations(io, objectServer, dbusConnection,
sensorConfigurations);
});
- getter->getConfiguration(std::vector<std::string>{NVMeSensor::configType});
+ getter->getConfiguration(std::vector<std::string>{NVMeSensor::sensorType});
}
static void interfaceRemoved(sdbusplus::message_t& message, NVMEMap& contexts)
@@ -258,7 +259,7 @@
std::vector<std::unique_ptr<sdbusplus::bus::match_t>> matches =
setupPropertiesChangedMatches(
- *systemBus, std::to_array<const char*>({NVMeSensor::configType}),
+ *systemBus, std::to_array<const char*>({NVMeSensor::sensorType}),
eventHandler);
// Watch for entity-manager to remove configuration interfaces