bridge: add support for setting vlans as pvid and untagged #936
Conversation
bersoare
force-pushed
the
bridge_pvid_untagged
branch
2 times, most recently
from
071c396
to
e46d811
Compare
plugins/main/bridge/bridge.go
Outdated
| @@ -56,6 +56,8 @@ type NetConf struct { | |||
| HairpinMode bool `json:"hairpinMode"` | |||
| PromiscMode bool `json:"promiscMode"` | |||
| Vlan int `json:"vlan"` | |||
| PVID int `json:"pvid,omitempty"` | |||
| UntaggedIDs []int `json:"untaggedIDs,omitempty"` | |||
There was a problem hiding this comment.
How about to use VlanTrunk to specify range for untagged, to support range as { "minID": 101, "maxID": 110 }?
(but I'm not quite sure that it provides better userbility yet but at least, we provide consistent UI between vlanTrunk and untaggedIDs...)
plugins/main/bridge/bridge.go
Outdated
| @@ -391,7 +403,7 @@ func ensureVlanInterface(br *netlink.Bridge, vlanID int, preserveDefaultVlan boo | |||
| return nil, fmt.Errorf("faild to find host namespace: %v", err) | |||
| } | |||
|
|
|||
| _, brGatewayIface, err := setupVeth(hostNS, br, name, br.MTU, false, vlanID, nil, preserveDefaultVlan, "") | |||
| _, brGatewayIface, err := setupVeth(hostNS, br, name, br.MTU, false, vlanID, trunkConfig{allowedVlans: nil}, preserveDefaultVlan, "") | |||
There was a problem hiding this comment.
trunkConfig{allowedVlans: nil} can be changed as trunkConfig{}
$ cat test.go
package main
import "fmt"
type trunkConfig struct {
pvid int
untaggedVids map[int]struct{}
allowedVlans []int
}
func main() {
fmt.Printf("%v\n", trunkConfig{}.allowedVlans)
}
$ go run test.go
[]
This PR adds support for specifying a PVID and untagged vlans for a trunk. Added new checks for the presence of these attributes in the tests, as well as a new test case that uses the newly introduced values. Signed-off-by: Bernardo Soares <bsoares.it@gmail.com>
bersoare
force-pushed
the
bridge_pvid_untagged
branch
from
e46d811
to
0f66395
Compare
|
hello @s1061123 , thanks for the suggestions, indeed changing it to be a []VlanTrunk makes sense to keep it consistent. thank you! |
|
@bersoare sorry but let me ask you why the PR close? I suppose the almost design seems to be reasonable. Currently CNI community focus on new CNI spec hence we don't have time to review PRs yet, but I'd like to push this PR.... |
This PR adds support for specifying a PVID and untagged vlans for a trunk. Added new checks for the presence of these attributes in the tests, as well as a new test case that uses the newly introduced values.