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

Jump to bottom

Fix checks for vlan parameters #281

Merged
merged 1 commit into from
Oct 8, 2023
Merged

Fix checks for vlan parameters #281

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
14 changes: 10 additions & 4 deletions pkg/config/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,10 +79,6 @@ func LoadConf(bytes []byte) (*sriovtypes.NetConf, error) {
return nil, fmt.Errorf("LoadConf(): vlan id %d invalid: value must be in the range 0-4094", *n.Vlan)
}

if *n.Vlan == 0 && (n.VlanQoS != nil || n.VlanProto != nil) {
return nil, fmt.Errorf("LoadConf(): non-zero vlan id must be configured to set vlan Qos and/or Proto")
}

if n.VlanQoS == nil {
qos := 0
n.VlanQoS = &qos
Expand All @@ -93,6 +89,11 @@ func LoadConf(bytes []byte) (*sriovtypes.NetConf, error) {
return nil, fmt.Errorf("LoadConf(): vlan QoS PCP %d invalid: value must be in the range 0-7", *n.VlanQoS)
}

// validate non-zero value for vlan id if vlan qos is set to a non-zero value
if *n.VlanQoS != 0 && *n.Vlan == 0 {
return nil, fmt.Errorf("LoadConf(): non-zero vlan id must be configured to set vlan QoS to a non-zero value")
}

if n.VlanProto == nil {
proto := sriovtypes.Proto8021q
n.VlanProto = &proto
Expand All @@ -103,6 +104,11 @@ func LoadConf(bytes []byte) (*sriovtypes.NetConf, error) {
return nil, fmt.Errorf("LoadConf(): vlan Proto %s invalid: value must be '802.1Q' or '802.1ad'", *n.VlanProto)
}

// validate non-zero value for vlan id if vlan proto is set to 802.1ad
if *n.VlanProto == sriovtypes.Proto8021ad && *n.Vlan == 0 {
return nil, fmt.Errorf("LoadConf(): non-zero vlan id must be configured to set vlan proto 802.1ad")
}

// validate that link state is one of supported values
if n.LinkState != "" && n.LinkState != "auto" && n.LinkState != "enable" && n.LinkState != "disable" {
return nil, fmt.Errorf("LoadConf(): invalid link_state value: %s", n.LinkState)
Expand Down
10 changes: 6 additions & 4 deletions pkg/config/config_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@ var _ = Describe("Config", func() {
zeroVlanID := 0
invalidVlanID := 5000
validQoS := 1
zeroQoS := 0
invalidQoS := 10
valid8021qProto := "802.1Q"
valid8021adProto := "802.1ad"
Expand Down Expand Up @@ -108,14 +109,15 @@ var _ = Describe("Config", func() {
},
Entry("valid vlan ID", &validVlanID, nil, nil, false),
Entry("invalid vlan ID", &invalidVlanID, nil, nil, true),
Entry("vlan ID equal to zero and QoS set", &zeroVlanID, &validQoS, nil, true),
Entry("vlan ID equal to zero and Proto set", &zeroVlanID, nil, &valid8021qProto, true),
Entry("vlan ID equal to zero and non-zero QoS set", &zeroVlanID, &validQoS, nil, true),
Entry("vlan ID equal to zero and 802.1ad Proto set", &zeroVlanID, nil, &valid8021adProto, true),
Entry("invalid QoS", &validVlanID, &invalidQoS, nil, true),
Entry("invalid Proto", &validVlanID, nil, &invalidProto, true),
Entry("valid 802.1q Proto", &validVlanID, nil, &valid8021qProto, false),
Entry("valid 802.1ad Proto", &validVlanID, nil, &valid8021adProto, false),
Entry("no vlan ID and QoS set", nil, &validQoS, nil, true),
Entry("no vlan ID and Proto set", nil, nil, &valid8021adProto, true),
Entry("no vlan ID and non-zero QoS set", nil, &validQoS, nil, true),
Entry("no vlan ID and 802.1ad Proto set", nil, nil, &valid8021adProto, true),
Entry("default values for vlan, qos and proto", &zeroVlanID, &zeroQoS, &valid8021qProto, false),
)

It("Assuming device is allocated", func() {
Expand Down
Loading