diff options
Diffstat (limited to 'meta-openbmc-mods/meta-common/recipes-phosphor/configuration/entity-manager/0002-Entity-manager-Add-support-to-update-assetTag.patch')
| -rw-r--r-- | meta-openbmc-mods/meta-common/recipes-phosphor/configuration/entity-manager/0002-Entity-manager-Add-support-to-update-assetTag.patch | 226 |
1 files changed, 24 insertions, 202 deletions
diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/configuration/entity-manager/0002-Entity-manager-Add-support-to-update-assetTag.patch b/meta-openbmc-mods/meta-common/recipes-phosphor/configuration/entity-manager/0002-Entity-manager-Add-support-to-update-assetTag.patch index 88e86f68c..8682e2cad 100644 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/configuration/entity-manager/0002-Entity-manager-Add-support-to-update-assetTag.patch +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/configuration/entity-manager/0002-Entity-manager-Add-support-to-update-assetTag.patch @@ -1,6 +1,6 @@ -From 1e8b3e0fe4ce9aa87a35f6c3ba6e506873d5455c Mon Sep 17 00:00:00 2001 +From ff5dbca96d12b1c2aaaec0bb891125990af3f218 Mon Sep 17 00:00:00 2001 From: mansijos <mansi.joshi@intel.com> -Date: Fri, 12 Feb 2021 11:26:57 +0530 +Date: Tue, 6 Apr 2021 02:12:56 +0530 Subject: [PATCH] Entity-manager: Add support to update assetTag Asset tag is an updateable property from User level interface like @@ -12,58 +12,17 @@ Successfully updated in assetTag interface as well as in fru interface while using set-property and using redfish as well. The new value is preserved after BMC resets. -Change-Id: Iab8b24344d1a27486ceafe21aa2b4496706a2944 +Change-Id: If7fbfd8325488280f500ab0e2c8b38475813cc3f Signed-off-by: mansijos <mansi.joshi@intel.com> --- - include/EntityManager.hpp | 15 ++-- - src/EntityManager.cpp | 148 ++++++++++++++++++++++++++++++++------ - 2 files changed, 135 insertions(+), 28 deletions(-) + src/EntityManager.cpp | 92 +++++++++++++++++++++++++++++++++++++++++-- + 1 file changed, 88 insertions(+), 4 deletions(-) -diff --git a/include/EntityManager.hpp b/include/EntityManager.hpp -index 5867556..a4e9922 100644 ---- a/include/EntityManager.hpp -+++ b/include/EntityManager.hpp -@@ -29,13 +29,16 @@ - #include <list> - #include <string> - --using DBusProbeObjectT = boost::container::flat_map< -- std::string, -- std::vector<boost::container::flat_map<std::string, BasicVariantType>>>; -- - using FoundDeviceT = - std::vector<boost::container::flat_map<std::string, BasicVariantType>>; - -+using FoundDeviceInfoT = std::vector< -+ std::tuple<boost::container::flat_map<std::string, BasicVariantType>, -+ std::string, std::string, std::string>>; -+ -+using DBusProbeObjectT = -+ boost::container::flat_map<std::string, FoundDeviceInfoT>; -+ - struct PerformScan : std::enable_shared_from_this<PerformScan> - { - -@@ -62,12 +65,12 @@ struct PerformProbe : std::enable_shared_from_this<PerformProbe> - { - PerformProbe(const std::vector<std::string>& probeCommand, - std::shared_ptr<PerformScan>& scanPtr, -- std::function<void(FoundDeviceT&)>&& callback); -+ std::function<void(FoundDeviceInfoT&)>&& callback); - virtual ~PerformProbe(); - - std::vector<std::string> _probeCommand; - std::shared_ptr<PerformScan> scan; -- std::function<void(FoundDeviceT&)> _callback; -+ std::function<void(FoundDeviceInfoT&)> _callback; - }; - - inline void logDeviceAdded(const nlohmann::json& record) diff --git a/src/EntityManager.cpp b/src/EntityManager.cpp -index aa1df20..cd73675 100644 +index 932b6f9..67b8f95 100644 --- a/src/EntityManager.cpp +++ b/src/EntityManager.cpp -@@ -47,9 +47,14 @@ constexpr const char* lastConfiguration = "/tmp/configuration/last.json"; +@@ -47,9 +47,17 @@ constexpr const char* lastConfiguration = "/tmp/configuration/last.json"; constexpr const char* currentConfiguration = "/var/configuration/system.json"; constexpr const char* globalSchema = "global.json"; constexpr const int32_t MAX_MAPPER_DEPTH = 0; @@ -75,98 +34,13 @@ index aa1df20..cd73675 100644 +static foundProbeData foundData; +static std::map<std::string, foundProbeData> mapFoundData; + ++constexpr const char* fruConn = "xyz.openbmc_project.FruDevice"; ++constexpr const char* fruIntf = "xyz.openbmc_project.FruDevice"; ++ struct cmp_str { bool operator()(const char* a, const char* b) const -@@ -169,7 +174,10 @@ void getInterfaces( - return; - } - -- scan->dbusProbeObjects[std::get<2>(call)].emplace_back(resp); -+ // Save the dbus info along with device info -+ scan->dbusProbeObjects[std::get<2>(call)].emplace_back( -+ std::make_tuple(resp, std::get<0>(call), std::get<1>(call), -+ std::get<2>(call))); - }, - std::get<0>(call), std::get<1>(call), "org.freedesktop.DBus.Properties", - "GetAll", std::get<2>(call)); -@@ -274,11 +282,10 @@ void findDbusObjects(std::vector<std::shared_ptr<PerformProbe>>&& probeVector, - // probes dbus interface dictionary for a key with a value that matches a regex - bool probeDbus(const std::string& interface, - const std::map<std::string, nlohmann::json>& matches, -- FoundDeviceT& devices, std::shared_ptr<PerformScan> scan, -+ FoundDeviceInfoT& devices, std::shared_ptr<PerformScan> scan, - bool& foundProbe) - { -- std::vector<boost::container::flat_map<std::string, BasicVariantType>>& -- dbusObject = scan->dbusProbeObjects[interface]; -+ FoundDeviceInfoT& dbusObject = scan->dbusProbeObjects[interface]; - if (dbusObject.empty()) - { - foundProbe = false; -@@ -287,8 +294,9 @@ bool probeDbus(const std::string& interface, - foundProbe = true; - - bool foundMatch = false; -- for (auto& device : dbusObject) -+ for (auto& deviceInfo : dbusObject) - { -+ auto& device = std::get<0>(deviceInfo); - bool deviceMatches = true; - for (auto& match : matches) - { -@@ -305,7 +313,7 @@ bool probeDbus(const std::string& interface, - } - if (deviceMatches) - { -- devices.emplace_back(device); -+ devices.emplace_back(deviceInfo); - foundMatch = true; - deviceMatches = false; // for next iteration - } -@@ -315,11 +323,8 @@ bool probeDbus(const std::string& interface, - - // default probe entry point, iterates a list looking for specific types to - // call specific probe functions --bool probe( -- const std::vector<std::string>& probeCommand, -- std::shared_ptr<PerformScan> scan, -- std::vector<boost::container::flat_map<std::string, BasicVariantType>>& -- foundDevs) -+bool probe(const std::vector<std::string>& probeCommand, -+ std::shared_ptr<PerformScan> scan, FoundDeviceInfoT& foundDevs) - { - const static std::regex command(R"(\((.*)\))"); - std::smatch match; -@@ -449,8 +454,9 @@ bool probe( - // probe passed, but empty device - if (ret && foundDevs.size() == 0) - { -- foundDevs.emplace_back( -- boost::container::flat_map<std::string, BasicVariantType>{}); -+ foundDevs.emplace_back(std::make_tuple( -+ boost::container::flat_map<std::string, BasicVariantType>{}, -+ std::string{}, std::string{}, std::string{})); - } - if (matchOne && ret) - { -@@ -465,13 +471,13 @@ bool probe( - - PerformProbe::PerformProbe(const std::vector<std::string>& probeCommand, - std::shared_ptr<PerformScan>& scanPtr, -- std::function<void(FoundDeviceT&)>&& callback) : -+ std::function<void(FoundDeviceInfoT&)>&& callback) : - _probeCommand(probeCommand), - scan(scanPtr), _callback(std::move(callback)) - {} - PerformProbe::~PerformProbe() - { -- FoundDeviceT foundDevs; -+ FoundDeviceInfoT foundDevs; - if (probe(_probeCommand, scan, foundDevs)) - { - _callback(foundDevs); -@@ -556,6 +562,47 @@ void addArrayToDbus(const std::string& name, const nlohmann::json& array, +@@ -575,6 +583,43 @@ void addArrayToDbus(const std::string& name, const nlohmann::json& array, } } @@ -186,11 +60,8 @@ index aa1df20..cd73675 100644 + } + + foundProbeData& tmpMap = it->second; -+ auto foundConn = tmpMap.find("foundConn"); + auto foundPath = tmpMap.find("foundPath"); -+ auto foundIntf = tmpMap.find("foundIntf"); -+ if (foundConn == tmpMap.end() || foundPath == tmpMap.end() || -+ foundIntf == tmpMap.end()) ++ if (foundPath == tmpMap.end()) + { + std::cerr << "No prob object data is avaliable in foundProbeData" + << "\n"; @@ -205,20 +76,16 @@ index aa1df20..cd73675 100644 + << "\n"; + } + }, -+ foundConn->second, foundPath->second, "org.freedesktop.DBus.Properties", -+ "Set", foundIntf->second, "PRODUCT_ASSET_TAG", -+ std::variant<PropertyType>(newVal)); ++ fruConn, foundPath->second, "org.freedesktop.DBus.Properties", "Set", ++ fruIntf, "PRODUCT_ASSET_TAG", std::variant<PropertyType>(newVal)); + return true; +} + template <typename PropertyType> void addProperty(const std::string& propertyName, const PropertyType& value, sdbusplus::asio::dbus_interface* iface, -@@ -568,11 +615,21 @@ void addProperty(const std::string& propertyName, const PropertyType& value, - iface->register_property(propertyName, value); - return; +@@ -589,9 +634,18 @@ void addProperty(const std::string& propertyName, const PropertyType& value, } -+ iface->register_property( propertyName, value, - [&systemConfiguration, @@ -237,19 +104,17 @@ index aa1df20..cd73675 100644 val = newVal; if (!setJsonFromPointer(jsonPointerString, val, systemConfiguration)) -@@ -970,6 +1027,11 @@ void postToDbus(const nlohmann::json& newConfiguration, +@@ -989,6 +1043,9 @@ void postToDbus(const nlohmann::json& newConfiguration, populateInterfaceFromJson(systemConfiguration, jsonPointerPath, boardIface, boardValues, objServer); jsonPointerPath += "/"; + -+ std::string foundConn; + std::string foundPath; -+ std::string foundIntf; + // iterate through board properties for (auto& boardField : boardValues.items()) { -@@ -979,9 +1041,32 @@ void postToDbus(const nlohmann::json& newConfiguration, +@@ -998,9 +1055,28 @@ void postToDbus(const nlohmann::json& newConfiguration, createInterface(objServer, boardName, boardField.key(), boardKeyOrig); @@ -258,16 +123,12 @@ index aa1df20..cd73675 100644 - iface, boardField.value(), objServer); + if (boardField.key() == "FoundProbe") + { -+ foundConn = boardField.value()["Connection"]; + foundPath = boardField.value()["Path"]; -+ foundIntf = boardField.value()["Interface"]; + } + if (boardField.key() == + "xyz.openbmc_project.Inventory.Decorator.AssetTag") + { -+ foundData["foundConn"] = foundConn; + foundData["foundPath"] = foundPath; -+ foundData["foundIntf"] = foundIntf; + mapFoundData[jsonPointerPath + boardField.key()] = + foundData; + @@ -285,63 +146,24 @@ index aa1df20..cd73675 100644 } } -@@ -1278,7 +1363,7 @@ void PerformScan::run() - auto thisRef = shared_from_this(); - auto probePointer = std::make_shared<PerformProbe>( - probeCommand, thisRef, -- [&, recordPtr, probeName](FoundDeviceT& foundDevices) { -+ [&, recordPtr, probeName](FoundDeviceInfoT& foundDevices) { - _passed = true; - - std::set<nlohmann::json> usedNames; -@@ -1294,7 +1379,8 @@ void PerformScan::run() - for (auto itr = foundDevices.begin(); - itr != foundDevices.end();) - { -- std::string recordName = getRecordName(*itr, probeName); -+ std::string recordName = -+ getRecordName(std::get<0>(*itr), probeName); - - auto fromLastJson = lastJson.find(recordName); - if (fromLastJson != lastJson.end()) -@@ -1328,6 +1414,15 @@ void PerformScan::run() +@@ -1349,6 +1425,10 @@ void PerformScan::run() continue; } + nlohmann::json recordVal = *recordPtr; -+ // Save the dbus connection, path and interface info -+ // of the device -+ recordVal[foundObject]["Connection"] = -+ std::get<1>(*itr); -+ recordVal[foundObject]["Path"] = std::get<2>(*itr); -+ recordVal[foundObject]["Interface"] = -+ std::get<3>(*itr); ++ // Save the dbus path info of the device ++ recordVal[foundObject]["Path"] = std::get<1>(*itr); + int index = std::stoi( nameIt->get<std::string>().substr(indexIdx), nullptr, 0); -@@ -1349,8 +1444,9 @@ void PerformScan::run() - - std::optional<std::string> replaceStr; - -- for (auto& foundDevice : foundDevices) -+ for (auto& foundDeviceInfo : foundDevices) - { -+ auto& foundDevice = std::get<0>(foundDeviceInfo); - nlohmann::json record = *recordPtr; - std::string recordName = - getRecordName(foundDevice, probeName); -@@ -1382,6 +1478,14 @@ void PerformScan::run() +@@ -1421,6 +1501,10 @@ void PerformScan::run() } } -+ // Save the dbus connection, path and interface info -+ // of the device -+ record[foundObject]["Connection"] = -+ std::get<1>(foundDeviceInfo); -+ record[foundObject]["Path"] = std::get<2>(foundDeviceInfo); -+ record[foundObject]["Interface"] = -+ std::get<3>(foundDeviceInfo); ++ // Save the dbus path info of the device ++ record[foundObject]["Path"] = ++ std::get<1>(foundDeviceAndPath); + if (replaceStr) { |