Update to get PSU Asset information from parsing JSON file
The purpose is to support multiple PMBus device drivers, so need to
flexibly read the required PSU asset information attribute from the
configuration file (/usr/share/phosphor-power/psu.json)
and update D-BUS.
Tested: Update phosphor-power_git.bb and add the
psu.json. The psu-monitor process runs normally and can obtain the
asset information of PSU via D-BUS and REST command.
Signed-off-by: George Liu <liuxiwei@inspur.com>
Change-Id: I780172724a397384c9fe3870e2e847580d131e72
diff --git a/power-supply/power_supply.hpp b/power-supply/power_supply.hpp
index d997423..0968a78 100644
--- a/power-supply/power_supply.hpp
+++ b/power-supply/power_supply.hpp
@@ -6,6 +6,7 @@
#include "pmbus.hpp"
#include "record_manager.hpp"
+#include <nlohmann/json.hpp>
#include <sdbusplus/bus/match.hpp>
#include <sdeventplus/clock.hpp>
#include <sdeventplus/event.hpp>
@@ -17,7 +18,6 @@
{
namespace psu
{
-
namespace sdbusRule = sdbusplus::bus::match::rules;
constexpr auto FAULT_COUNT = 3;
@@ -263,6 +263,22 @@
size_t syncGPIONumber = 0;
/**
+ * @brief The type of the power supply inventory pmbus access.
+ */
+ witherspoon::pmbus::Type inventoryPMBusAccessType;
+
+ /**
+ * @brief The JSON from the parsed power supply FRU JSON File.
+ */
+ nlohmann::json fruJson;
+
+ /**
+ * @brief get the power supply access type from the JSON file.
+ *
+ */
+ void getAccessType();
+
+ /**
* @brief Callback for inventory property changes
*
* Process change of Present property for power supply.
@@ -376,7 +392,8 @@
* Properties added:
* - Serial Number
* - Part Number
- * - CCIN (Customer Card Identification Number) - added as the Model
+ * - Manufacturer
+ * - Model
* - Firmware version
*/
void updateInventory();