commit 947da1b0b8bce6bfbed4a18417d5f91f724022b2
author Nan Zhou <nanzhoumails@gmail.com> Tue Sep 20 20:40:59 2022 +0000
committer Ed Tanous <ed@tanous.net> Wed Sep 28 16:27:20 2022 +0000
tree 13cdedd5b7371edc0ddc06c34712a4d9070ab88c
parent fefb585545292cf6fcda696dfadd802d696c9eb5

tree-wide: change EM's ObjectManager path

EntityManager moves its ObjectManager in commit [1], this patch is to
change accordingly. Please see [1] for why we made that change.

[1] https://gerrit.openbmc.org/c/openbmc/entity-manager/+/57279

Tested: code compiles. Code inspection can show that only ObjectManager
path changed.

Signed-off-by: Nan Zhou <nanzhoumails@gmail.com>
Change-Id: I770e977a5aa76af8ca79f550dcb5f81fa585a66b

dbus-sdr/storagecommands.cpp

diff --git a/dbus-sdr/storagecommands.cpp b/dbus-sdr/storagecommands.cpp
index d5f6d4d..eeed777 100644
--- a/dbus-sdr/storagecommands.cpp
+++ b/dbus-sdr/storagecommands.cpp
@@ -621,9 +621,11 @@
 
     // todo: this should really use caching, this is a very inefficient lookup
     boost::system::error_code ec;
+
     ManagedObjectType entities = ctx->bus->yield_method_call<ManagedObjectType>(
-        ctx->yield, ec, entityManagerServiceName, "/",
-        "org.freedesktop.DBus.ObjectManager", "GetManagedObjects");
+        ctx->yield, ec, entityManagerServiceName,
+        "/xyz/openbmc_project/inventory", "org.freedesktop.DBus.ObjectManager",
+        "GetManagedObjects");
 
     if (ec)
     {

storagehandler.cpp

diff --git a/storagehandler.cpp b/storagehandler.cpp
index 34ca0b9..08fdda7 100644
--- a/storagehandler.cpp
+++ b/storagehandler.cpp
@@ -732,8 +732,8 @@
     }
 
     ipmi::ObjectValueTree managedObjects;
-    ec = getManagedObjects(ctx, "xyz.openbmc_project.EntityManager", "/",
-                           managedObjects);
+    ec = getManagedObjects(ctx, "xyz.openbmc_project.EntityManager",
+                           "/xyz/openbmc_project/inventory", managedObjects);
     if (!ec)
     {
         auto connection = managedObjects.find(fruPath);