bmcweb: Correct Id field for sensors
Patch to "fix" sensor overrides also changed the Id field. We want to
undo the "fix", but keep the Id field change.
Tested: Sensor type is append to Id field.
```
root@bmc:~# curl localhost/redfish/v1/Chassis/Card/Sensors/temperature_Card | grep Id
"Id": "temperature_Card",
root@bmc:~#
```
Google-Bug-Id: 292163654
Change-Id: I1ce6dbd593515399599ec56c41e25d942ca05ab9
Signed-off-by: Vlad Sytchenko <vsytch@google.com>
(cherry picked from commit 87ee8f408fc17e0b0ab5f1c2b84e4ba77cab5d0e)
diff --git a/recipes-phosphor/interfaces/bmcweb/0001-Revert-to-old-sensor-override-logic.patch b/recipes-phosphor/interfaces/bmcweb/DOWNSTREAM_0001-Revert-to-old-sensor-override-logic.patch
similarity index 91%
rename from recipes-phosphor/interfaces/bmcweb/0001-Revert-to-old-sensor-override-logic.patch
rename to recipes-phosphor/interfaces/bmcweb/DOWNSTREAM_0001-Revert-to-old-sensor-override-logic.patch
index 362cf53..56946b7 100644
--- a/recipes-phosphor/interfaces/bmcweb/0001-Revert-to-old-sensor-override-logic.patch
+++ b/recipes-phosphor/interfaces/bmcweb/DOWNSTREAM_0001-Revert-to-old-sensor-override-logic.patch
@@ -1,4 +1,4 @@
-From f59adc9c8a920be1cd6d15901afb0d73788336f7 Mon Sep 17 00:00:00 2001
+From ac69b57bc4bddf465a43f6277442d78ec94b4abc Mon Sep 17 00:00:00 2001
From: Vlad Sytchenko <vsytch@google.com>
Date: Fri, 26 May 2023 20:57:26 +0000
Subject: [PATCH] Revert to old sensor override logic
@@ -13,22 +13,13 @@
Google-Bug-Id: 283748401
Signed-off-by: Vlad Sytchenko <vsytch@google.com>
---
- redfish-core/lib/sensors.hpp | 51 ++++++++++++++----------------------
- 1 file changed, 19 insertions(+), 32 deletions(-)
+ redfish-core/lib/sensors.hpp | 49 +++++++++++++-----------------------
+ 1 file changed, 18 insertions(+), 31 deletions(-)
diff --git a/redfish-core/lib/sensors.hpp b/redfish-core/lib/sensors.hpp
-index 0f673b4f..eb1a5acc 100644
+index 0f673b4f..56b36748 100644
--- a/redfish-core/lib/sensors.hpp
+++ b/redfish-core/lib/sensors.hpp
-@@ -743,7 +743,7 @@ inline void objectPropertiesToJson(
- {
- if (chassisSubNode == sensors::node::sensors)
- {
-- std::string subNodeEscaped(sensorType);
-+ std::string subNodeEscaped(chassisSubNode);
- subNodeEscaped.erase(
- std::remove(subNodeEscaped.begin(), subNodeEscaped.end(), '_'),
- subNodeEscaped.end());
@@ -763,6 +763,7 @@ inline void objectPropertiesToJson(
// Set MemberId and Name for non-power sensors. For PowerSupplies and
// PowerControl, those properties have more general values because
@@ -153,5 +144,5 @@
// and get the path and service name associated with the sensor
::dbus::utility::getDbusObject(
--
-2.41.0.rc0.172.g3f132b7071-goog
+2.41.0.487.g6d72f3e995-goog
diff --git a/recipes-phosphor/interfaces/bmcweb_%.bbappend b/recipes-phosphor/interfaces/bmcweb_%.bbappend
index ec6fc95..0518d99 100644
--- a/recipes-phosphor/interfaces/bmcweb_%.bbappend
+++ b/recipes-phosphor/interfaces/bmcweb_%.bbappend
@@ -187,5 +187,5 @@
# Bugfix(b/277958097)
SRC_URI:append:gbmc = " \
- file://0001-Revert-to-old-sensor-override-logic.patch \
+ file://DOWNSTREAM_0001-Revert-to-old-sensor-override-logic.patch \
"
