commit 32825a23324c2cf051bb5608348b8ea2109a36b5
author AppaRao Puli <apparao.puli@linux.intel.com> Fri Jan 17 15:52:41 2020 +0530
committer AppaRao Puli <apparao.puli@linux.intel.com> Tue Mar 10 02:36:52 2020 +0000
tree 3f229d84ddff30323841f554393ab7872cdb04ae
parent 6c6cec48de26d80403dbf8f765a6fc3c24bd8528

Get ME version using functional association

Get ME version by checking the functional
association endpoints. Firmware versions are
now retrieved using identical methods.

Tested:
Tested Get OEM Device info ipmi command and it works.

Change-Id: I6dda7fff52e1018e8cbd30718c5e1ab4ae2d3ed4
Signed-off-by: AppaRao Puli <apparao.puli@linux.intel.com>

src/oemcommands.cpp

diff --git a/src/oemcommands.cpp b/src/oemcommands.cpp
index 55f9568..b87a2ab 100644
--- a/src/oemcommands.cpp
+++ b/src/oemcommands.cpp
@@ -316,38 +316,22 @@
     }
 
     // step 2 : get ME Major and Minor numbers from its DBUS property
-    try
+    std::string meVersion;
+    if (getActiveSoftwareVersionInfo(ctx, versionPurposeME, meVersion))
     {
-        std::shared_ptr<sdbusplus::asio::connection> dbus = getSdBus();
-        std::string service =
-            getService(*dbus, "xyz.openbmc_project.Software.Version",
-                       "/xyz/openbmc_project/software/me");
-        Value variant =
-            getDbusProperty(*dbus, service, "/xyz/openbmc_project/software/me",
-                            "xyz.openbmc_project.Software.Version", "Version");
-
-        std::string& meVersion = std::get<std::string>(variant);
-
-        // get ME major number
-        std::regex pattern1("(\\d+?).(\\d+?).(\\d+?).(\\d+?).(\\d+?)");
-        constexpr size_t matchedPhosphor = 6;
-        std::smatch results;
-        if (std::regex_match(meVersion, results, pattern1))
-        {
-            if (results.size() == matchedPhosphor)
-            {
-                meMajor = static_cast<uint8_t>(std::stoi(results[1]));
-                meMinor = static_cast<uint8_t>(std::stoi(results[2]));
-            }
-        }
-    }
-    catch (sdbusplus::exception::SdBusError& e)
-    {
-        phosphor::logging::log<phosphor::logging::level::ERR>(
-            "Exception caught in ME version conversion",
-            phosphor::logging::entry("MSG=%s", e.what()));
         return false;
     }
+    std::regex pattern1("(\\d+?).(\\d+?).(\\d+?).(\\d+?).(\\d+?)");
+    constexpr size_t matchedPhosphor = 6;
+    std::smatch results;
+    if (std::regex_match(meVersion, results, pattern1))
+    {
+        if (results.size() == matchedPhosphor)
+        {
+            meMajor = static_cast<uint8_t>(std::stoi(results[1]));
+            meMinor = static_cast<uint8_t>(std::stoi(results[2]));
+        }
+    }
     return true;
 }