Skip to content

Skip Motherboard serial if set to 'empty' #1371

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

Open
jdburton wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Skip Motherboard serial if set to 'empty' #1371

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion src/scanners/machine_uuid_scanner.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ var (
FailureUUID = strfmt.UUID("deaddead-dead-dead-dead-deaddeaddead")
)

var unknownSerialCases = []string{"", util.UNKNOWN, "none", "(none)", "-",
var unknownSerialCases = []string{"", util.UNKNOWN, "none", "(none)", "-", "empty",
SerialUnspecifiedBaseBoardString, SerialUnspecifiedSystemString,
SerialDefaultString, SerialNotSpecified, strings.ToLower(SerialProliantGen11)}
var unknownUuidCases = []string{"", util.UNKNOWN, ZeroesUUID, KaloomUUID}
Expand Down
6 changes: 6 additions & 0 deletions src/scanners/machine_uuid_scanner_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,12 @@ var _ = Describe("Machine uuid test", func() {
id := ReadId(serialDiscovery, dependencies)
Expect(id).To(Equal(toUUID("856f4f9c-3c08-4d97-8ec7-ea0ad7d4cadf")))
})
It("empty string serial", func() {
serialDiscovery.On("Baseboard").Return(&ghw.BaseboardInfo{SerialNumber: "empty"}, nil).Once()
serialDiscovery.On("Product").Return(&ghw.ProductInfo{UUID: TestUuid}, nil)
id := ReadId(serialDiscovery, dependencies)
Expect(id).To(Equal(toUUID(TestUuid)))
})

tests := []struct {
useCase string
Expand Down