fix: better testing of NetworkInterfaces so test doesn't fail

ref: #105
budimanjojo · Apr 6, 2023 · a32a621 · a32a621
1 parent 08d9308
commit a32a621
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 5 deletions.
diff --git a/pkg/config/validate/config.go b/pkg/config/validate/config.go
@@ -37,7 +37,7 @@ type Node struct {
 	DisableSearchDomain string                   `validate:"isBool"`
 	Nameservers         []string                 `validate:"isIPList"`
 	ConfigPatches       []map[string]interface{} `validate:"isRFC6902List"`
-	NetworkInterfaces   []*NetworkInterface
+	NetworkInterfaces   []*NetworkInterface      `validate:"isValidNetworkInterfaces"`
 	InstallDiskSelector *InstallDiskSelector
 	KernelModules       []*KernelModule
 	NodeLabels          map[string]string
@@ -60,9 +60,9 @@ type InstallDiskSelector struct {
 }
 
 type NetworkInterface struct {
-	Interface      string                 `validate:"requiredWithout:Nodes.[].NetworkInterfaces.DeviceSelector"`
-	DeviceSelector *NetworkDeviceSelector `validate:"requiredWithout:Nodes.[].NetworkInterfaces.Interface"`
-	Addresses      []string               `validate:"isCIDRList"`
+	Interface      string
+	DeviceSelector *NetworkDeviceSelector
+	Addresses      []string `validate:"isCIDRList"`
 	Routes         []Route
 	Bond           *Bond
 	Vlans          []*Vlan
@@ -174,5 +174,6 @@ func (c Config) Messages() map[string]string {
 		"isInt":                     "{field} is not a valid integer",
 		"isUint":                    "{field} is not a valid unsigned integer",
 		"isDomainOrIP":              "{field} is not a valid domain or IP address",
+		"isValidNetworkInterfaces":  "{field} requires one of `interface` and `deviceSelector` to be set",
 	}
 }
diff --git a/pkg/config/validate/validate_test.go b/pkg/config/validate/validate_test.go
@@ -48,7 +48,7 @@ nodes:
 		"Nodes.0.InstallDisk": false,
 		"Nodes.0.DisableSearchDomain": true,
 		"Nodes.0.Nameservers": false,
-		"Nodes.0.NetworkInterfaces.0.Interface": true,
+		"Nodes.0.NetworkInterfaces": true,
 		"Nodes.0.NetworkInterfaces.0.Addresses": true,
 		"Nodes.0.NetworkInterfaces.0.Mtu": true,
 		"Nodes.0.NetworkInterfaces.0.Routes.0.Gateway": true,

diff --git a/pkg/config/validate/validator.go b/pkg/config/validate/validator.go
@@ -93,3 +93,14 @@ func (c Config) IsDomainOrIP(domainIP string) bool {
 
 	return false
 }
+
+func (c Config) IsValidNetworkInterfaces(ifaces []*NetworkInterface) bool {
+	for _, iface := range ifaces {
+		if iface.Interface == "" && iface.DeviceSelector == nil {
+			return false
+		} else if iface.Interface != "" && iface.DeviceSelector != nil {
+			return false
+		}
+	}
+	return true
+}