Power Supply, Fan: Look at PrettyName #1125
Open
+7
−2
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Use getPrettyName like we do for Processors, Assembly, Chassis, Storage, Memory. Signed-off-by: Gunnar Mills <[email protected]>
deepakala-k
approved these changes
Jan 15, 2025
jeaaustx
approved these changes
Jan 15, 2025
| @@ -349,6 +349,9 @@ inline void | |||
| getFanAsset(asyncResp, fanPath, service); | |||
| getFanLocation(asyncResp, fanPath, service); | |||
| getLocationIndicatorActive(asyncResp, fanPath); | |||
| const dbus::utility::MapperServiceMap& serviceMatch = {{service, {""}}}; | |||
There was a problem hiding this comment.
I see that this will work, but it does with the understanding that getPrettyName() only uses the first element of the first pair.
For upstream it seems like handleFanPath() would need to be altered to pass the object to the callback function. Then the callback function would pull the fanPath for those related functions and pass the object to getPrettyName(). (Could also leave the setting of Name in addFanCommonProperties() if the object is passed on to it.
This is probably more change than we want in 1110?
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Use getPrettyName like we do for Processors, Assembly, Chassis, Storage, Memory.
#542 (1050/1060) #918 (1110) added PrettyName for Processors, Assembly, Chassis, Storage but not PowerSupplies/Fan. I believe this was due to not needed at the time. #1111 added PrettyName for Dimm.
Fixes 668395
No upstream here, https://jsw.ibm.com/browse/PFEBMC-2871 tracks getting prettyname upstream
Tested:
Before
"Name": "Power Supply",and
"Name": "Fan",After:
"Name": "powersupply0",and
"Name": "fan1",