commit 2742b85c8b9524d623a30e16a97133f3e335be13
author Yong Li <yong.b.li@linux.intel.com> Mon Dec 16 14:55:11 2019 +0800
committer Yong Li <yong.b.li@intel.com> Wed Jan 08 01:35:41 2020 +0000
tree 3eae491eec317edee5430e24a3c9b03564fb008e
parent 3c8af65773238144b8f04fab529e154e7d0fbbee

Change the bios version dbus interface to align with bmcweb

bmcweb uses the software interface for bios version query in redfish,
to align with it, the settings service implements this interface,
this reference needs to be changed too

Tested:
AC cycle the system, then DC cycle the host,
BiosVersion in redfish is the correct bios version:
https://$BMCIP/redfish/v1/Systems/system

Signed-off-by: Yong Li <yong.b.li@linux.intel.com>
Change-Id: I90d66d2f6c24779b09b694204fdbb5c1434f37d4

include/oemcommands.hpp

diff --git a/include/oemcommands.hpp b/include/oemcommands.hpp
index a6ece9c..7a8e445 100644
--- a/include/oemcommands.hpp
+++ b/include/oemcommands.hpp
@@ -154,10 +154,10 @@
 
 static constexpr const uint8_t maxBIOSIDLength = 0xFF;
 static constexpr const uint8_t maxCPUNum = 4;
-static constexpr const char* biosObjPath = "/xyz/openbmc_project/bios";
-static constexpr const char* biosIntf =
-    "xyz.openbmc_project.Inventory.Item.Bios";
-static constexpr const char* biosProp = "BiosId";
+static constexpr const char* biosObjPath = "/xyz/openbmc_project/software/bios";
+static constexpr const char* biosVersionIntf =
+    "xyz.openbmc_project.Software.Version";
+static constexpr const char* biosVersionProp = "Version";
 
 static constexpr const char* powerRestoreDelayObjPath =
     "/xyz/openbmc_project/control/power_restore_delay";

src/oemcommands.cpp

diff --git a/src/oemcommands.cpp b/src/oemcommands.cpp
index 2697d00..1313316 100644
--- a/src/oemcommands.cpp
+++ b/src/oemcommands.cpp
@@ -296,8 +296,9 @@
     std::string idString((char*)data->biosId, data->biosIDLength);
 
     std::shared_ptr<sdbusplus::asio::connection> dbus = getSdBus();
-    std::string service = getService(*dbus, biosIntf, biosObjPath);
-    setDbusProperty(*dbus, service, biosObjPath, biosIntf, biosProp, idString);
+    std::string service = getService(*dbus, biosVersionIntf, biosObjPath);
+    setDbusProperty(*dbus, service, biosObjPath, biosVersionIntf,
+                    biosVersionProp, idString);
     uint8_t* bytesWritten = static_cast<uint8_t*>(response);
     *bytesWritten =
         data->biosIDLength; // how many bytes are written into storage
@@ -387,11 +388,13 @@
         case OEMDevEntityType::biosId:
         {
             std::shared_ptr<sdbusplus::asio::connection> dbus = getSdBus();
-            std::string service = getService(*dbus, biosIntf, biosObjPath);
+            std::string service =
+                getService(*dbus, biosVersionIntf, biosObjPath);
             try
             {
-                Value variant = getDbusProperty(*dbus, service, biosObjPath,
-                                                biosIntf, biosProp);
+                Value variant =
+                    getDbusProperty(*dbus, service, biosObjPath,
+                                    biosVersionIntf, biosVersionProp);
                 std::string& idString = std::get<std::string>(variant);
                 if (offset >= idString.size())
                 {