commit 49796415d9ead7c8a3fe622727945a501322931d
author John Edward Broadbent <jebr@google.com> Wed Jun 22 18:31:52 2022 -0700
committer John Broadbent <jebr@google.com> Thu Jun 30 17:00:03 2022 +0000
tree 312ecbe77a42b9893e07818de52c133d161f6471
parent 6771c6917ed410a21cbcfa658c63c014a5b2e52a

Update location interface

Before LocationCode was being set, but the bmcweb code used
LocationType. This change makes eStorageD use LocationType,
and not LocationCode.

Tested:

$ busctl introspect xyz.openbmc_project.eStoraged /xyz/openbmc_project/inventory/storage/mmcblk0
NAME                                             TYPE
...
xyz.openbmc_project.Inventory.Connector.Embedded interface
...

Signed-off-by: John Edward Broadbent <jebr@google.com>
Change-Id: I3e077559fa00cccd8e0d4580fafadf4a2cdb40fd

src/estoraged.cpp

diff --git a/src/estoraged.cpp b/src/estoraged.cpp
index 0063e44..9c4fba9 100644
--- a/src/estoraged.cpp
+++ b/src/estoraged.cpp
@@ -99,14 +99,12 @@
             return value;
         });
 
-    locationInterface = objectServer.add_interface(
-        objectPath, "xyz.openbmc_project.Inventory.Decorator.LocationCode");
-    locationInterface->register_property("LocationCode",
-                                         std::string("Embedded"));
+    embeddedLocationInterface = objectServer.add_interface(
+        objectPath, "xyz.openbmc_project.Inventory.Connector.Embedded");
 
     volumeInterface->initialize();
     driveInterface->initialize();
-    locationInterface->initialize();
+    embeddedLocationInterface->initialize();
 
     /* Set up the association between chassis and drive. */
     association = objectServer.add_interface(
@@ -123,7 +121,7 @@
 {
     objectServer.remove_interface(volumeInterface);
     objectServer.remove_interface(driveInterface);
-    objectServer.remove_interface(locationInterface);
+    objectServer.remove_interface(embeddedLocationInterface);
     objectServer.remove_interface(association);
 }