commit 01d4bd1a6301ebbd892b9c15cf4e5501e96da79b
author Ratan Gupta <ratagupt@in.ibm.com> Mon Aug 07 15:53:25 2017 +0530
committer Patrick Williams <patrick@stwcx.xyz> Fri Aug 11 17:29:08 2017 +0000
tree c262a73bc638540a056fabd641d45c230736ce31
parent 11ddbd21ede92a1d46a4df5fa3d9328b9fe08486

Take bus as input parameter in util function

Change-Id: I2de92a1d82939a539e19aca69561ad58a171a5d0
Signed-off-by: Ratan Gupta <ratagupt@in.ibm.com>

chassishandler.cpp

diff --git a/chassishandler.cpp b/chassishandler.cpp
index c047108..947c96c 100644
--- a/chassishandler.cpp
+++ b/chassishandler.cpp
@@ -292,18 +292,22 @@
         //  as SETTINGS_MATCH.
         //  Later SETTINGS_MATCH will be replaced with busname.
 
-        auto ipObjectInfo = ipmi::getDbusObject(IP_INTERFACE, SETTINGS_ROOT,
-                                                SETTINGS_MATCH);
-        auto macObjectInfo = ipmi::getDbusObject(MAC_INTERFACE, SETTINGS_ROOT,
-                                                 SETTINGS_MATCH);
+        sdbusplus::bus::bus bus(ipmid_get_sd_bus_connection());
 
-        properties  = ipmi::getAllDbusProperties(ipObjectInfo.second,
-                                         ipObjectInfo.first, IP_INTERFACE);
+        auto ipObjectInfo = ipmi::getDbusObject(bus, IP_INTERFACE,
+                                                SETTINGS_ROOT, SETTINGS_MATCH);
+
+        auto macObjectInfo = ipmi::getDbusObject(bus, MAC_INTERFACE,
+                                                 SETTINGS_ROOT, SETTINGS_MATCH);
+
+        properties  = ipmi::getAllDbusProperties(bus, ipObjectInfo.second,
+                                            ipObjectInfo.first, IP_INTERFACE);
         auto variant =
-            ipmi::getDbusProperty(macObjectInfo.second, macObjectInfo.first,
+            ipmi::getDbusProperty(bus, macObjectInfo.second,
+                                  macObjectInfo.first,
                                   MAC_INTERFACE, "MACAddress");
 
-        auto ipAddress = properties["Address"].get<std::string>();
+       auto ipAddress = properties["Address"].get<std::string>();
 
         auto gateway = properties["Gateway"].get<std::string>();
 
@@ -542,23 +546,25 @@
             ",mac="s + mac + ",addressOrigin="s + addressOrigin;
 
 
-        auto ipObjectInfo = ipmi::getDbusObject(IP_INTERFACE, SETTINGS_ROOT,
-                                          SETTINGS_MATCH);
-        auto macObjectInfo = ipmi::getDbusObject(MAC_INTERFACE, SETTINGS_ROOT,
-                                           SETTINGS_MATCH);
+        sdbusplus::bus::bus bus(ipmid_get_sd_bus_connection());
+
+        auto ipObjectInfo = ipmi::getDbusObject(bus, IP_INTERFACE,
+                                                SETTINGS_ROOT, SETTINGS_MATCH);
+        auto macObjectInfo = ipmi::getDbusObject(bus, MAC_INTERFACE,
+                                                 SETTINGS_ROOT, SETTINGS_MATCH);
         // set the dbus property
-        ipmi::setDbusProperty(ipObjectInfo.second, ipObjectInfo.first,
+        ipmi::setDbusProperty(bus, ipObjectInfo.second, ipObjectInfo.first,
                 IP_INTERFACE, "Address", std::string(ipAddress));
-        ipmi::setDbusProperty(ipObjectInfo.second, ipObjectInfo.first,
+        ipmi::setDbusProperty(bus, ipObjectInfo.second, ipObjectInfo.first,
                 IP_INTERFACE, "PrefixLength", prefix);
-        ipmi::setDbusProperty(ipObjectInfo.second, ipObjectInfo.first,
+        ipmi::setDbusProperty(bus, ipObjectInfo.second, ipObjectInfo.first,
                 IP_INTERFACE, "Origin", addressOrigin);
-        ipmi::setDbusProperty(ipObjectInfo.second, ipObjectInfo.first,
+        ipmi::setDbusProperty(bus, ipObjectInfo.second, ipObjectInfo.first,
                 IP_INTERFACE, "Gateway", std::string(gateway));
-        ipmi::setDbusProperty(ipObjectInfo.second, ipObjectInfo.first,
+        ipmi::setDbusProperty(bus, ipObjectInfo.second, ipObjectInfo.first,
                 IP_INTERFACE, "Type",
                 std::string("xyz.openbmc_project.Network.IP.Protocol.IPv4"));
-        ipmi::setDbusProperty(macObjectInfo.second, macObjectInfo.first,
+        ipmi::setDbusProperty(bus, macObjectInfo.second, macObjectInfo.first,
                 MAC_INTERFACE,"MACAddress", std::string(mac));
 
         log<level::DEBUG>("Network configuration changed",