Validate device path in agent rootDeviceHints

Author: zaneb

pkg/asset/agent/agentconfig/agent_config.go

@@ -13,6 +13,7 @@ import (
 	"github.com/openshift/installer/pkg/asset"
 	"github.com/openshift/installer/pkg/types/agent"
 	"github.com/openshift/installer/pkg/types/agent/conversion"
+	"github.com/openshift/installer/pkg/types/baremetal/validation"
 	"github.com/openshift/installer/pkg/validate"
 )
 
@@ -247,15 +248,16 @@ func (a *AgentConfig) validateHostInterfaces(hostPath *field.Path, host agent.Ho
 }
 
 func (a *AgentConfig) validateHostRootDeviceHints(hostPath *field.Path, host agent.Host) field.ErrorList {
-	var allErrs field.ErrorList
+	rdhPath := hostPath.Child("rootDeviceHints")
+	allErrs := validation.ValidateHostRootDeviceHints(&host.RootDeviceHints, rdhPath)
 
 	if host.RootDeviceHints.WWNWithExtension != "" {
 		allErrs = append(allErrs, field.Forbidden(
-			hostPath.Child("RootDeviceHints", "WWNWithExtension"), "WWN extensions are not supported in root device hints"))
+			rdhPath.Child("wwnWithExtension"), "WWN extensions are not supported in root device hints"))
 	}
 
 	if host.RootDeviceHints.WWNVendorExtension != "" {
-		allErrs = append(allErrs, field.Forbidden(hostPath.Child("RootDeviceHints", "WWNVendorExtension"), "WWN vendor extensions are not supported in root device hints"))
+		allErrs = append(allErrs, field.Forbidden(rdhPath.Child("wwnVendorExtension"), "WWN vendor extensions are not supported in root device hints"))
 	}
 
 	return allErrs

pkg/asset/agent/agentconfig/agent_config_test.go

@@ -152,6 +152,24 @@ hosts:
 			expectedFound: false,
 			expectedError: "invalid Agent Config configuration: Hosts[0].Interfaces[0].macAddress: Required value: each interface must have a MAC address defined",
 		},
+		{
+			name: "unsupported device name root device hint",
+			data: `
+apiVersion: v1beta1
+metadata:
+  name: agent-config-cluster0
+rendezvousIP: 192.168.111.80
+hosts:
+  - hostname: control-0.example.org
+    interfaces:
+      - name: enp2s0
+        macAddress: 98:af:65:a5:8d:01
+    rootDeviceHints:
+      deviceName: "/dev/disk/by-id/wwn-0x600508e000000000ce506dc50ab0ad05"`,
+
+			expectedFound: false,
+			expectedError: "invalid Agent Config configuration: Hosts[0].rootDeviceHints.deviceName: Invalid value: \"/dev/disk/by-id/wwn-0x600508e000000000ce506dc50ab0ad05\": Device Name of root device hint must be path in /dev/ or /dev/disk/by-path/",
+		},
 		{
 			name: "unsupported wwn extension root device hint",
 			data: `
@@ -168,7 +186,7 @@ hosts:
       wwnWithExtension: "wwn-with-extension-value"`,
 
 			expectedFound: false,
-			expectedError: "invalid Agent Config configuration: Hosts[0].RootDeviceHints.WWNWithExtension: Forbidden: WWN extensions are not supported in root device hints",
+			expectedError: "invalid Agent Config configuration: Hosts[0].rootDeviceHints.wwnWithExtension: Forbidden: WWN extensions are not supported in root device hints",
 		},
 		{
 			name: "unsupported wwn vendor extension root device hint",
@@ -186,7 +204,7 @@ hosts:
       wwnVendorExtension: "wwn-with-vendor-extension-value"`,
 
 			expectedFound: false,
-			expectedError: "invalid Agent Config configuration: Hosts[0].RootDeviceHints.WWNVendorExtension: Forbidden: WWN vendor extensions are not supported in root device hints",
+			expectedError: "invalid Agent Config configuration: Hosts[0].rootDeviceHints.wwnVendorExtension: Forbidden: WWN vendor extensions are not supported in root device hints",
 		},
 		{
 			name: "node-hostname-and-role-are-not-required",