redfish: Fix type of Thermal.Fan Reading field

End-user-impact: Now Redfish Thermal.Fan node provides Reading field with valid type - int. Signed-off-by: Igor Kononenko <[email protected]>
YADRO-KNS · Nov 15, 2022 · 7ca1ec9 · 7ca1ec9
1 parent a0b94d0
commit 7ca1ec9
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/src/sensors.hpp b/src/sensors.hpp
@@ -55,6 +55,7 @@ class Sensors :
     ENTITY_DECL_FIELD(std::string, Id)
     ENTITY_DECL_FIELD(std::string, Name)
     ENTITY_DECL_FIELD_DEF(double, Reading, 0)
+    ENTITY_DECL_FIELD_DEF(int64_t, ReadingNatural, 0)
     ENTITY_DECL_FIELD_ENUM(Unit, Unit, unkown)
     ENTITY_DECL_FIELD_ENUM(Group, Group, sensors)
 
@@ -386,6 +387,11 @@ class Sensors :
             }
         }
 
+        void setNaturalReading(const DBusInstancePtr& instance) const
+        {
+            setFieldReadingNatural(instance, getFieldReading(instance));
+        }
+
         void supplementByStaticFields(
             const DBusInstancePtr& instance) const override
         {
@@ -394,6 +400,7 @@ class Sensors :
             this->setStatus(instance);
             this->setState(instance);
             this->setGroup(instance);
+            this->setNaturalReading(instance);
         }
     };
 
@@ -405,6 +412,7 @@ class Sensors :
         this->createMember(fieldStatus);
         this->createMember(fieldState);
         this->createMember(fieldGroup);
+        this->createMember(fieldReadingNatural);
     }
     ~Sensors() override = default;
 

diff --git a/tools/redfish-gen/redfish/v1/Chassis/ChassisNode/Thermal.yaml b/tools/redfish-gen/redfish/v1/Chassis/ChassisNode/Thermal.yaml
@@ -89,7 +89,7 @@ Thermal:
                   - Name: UpperThresholdCritical
                     SourceField: Sensors::fieldHighCritical
                   - Name: Reading
-                    SourceField: Sensors::fieldReading
+                    SourceField: Sensors::fieldReadingNatural
                   - Name: ReadingUnits
                     SourceField: Sensors::fieldUnit
             Enums: