Skip to content

fix NIC data parsing for report #392

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
harp-intel merged 2 commits into from
Jun 26, 2025
Merged

fix NIC data parsing for report #392

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
09b2354
fix NIC data parsing for report
harp-intel Jun 26, 2025
9437fbb
refactor
harp-intel Jun 26, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 25 additions & 17 deletions internal/report/table_helpers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1361,27 +1361,35 @@ func parseNicInfo(scriptOutput string) []nicInfo {
continue
}
var nic nicInfo
// Map of prefixes to field pointers
fieldMap := map[string]*string{
Comment thread
harp-intel marked this conversation as resolved.
"Interface: ": &nic.Name,
"Vendor: ": &nic.Vendor,
"Vendor ID: ": &nic.VendorID,
"Model: ": &nic.Model,
"Model ID: ": &nic.ModelID,
"Speed: ": &nic.Speed,
"Link detected: ": &nic.Link,
"bus-info: ": &nic.Bus,
"driver: ": &nic.Driver,
"version: ": &nic.DriverVersion,
"firmware-version: ": &nic.FirmwareVersion,
"MAC Address: ": &nic.MACAddress,
"NUMA Node: ": &nic.NUMANode,
"CPU Affinity: ": &nic.CPUAffinity,
"IRQ Balance: ": &nic.IRQBalance,
}
for line := range strings.SplitSeq(nicOutput, "\n") {
Comment thread
harp-intel marked this conversation as resolved.
line = strings.TrimSpace(line)
nic.Name, _ = strings.CutPrefix(line, "Interface: ")
nic.Vendor, _ = strings.CutPrefix(line, "Vendor: ")
nic.VendorID, _ = strings.CutPrefix(line, "Vendor ID: ")
if strings.HasPrefix(line, "Model: ") {
// sometimes the model name has additional information in parentheses, we want to keep only the model name
nic.Model = strings.TrimSpace(strings.TrimPrefix(strings.Split(line, "(")[0], "Model: "))
for prefix, fieldPtr := range fieldMap {
if after, ok := strings.CutPrefix(line, prefix); ok {
*fieldPtr = after
break
}
}
nic.ModelID, _ = strings.CutPrefix(line, "Model ID: ")
nic.Speed, _ = strings.CutPrefix(line, "Speed: ")
nic.Link, _ = strings.CutPrefix(line, "Link detected: ")
nic.Bus, _ = strings.CutPrefix(line, "bus-info: ")
nic.Driver, _ = strings.CutPrefix(line, "driver: ")
nic.DriverVersion, _ = strings.CutPrefix(line, "version: ")
nic.FirmwareVersion, _ = strings.CutPrefix(line, "firmware-version: ")
nic.MACAddress, _ = strings.CutPrefix(line, "MAC Address: ")
nic.NUMANode, _ = strings.CutPrefix(line, "NUMA Node: ")
nic.CPUAffinity, _ = strings.CutPrefix(line, "CPU Affinity: ")
nic.IRQBalance, _ = strings.CutPrefix(line, "IRQ Balance: ")
}
// special case for model as it sometimes has additional information in parentheses
nic.Model = strings.TrimSpace(strings.Split(nic.Model, "(")[0])
nics = append(nics, nic)
}
return nics
Expand Down