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

Correct macvlan mode names #1284

Merged
merged 2 commits into from
Oct 4, 2024
Merged

Correct macvlan mode names #1284

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
eb3b8e6
doc: Correct name of macvlan modes
stgraber Oct 3, 2024
e1e902e
incusd/device/nic: Correct name of macvlan modes
stgraber Oct 3, 2024
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 doc/reference/devices_nic.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ Key | Type | Default | Managed | Description
`boot.priority` | integer | - | no | Boot priority for VMs (higher value boots first)
`gvrp` | bool | `false` | no | Register VLAN using GARP VLAN Registration Protocol
`hwaddr` | string | randomly assigned | no | The MAC address of the new interface
`mode` | string | `bridge` | no | Macvlan mode (one of `bridge`, `vepa`, `passthrough` or `private`)
`mode` | string | `bridge` | no | Macvlan mode (one of `bridge`, `vepa`, `passthru` or `private`)
`mtu` | integer | parent MTU | yes | The MTU of the new interface
`name` | string | kernel assigned | no | The name of the interface inside the instance
`network` | string | - | no | The managed network to link the device to (instead of specifying the `nictype` directly)
Expand Down
2 changes: 1 addition & 1 deletion internal/server/device/nic.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ func nicValidationRules(requiredFields []string, optionalFields []string, instCo
"security.acls.default.ingress.logged": validate.Optional(validate.IsBool),
"security.acls.default.egress.logged": validate.Optional(validate.IsBool),
"security.promiscuous": validate.Optional(validate.IsBool),
"mode": validate.Optional(validate.IsOneOf("bridge", "vepa", "passthrough", "private")),
"mode": validate.Optional(validate.IsOneOf("bridge", "vepa", "passthru", "private")),
}

validators := map[string]func(value string) error{}
Expand Down
Loading