Fix MTM detection for incomplete FRU pages#7398
Merged
Obihoernchen merged 3 commits intoxcat2:masterfrom Feb 19, 2024
Merged
Conversation
Obihoernchen
approved these changes
Dec 7, 2023
samveen
reviewed
Dec 9, 2023
| FRU=`ipmitool fru print 0` | ||
| if [ $? -eq 0 ]; then | ||
| MTM=`echo "$FRU" | awk -F': ' '/Product Manufacturer/ {m=$2} /Product Name|Product Part Number/ {if (n==""||n=="NONE") {n=$2}} END {print m":"n}'` | ||
| MTM=`echo "$FRU" | awk -F': ' '/Product Manufacturer/ {m=$2} /Product Name|Product Part Number/ {if (n==""||n~/ +/||n=="NONE") {n=$2}} END {print m":"n}'` |
Member
There was a problem hiding this comment.
@kcgthb Killian, how about changing ~/ +/ to ~/\s+/ to handle all whitespace?
Member
Author
There was a problem hiding this comment.
That's a good suggestion, thank you!
I've never seen a non-space whitespace character in a FRU field yet, but well, until recently and the Supermicro "AS- " line of servers, I had never seen a space either, so 🤷
samveen
approved these changes
Dec 12, 2023
samveen
approved these changes
Dec 12, 2023
samveen
approved these changes
Dec 12, 2023
Obihoernchen
approved these changes
Dec 12, 2023
This file contains hidden or 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
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.
The PR is to fix issue #7397
When FRU pages include empty fields (more precisely blank fields that are just spaces), the FRU parsing in
dodiscoveryreturns blank values.This PR makes sure that blank fields containing only spaces are ignored, so the correct field can be returned.
For instance, with the following FRU page:
the original
dodiscoveryscript returnsAnd with the fix: