Use xyz interface to update VPD collection status
This commit adds code to use xyz.openbmc_project.Common.Progress
interface instead of the com.ibm.VPD.Collection to update VPD
collection status of the FRU.
Output:
```
Tested on rainier system:
During inventory priming, observed Status as below #
Status updated as NotStarted:
root@p11bmc:~# busctl get-property xyz.openbmc_project.Inventory.Manager /xyz/openbmc_project/inventory/system/chassis/motherboard/tpm_wilson xyz.openbmc_project.Common.Progress Status
s "xyz.openbmc_project.Common.Progress.OperationStatus.NotStarted"
Status updated as InProgress:
root@p11bmc:~# busctl get-property xyz.openbmc_project.Inventory.Manager /xyz/openbmc_project/inventory/system/chassis/motherboard/tpm_wilson xyz.openbmc_project.Common.Progress Status
s "xyz.openbmc_project.Common.Progress.OperationStatus.InProgress"
Status updated as Completed:
root@p11bmc:~# busctl get-property xyz.openbmc_project.Inventory.Manager /xyz/openbmc_project/inventory/system/chassis/motherboard/tpm_wilson xyz.openbmc_project.Common.Progress Status
s "xyz.openbmc_project.Common.Progress.OperationStatus.Completed"
root@p11bmc:~#
FRU whose VPD collection is failed:
After Priming -
root@p11bmc:~# busctl get-property xyz.openbmc_project.Inventory.Manager /xyz/openbmc_project/inventory/system/chassis/motherboard/dimm14 xyz.openbmc_project.Common.Progress Status
s "xyz.openbmc_project.Common.Progress.OperationStatus.NotStarted"
After VPD collection failed -
root@p11bmc:~# busctl get-property xyz.openbmc_project.Inventory.Manager /xyz/openbmc_project/inventory/system/chassis/motherboard/dimm14 xyz.openbmc_project.Common.Progress Status
s "xyz.openbmc_project.Common.Progress.OperationStatus.Failed"
Collection status update during deleteFRUVPD #
Before delete -
root@p11bmc:~# busctl get-property xyz.openbmc_project.Inventory.Manager /xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot10/pcie_card10 xyz.openbmc_project.Common.Progress Status; busctl get-property xyz.openbmc_project.Inventory.Manager /xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot10/pcie_card10/c10_connector0 xyz.openbmc_project.Common.Progress Status; busctl get-property xyz.openbmc_project.Inventory.Manager /xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot10/pcie_card10/c10_connector1 xyz.openbmc_project.Common.Progress Status; busctl get-property xyz.openbmc_project.Inventory.Manager /xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot10/pcie_card10/c10_connector2 xyz.openbmc_project.Common.Progress Status; busctl get-property xyz.openbmc_project.Inventory.Manager /xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot10/pcie_card10/c10_connector3 xyz.openbmc_project.Common.Progress Status
s "xyz.openbmc_project.Common.Progress.OperationStatus.Completed"
s "xyz.openbmc_project.Common.Progress.OperationStatus.Completed"
s "xyz.openbmc_project.Common.Progress.OperationStatus.Completed"
s "xyz.openbmc_project.Common.Progress.OperationStatus.Completed"
s "xyz.openbmc_project.Common.Progress.OperationStatus.Completed"
After delete operation -
root@p11bmc:~# busctl get-property xyz.openbmc_project.Inventory.Manager /xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot10/pcie_card10 xyz.openbmc_project.Common.Progress Status; busctl get-property xyz.openbmc_project.Inventory.Manager /xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot10/pcie_card10/c10_connector0 xyz.openbmc_project.Common.Progress Status; busctl get-property xyz.openbmc_project.Inventory.Manager /xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot10/pcie_card10/c10_connector1 xyz.openbmc_project.Common.Progress Status; busctl get-property xyz.openbmc_project.Inventory.Manager /xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot10/pcie_card10/c10_connector2 xyz.openbmc_project.Common.Progress Status; busctl get-property xyz.openbmc_project.Inventory.Manager /xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot10/pcie_card10/c10_connector3 xyz.openbmc_project.Common.Progress Status
s "xyz.openbmc_project.Common.Progress.OperationStatus.NotStarted"
s "xyz.openbmc_project.Common.Progress.OperationStatus.NotStarted"
s "xyz.openbmc_project.Common.Progress.OperationStatus.NotStarted"
s "xyz.openbmc_project.Common.Progress.OperationStatus.NotStarted"
s "xyz.openbmc_project.Common.Progress.OperationStatus.NotStarted"
Collection status update during CollectFRUVPD #
Before collection:
root@p11bmc:~# busctl get-property xyz.openbmc_project.Inventory.Manager /xyz/openbmc_project/inventory/system/chassis/motherboard/lcd_op_panel_hill xyz.openbmc_project.Common.Progress Status
s "xyz.openbmc_project.Common.Progress.OperationStatus.Completed"
After CollectFRUVPD method call -
root@p11bmc:~# busctl call com.ibm.VPD.Manager /com/ibm/VPD/Manager com.ibm.VPD.Manager CollectFRUVPD o "/xyz/openbmc_project/inventory/system/chassis/motherboard/lcd_op_panel_hill"
Status updated as below during the process –
root@p11bmc:~# busctl get-property xyz.openbmc_project.Inventory.Manager /xyz/openbmc_project/inventory/system/chassis/motherboard/lcd_op_panel_hill xyz.openbmc_project.Common.Progress Status
s "xyz.openbmc_project.Common.Progress.OperationStatus.InProgress"
root@p11bmc:~# busctl get-property xyz.openbmc_project.Inventory.Manager /xyz/openbmc_project/inventory/system/chassis/motherboard/lcd_op_panel_hill xyz.openbmc_project.Common.Progress Status
s "xyz.openbmc_project.Common.Progress.OperationStatus.Completed"
```
Change-Id: I705e10e80b90df9bac338e8b5475d95690e05ace
Signed-off-by: Anupama B R <anupama.b.r1@ibm.com>
diff --git a/vpd-manager/include/constants.hpp b/vpd-manager/include/constants.hpp
index a41192e..ad64e5c 100644
--- a/vpd-manager/include/constants.hpp
+++ b/vpd-manager/include/constants.hpp
@@ -220,18 +220,19 @@
static constexpr auto systemdManagerInterface =
"org.freedesktop.systemd1.Manager";
-static constexpr auto vpdCollectionInterface = "com.ibm.VPD.Collection";
+static constexpr auto vpdCollectionInterface =
+ "xyz.openbmc_project.Common.Progress";
// enumerated values of CollectionStatus D-bus property defined under
// com.ibm.VPD.Collection interface.
-static constexpr auto vpdCollectionSuccess =
- "com.ibm.VPD.Collection.Status.Success";
-static constexpr auto vpdCollectionFailure =
- "com.ibm.VPD.Collection.Status.Failure";
+static constexpr auto vpdCollectionCompleted =
+ "xyz.openbmc_project.Common.Progress.OperationStatus.Completed";
+static constexpr auto vpdCollectionFailed =
+ "xyz.openbmc_project.Common.Progress.OperationStatus.Failed";
static constexpr auto vpdCollectionInProgress =
- "com.ibm.VPD.Collection.Status.InProgress";
+ "xyz.openbmc_project.Common.Progress.OperationStatus.InProgress";
static constexpr auto vpdCollectionNotStarted =
- "com.ibm.VPD.Collection.Status.NotStarted";
+ "xyz.openbmc_project.Common.Progress.OperationStatus.NotStarted";
static constexpr auto power_vs_50003_json =
"/usr/share/vpd/50003_power_vs.json";
static constexpr auto power_vs_50001_json =
diff --git a/vpd-manager/include/utility/dbus_utility.hpp b/vpd-manager/include/utility/dbus_utility.hpp
index c3e2789..df57cd1 100644
--- a/vpd-manager/include/utility/dbus_utility.hpp
+++ b/vpd-manager/include/utility/dbus_utility.hpp
@@ -577,7 +577,7 @@
types::InterfaceMap l_interfaceMap;
types::PropertyMap l_propertyMap;
- l_propertyMap.emplace("CollectionStatus", i_fruCollectionStatus);
+ l_propertyMap.emplace("Status", i_fruCollectionStatus);
l_interfaceMap.emplace(constants::vpdCollectionInterface, l_propertyMap);
l_objectMap.emplace(i_inventoryPath, l_interfaceMap);
diff --git a/vpd-manager/include/utility/vpd_specific_utility.hpp b/vpd-manager/include/utility/vpd_specific_utility.hpp
index ced7ef1..4dbe488 100644
--- a/vpd-manager/include/utility/vpd_specific_utility.hpp
+++ b/vpd-manager/include/utility/vpd_specific_utility.hpp
@@ -621,7 +621,7 @@
else if (std::holds_alternative<std::string>(
l_propertyValue))
{
- if (l_propertyName.compare("CollectionStatus") ==
+ if (l_propertyName.compare("Status") ==
constants::STR_CMP_SUCCESS)
{
l_propertyMap.emplace(