commit e851f8aa39b24366ef26a8463a840d9dbaeef089
author Gunnar Mills <gmills@us.ibm.com> Wed Oct 14 14:36:13 2020 -0500
committer Gunnar Mills <gmills@us.ibm.com> Fri Oct 16 13:09:57 2020 +0000
tree 2b5dfc463bbdc7198b1fd9ec2a2ecf7e59fbf382
parent c3b3c92ac043fa99e8780c3aaf4fc235555ed396

Rename getCpuData -> getProcessorData

It is the processor schema and includes more than CPUs.

Changed a variable name and a LOG_DEBUG as well.

Tested: Top commit was tested.

Change-Id: Ib8e5b32bbd2bfb48393544ee6b177a3764e190c0
Signed-off-by: Gunnar Mills <gmills@us.ibm.com>

redfish-core/lib/cpudimm.hpp

diff --git a/redfish-core/lib/cpudimm.hpp b/redfish-core/lib/cpudimm.hpp
index 7a306a3..3823089 100644
--- a/redfish-core/lib/cpudimm.hpp
+++ b/redfish-core/lib/cpudimm.hpp
@@ -408,14 +408,14 @@
         service, objPath, "org.freedesktop.DBus.Properties", "GetAll", "");
 }
 
-inline void getCpuData(std::shared_ptr<AsyncResp> aResp,
-                       const std::string& cpuId,
-                       const std::vector<const char*>& inventoryItems)
+inline void getProcessorData(std::shared_ptr<AsyncResp> aResp,
+                             const std::string& processorId,
+                             const std::vector<const char*>& inventoryItems)
 {
-    BMCWEB_LOG_DEBUG << "Get available system cpu resources.";
+    BMCWEB_LOG_DEBUG << "Get available system processor resources.";
 
     crow::connections::systemBus->async_method_call(
-        [cpuId, aResp{std::move(aResp)}](
+        [processorId, aResp{std::move(aResp)}](
             const boost::system::error_code ec,
             const boost::container::flat_map<
                 std::string, boost::container::flat_map<
@@ -429,7 +429,7 @@
             }
             for (const auto& object : subtree)
             {
-                if (boost::ends_with(object.first, cpuId))
+                if (boost::ends_with(object.first, processorId))
                 {
                     for (const auto& service : object.second)
                     {
@@ -451,14 +451,16 @@
                             else if (inventory == "xyz.openbmc_project."
                                                   "Inventory.Item.Cpu")
                             {
-                                getCpuDataByService(aResp, cpuId, service.first,
+                                getCpuDataByService(aResp, processorId,
+                                                    service.first,
                                                     object.first);
                             }
                             else if (inventory == "xyz.openbmc_project."
                                                   "Inventory.Item.Accelerator")
                             {
-                                getAcceleratorDataByService(
-                                    aResp, cpuId, service.first, object.first);
+                                getAcceleratorDataByService(aResp, processorId,
+                                                            service.first,
+                                                            object.first);
                             }
                         }
                     }
@@ -466,7 +468,7 @@
                 }
             }
             // Object not found
-            messages::resourceNotFound(aResp->res, "Processor", cpuId);
+            messages::resourceNotFound(aResp->res, "Processor", processorId);
             return;
         },
         "xyz.openbmc_project.ObjectMapper",
@@ -1264,10 +1266,10 @@
 
         auto asyncResp = std::make_shared<AsyncResp>(res);
 
-        getCpuData(asyncResp, processorId,
-                   {"xyz.openbmc_project.Inventory.Item.Cpu",
-                    "xyz.openbmc_project.Inventory.Decorator.Asset",
-                    "xyz.openbmc_project.Inventory.Item.Accelerator"});
+        getProcessorData(asyncResp, processorId,
+                         {"xyz.openbmc_project.Inventory.Item.Cpu",
+                          "xyz.openbmc_project.Inventory.Decorator.Asset",
+                          "xyz.openbmc_project.Inventory.Item.Accelerator"});
     }
 };