Skip to content

fix: validate overlap with BCM reserved VLANs #1505

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

Draft
edipascale wants to merge 1 commit into
base: master
Choose a base branch
from
+22 −2
Draft

fix: validate overlap with BCM reserved VLANs #1505

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
11 changes: 11 additions & 0 deletions api/meta/types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,8 @@ type UserCreds struct {
SSHKeys []string `json:"sshKeys,omitempty"`
}

var BCMReservedVLANRanges = []VLANRange{{From: 3967, To: 4094}}

type FabricConfig struct {
DeploymentID string `json:"deploymentID,omitempty"`
ControlVIP string `json:"controlVIP,omitempty"`
Expand Down Expand Up @@ -260,6 +262,9 @@ func (cfg *FabricConfig) Init() (*FabricConfig, error) {
if len(r) == 0 {
return nil, errors.Errorf("config: vpcIRBVLANRange is required")
}
if err := CheckVLANRangesOverlap(append(slices.Clone(r), BCMReservedVLANRanges...)); err != nil {
return nil, errors.Wrapf(err, "config: vpcIRBVLANRange overlaps with Broadcom reserved VLAN range")
}
cfg.VPCIRBVLANRanges = r
// TODO check total ranges size and expose as limit for API validation
}
Expand All @@ -270,6 +275,9 @@ func (cfg *FabricConfig) Init() (*FabricConfig, error) {
if len(r) == 0 {
return nil, errors.Errorf("config: vpcPeeringVLANRange is required")
}
if err := CheckVLANRangesOverlap(append(slices.Clone(r), BCMReservedVLANRanges...)); err != nil {
return nil, errors.Wrapf(err, "config: vpcPeeringVLANRange overlaps with Broadcom reserved VLAN range")
}
cfg.VPCPeeringVLANRanges = r
// TODO check total ranges size and expose as limit for API validation
}
Expand All @@ -280,6 +288,9 @@ func (cfg *FabricConfig) Init() (*FabricConfig, error) {
if len(r) == 0 {
return nil, errors.Errorf("config: th5WorkaroundVLANRange is required")
}
if err := CheckVLANRangesOverlap(append(slices.Clone(r), BCMReservedVLANRanges...)); err != nil {
return nil, errors.Wrapf(err, "config: th5WorkaroundVLANRange overlaps with Broadcom reserved VLAN range")
}
cfg.TH5WorkaroundVLANRange = r
}

Expand Down
4 changes: 4 additions & 0 deletions api/wiring/v1beta1/vlannamespace_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,10 @@ func (ns *VLANNamespace) Validate(_ context.Context, _ kclient.Reader, fabricCfg
return nil, errors.Wrapf(err, "invalid ranges")
}

if err := meta.CheckVLANRangesOverlap(append(slices.Clone(meta.BCMReservedVLANRanges), ns.Spec.Ranges...)); err != nil {
return nil, errors.Wrapf(err, "ranges overlap with Broadcom reserved VLANs")
}

if fabricCfg != nil {
if err := meta.CheckVLANRangesOverlap(append(slices.Clone(fabricCfg.VPCIRBVLANRanges), ns.Spec.Ranges...)); err != nil {
return nil, errors.Wrapf(err, "ranges overlap with Fabric reserved VLANs")
Expand Down
9 changes: 7 additions & 2 deletions api/wiring/v1beta1/vlannamespace_types_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ func vlanNSGen(name string, ranges []meta.VLANRange) *wiringapi.VLANNamespace {
func TestValidate(t *testing.T) {
cfg := &meta.FabricConfig{
VPCIRBVLANRanges: []meta.VLANRange{{From: 3000, To: 3199}},
TH5WorkaroundVLANRange: []meta.VLANRange{{From: 3900, To: 3999}},
TH5WorkaroundVLANRange: []meta.VLANRange{{From: 3900, To: 3966}},
}
for _, tt := range []struct {
Comment thread
edipascale marked this conversation as resolved.
name string
Expand All @@ -56,7 +56,12 @@ func TestValidate(t *testing.T) {
},
{
name: "th5-collision",
vlanNS: vlanNSGen("ns-1", []meta.VLANRange{{From: 3500, To: 4500}}),
vlanNS: vlanNSGen("ns-1", []meta.VLANRange{{From: 3500, To: 3950}}),
err: true,
},
{
name: "bcm-reserved-collision",
vlanNS: vlanNSGen("ns-2", []meta.VLANRange{{From: 4000, To: 4050}}),
err: true,
},
{
Expand Down
Loading