commit acecf6b82c5dfbcab9215936eb1ee5fd3893a32d
author Patrick Venture <venture@google.com> Thu Sep 06 17:56:41 2018 -0700
committer Patrick Venture <venture@google.com> Thu Sep 06 18:02:37 2018 -0700
tree c562b43d2474dbf896d2187683a6b0ab44f27ae7
parent e2ec0f618a9b3b6809a98516abe63d5d833e7fe7

ipmi: catch SdBusErrors on bus call failures

Now sdbusplus call and call_noreply can throw an SdBusError exception.
This code changes from checking .is_method_error() to catching the
exception.

Issue: 4
Change-Id: I07bbe5dbbd91d72ca75eeb14861d56aae5f3afed
Signed-off-by: Patrick Venture <venture@google.com>

ipmi/manualcmds.cpp

diff --git a/ipmi/manualcmds.cpp b/ipmi/manualcmds.cpp
index eabcd0a..798deab 100644
--- a/ipmi/manualcmds.cpp
+++ b/ipmi/manualcmds.cpp
@@ -84,22 +84,20 @@
                                                   propertiesintf, "GetAll");
     pimMsg.append(intf);
 
-    auto valueResponseMsg = propertyReadBus.call(pimMsg);
-    if (valueResponseMsg.is_method_error())
+    try
+    {
+        auto valueResponseMsg = propertyReadBus.call(pimMsg);
+
+        PropertyMap propMap;
+        valueResponseMsg.read(propMap);
+
+        *value = sdbusplus::message::variant_ns::get<bool>(propMap[property]);
+    }
+    catch (const sdbusplus::exception::SdBusError& ex)
     {
         return IPMI_CC_INVALID;
     }
 
-    PropertyMap propMap;
-    valueResponseMsg.read(propMap);
-
-    if (propMap.size() != 2)
-    {
-        return IPMI_CC_INVALID;
-    }
-
-    *value = sdbusplus::message::variant_ns::get<bool>(propMap[property]);
-
     return IPMI_CC_OK;
 }
 
@@ -193,8 +191,12 @@
     pimMsg.append(intf);
     pimMsg.append(manualProperty);
     pimMsg.append(v);
-    auto responseMsg = PropertyWriteBus.call(pimMsg);
-    if (responseMsg.is_method_error())
+
+    try
+    {
+        PropertyWriteBus.call_noreply(pimMsg);
+    }
+    catch (const sdbusplus::exception::SdBusError& ex)
     {
         rc = IPMI_CC_INVALID;
     }