1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
|
From 1b34b289eacc2ebb9c343680a3696dda4abe4a37 Mon Sep 17 00:00:00 2001
From: Ali Ahmed <ama213000@gmail.com>
Date: Fri, 3 Sep 2021 02:33:43 -0500
Subject: [PATCH] Add Model to ProcessorSummary
In Redfish ComputerSystem schema, the ProcessorSummary parameter
lists summary information of the Processors on the system. This commit
adds the 'Model' property to ProcessorSummary.
If the CPU Models are different, then the 'Model' field takes the first
entry in alphabetical order.
Testing:
1. Redfish Validator Testing successfully passed.
2. Curl testing:
curl -k -H "X-Auth-Token: $tok" https://$bmc/redfish/v1/Systems/system
...
"ProcessorSummary": {
"CoreCount": 24,
"Count": 2,
"Model": "test_name",
"Status": {
"Health": "OK",
"HealthRollup": "OK",
"State": "Disabled"
}
},
...
Change-Id: I39cbf6ed35c35ce3a3551c9689237d5023775326
Signed-off-by: Ali Ahmed <ama213000@gmail.com>
Signed-off-by: AppaRao Puli <apparao.puli@linux.intel.com>
---
redfish-core/lib/systems.hpp | 47 +++++++++++++++++++++++++++++++-----
1 file changed, 41 insertions(+), 6 deletions(-)
diff --git a/redfish-core/lib/systems.hpp b/redfish-core/lib/systems.hpp
index 2f88a777..8406bd4d 100644
--- a/redfish-core/lib/systems.hpp
+++ b/redfish-core/lib/systems.hpp
@@ -185,21 +185,56 @@ inline void getProcessorProperties(
for (const auto& property : properties)
{
+ if (property.first == "Family")
+ {
+ // Get the CPU Model
+ const std::string* modelStr =
+ std::get_if<std::string>(&property.second);
+ if (!modelStr)
+ {
+ BMCWEB_LOG_DEBUG << "Failed to get CPU Family";
+ // Skip it and continue with other properties
+ continue;
+ }
+ if ((*modelStr).size() < 1)
+ {
+ BMCWEB_LOG_DEBUG << "Empty CPU Family info, skipping...";
+ continue;
+ }
+ nlohmann::json& prevModel =
+ aResp->res.jsonValue["ProcessorSummary"]["Model"];
+ std::string* prevModelPtr = prevModel.get_ptr<std::string*>();
- // TODO: Get Model
+ // If CPU Models are different, use the first entry in
+ // alphabetical order
- // Get CoreCount
- if (property.first == "CoreCount")
+ // If Model has never been set
+ // before, set it to *modelStr
+ if (prevModelPtr == nullptr)
+ {
+ prevModel = *modelStr;
+ }
+ // If Model has been set before, only change if new Model is
+ // higher in alphabetical order
+ else
+ {
+ if (*modelStr < *prevModelPtr)
+ {
+ prevModel = *modelStr;
+ }
+ }
+ }
+ else if (property.first == "CoreCount")
{
-
// Get CPU CoreCount and add it to the total
const uint16_t* coreCountVal =
std::get_if<uint16_t>(&property.second);
if (!coreCountVal)
{
- messages::internalError(aResp->res);
- return;
+ BMCWEB_LOG_DEBUG << "Failed to get CPU Core count";
+ // Skip it and continue with other properties
+ continue;
}
nlohmann::json& coreCount =
--
2.17.1
|
