From 0b77cfa1e9c4d5aaf9bf827ddd6a6f26cf5a0f09 Mon Sep 17 00:00:00 2001
From: Ratan Gupta <ratagupt@in.ibm.com>
Date: Tue, 31 Jan 2017 17:32:31 +0530
Subject: writefrudata : invoke inventory manager

Make a call to the inventory manager to construct
inventory objects for IPMI FRUs

Change-Id: I4b36ecc85bc78214c9c47032bafd013f6ff27fe9
Signed-off-by: Ratan Gupta <ratagupt@in.ibm.com>
Signed-off-by: Deepak Kodihalli <dkodihal@in.ibm.com>
---
 writefrudata.cpp | 84 +++++++++++++++++++++++++++++++++++++++++++-------------
 1 file changed, 65 insertions(+), 19 deletions(-)

(limited to 'writefrudata.cpp')

diff --git a/writefrudata.cpp b/writefrudata.cpp
index 3e09bc8..bf9ae7f 100644
--- a/writefrudata.cpp
+++ b/writefrudata.cpp
@@ -1,3 +1,4 @@
+#include <exception>
 #include <vector>
 #include <stdlib.h>
 #include <dlfcn.h>
@@ -15,6 +16,7 @@
 #include "frup.h"
 #include "fru-area.hpp"
 #include "fru-gen.hpp"
+#include <sdbusplus/server.hpp>
 
 // OpenBMC System Manager dbus framework
 const char  *sys_object_name   =  "/org/openbmc/managers/System";
@@ -396,23 +398,36 @@ std::string getFRUValue(const std::string& section,
     return fruValue;
 
 }
-
-// TODO: Remove once the call to inventory manager is added
-auto print = [](const InterfaceList& object, const std::string& path)
+//Get the inventory service from the mapper.
+auto getService(sdbusplus::bus::bus& bus,
+                         const std::string& intf,
+                         const std::string& path)
 {
-    std::cout << "\n";
-    std::cout << path << "\n";
-    std::cout << "\n";
-    for(const auto& o : object)
+    auto mapperCall = bus.new_method_call(
+            "xyz.openbmc_project.ObjectMapper",
+            "/xyz/openbmc_project/ObjectMapper",
+            "xyz.openbmc_project.ObjectMapper",
+            "GetObject");
+
+    mapperCall.append(path);
+    mapperCall.append(std::vector<std::string>({intf}));
+
+    auto mapperResponseMsg = bus.call(mapperCall);
+    if (mapperResponseMsg.is_method_error())
     {
-        std::cout << o.first << "\n";
-        for(const auto& i : o.second)
-        {
-            std::cout << i.first << " : " << i.second << "\n";
-        }
-        std::cout << "\n";
+        throw std::runtime_error("ERROR in mapper call");
+    }
+
+    std::map<std::string, std::vector<std::string>> mapperResponse;
+    mapperResponseMsg.read(mapperResponse);
+
+    if (mapperResponse.begin() == mapperResponse.end())
+    {
+        throw std::runtime_error("ERROR in reading the mapper response");
     }
-};
+
+    return mapperResponse.begin()->first;
+}
 
 //------------------------------------------------------------------------
 // Takes FRU data, invokes Parser for each fru record area and updates
@@ -447,15 +462,37 @@ int ipmi_update_inventory(fru_area_vec_t& area_vec)
 
     // Here we are just printing the object,interface and the properties.
     // which needs to be called with the new inventory manager implementation.
-    // TODO:- Call the new Inventory Manager.
+    auto bus = sdbusplus::bus::new_default();
+    using namespace std::string_literals;
+    static const auto intf = "xyz.openbmc_project.Inventory.Manager"s;
+    static const auto path = "/xyz/openbmc_project/Inventory"s;
+    std::string service;
+    try
+    {
+        service = getService(bus,intf,path);
+    }
+    catch (const std::runtime_error& e)
+    {
+        std::cerr << e.what() << "\n";
+        return -1;
+    }
+    auto notify = [&]()
+    {
+        return bus.new_method_call(
+                service.c_str(),
+                path.c_str(),
+                intf.c_str(),
+                "Notify");
+    };
+
     auto iter = frus.find(fruid);
     if (iter == frus.end())
     {
         std::cerr << "ERROR Unable to get the fru info for FRU=" << fruid << "\n";
         return -1;
     }
-    auto& instanceList = iter->second;
 
+    auto& instanceList = iter->second;
     if (instanceList.size() <= 0)
     {
         std::cout << "Object List empty for this FRU=" << fruid << "\n";
@@ -490,10 +527,19 @@ int ipmi_update_inventory(fru_area_vec_t& area_vec)
             }
             interfaces.emplace(std::move(interfaceList.first), std::move(prop));
         }
-        //TODO:- remove it later with the inventory manager call.
-        print(interfaces, instance.first);
+        //Call the inventory manager
+        sdbusplus::message::object_path relPath = instance.first;
+
+        auto m = notify();
+        m.append(relPath);
+        m.append(interfaces);
+        auto inventoryMgrResponseMsg = bus.call(m);
+        if (inventoryMgrResponseMsg.is_method_error())
+        {
+            std::cerr << "Error in notify call\n";
+            return -1;
+        }
     }
-
     return rc;
 }
 
-- 
cgit v1.2.1