Skip to content
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

allow dash "-" in resource name #481

Merged
merged 1 commit into from
May 8, 2023
Merged

allow dash "-" in resource name #481

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 cmd/sriovdp/manager_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ var _ = Describe("Resource manager", func() {
}
err = os.WriteFile("/tmp/sriovdp/test_config", []byte(`{
"resourceList": [{
"resourceName": "invalid-name",
"resourceName": "invalid.name",
"selectors": {
"isRdma": false,
"vendors": ["8086"],
Expand Down
2 changes: 1 addition & 1 deletion pkg/utils/utils.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -273,7 +273,7 @@ func SriovConfigured(addr string) bool {
// ValidResourceName returns true if it contains permitted characters otherwise false
func ValidResourceName(name string) bool {
// name regex
var validString = regexp.MustCompile(`^[a-zA-Z0-9_]+$`)
var validString = regexp.MustCompile(`^[a-zA-Z0-9_-]+$`)
return validString.MatchString(name)
}

Expand Down
4 changes: 2 additions & 2 deletions pkg/utils/utils_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -296,8 +296,8 @@ var _ = Describe("In the utils package", func() {
func(name string, expected bool) {
Expect(ValidResourceName(name)).To(Equal(expected))
},
Entry("resource name is valid", "sriov_net_0", true),
Entry("resource name is invalid", "junk-net-0", false),
Entry("resource name is valid", "sriov-net_0", true),
Entry("resource name is invalid", "junk.net.0", false),
)

DescribeTable("getting VFIO device file",
Expand Down