diff options
author | Brandon Wyman <bjwyman@gmail.com> | 2017-03-16 18:17:07 -0500 |
---|---|---|
committer | Brandon Wyman <bjwyman@gmail.com> | 2017-03-20 16:54:25 -0500 |
commit | 5914f657e6f7e84d12cb4ef736db522e0fced6c6 (patch) | |
tree | c5c23f370a6fddc580f570b066ce2bdf7b20e3a0 /fan_enclosure.cpp | |
parent | 6d9b18d5e51b269d741c13120a35a7b780ac8928 (diff) | |
download | phosphor-fan-presence-5914f657e6f7e84d12cb4ef736db522e0fced6c6.tar.gz phosphor-fan-presence-5914f657e6f7e84d12cb4ef736db522e0fced6c6.zip |
Move getInvService() into utility function.
Resolves openbmc/openbmc#1299
Change-Id: I61f511dcc15e67393a47bd0395b752d2e6f17f11
Signed-off-by: Brandon Wyman <bjwyman@gmail.com>
Diffstat (limited to 'fan_enclosure.cpp')
-rw-r--r-- | fan_enclosure.cpp | 38 |
1 files changed, 2 insertions, 36 deletions
diff --git a/fan_enclosure.cpp b/fan_enclosure.cpp index cb0c423..262876e 100644 --- a/fan_enclosure.cpp +++ b/fan_enclosure.cpp @@ -16,7 +16,7 @@ #include <algorithm> #include <phosphor-logging/log.hpp> #include "fan_enclosure.hpp" - +#include "utility.hpp" namespace phosphor { @@ -27,11 +27,6 @@ namespace presence using namespace phosphor::logging; -//TODO Should get these from phosphor-objmgr config.h -constexpr auto MAPPER_BUSNAME = "xyz.openbmc_project.ObjectMapper"; -constexpr auto MAPPER_PATH = "/xyz/openbmc_project/object_mapper"; -constexpr auto MAPPER_INTERFACE = "xyz.openbmc_project.ObjectMapper"; - //TODO Should get these from phosphor-inventory-manager config.h constexpr auto INVENTORY_PATH = "/xyz/openbmc_project/inventory"; constexpr auto INVENTORY_INTF = "xyz.openbmc_project.Inventory.Manager"; @@ -62,35 +57,6 @@ FanEnclosure::ObjectMap FanEnclosure::getObjectMap(const bool curPresState) return invObj; } -std::string FanEnclosure::getInvService() -{ - auto mapperCall = bus.new_method_call(MAPPER_BUSNAME, - MAPPER_PATH, - MAPPER_INTERFACE, - "GetObject"); - - mapperCall.append(INVENTORY_PATH); - mapperCall.append(std::vector<std::string>({INVENTORY_INTF})); - - auto mapperResponseMsg = bus.call(mapperCall); - if (mapperResponseMsg.is_method_error()) - { - throw std::runtime_error( - "Error in mapper call to get inventory service name"); - } - - std::map<std::string, std::vector<std::string>> mapperResponse; - mapperResponseMsg.read(mapperResponse); - - if (mapperResponse.empty()) - { - throw std::runtime_error( - "Error in mapper response for inventory service name"); - } - - return mapperResponse.begin()->first; -} - void FanEnclosure::updInventory() { auto curPresState = getCurPresState(); @@ -103,7 +69,7 @@ void FanEnclosure::updInventory() std::string invService; try { - invService = getInvService(); + invService = getInvService(bus); } catch (const std::runtime_error& err) { |