Improve SCSI controller mapping

Signed-off-by: Volker Theile <[email protected]>

Author: votdev

pkg/source/vmware/client.go

@@ -496,22 +496,39 @@ func mapNetworkCards(networkCards []networkInfo, mapping []migration.NetworkMapp
 }
 
 // detectBusType tries to identify the disk bus type from VMware to attempt and
-// set correct bus types in kubevirt.
+// set correct bus types in KubeVirt.
 // Examples:
-// .-----------------------------------------------.
-// | Bus  | Device ID                              |
-// |------|----------------------------------------|
-// | SCSI | /vm-13010/ParaVirtualSCSIController0:0 |
-// | SATA | /vm-13767/VirtualAHCIController0:1     |
-// | IDE  | /vm-5678/VirtualIDEController1:0       |
-// | NVMe | /vm-2468/VirtualNVMEController0:0      |
-// | USB  | /vm-54321/VirtualUSBController0:0      |
-// '-----------------------------------------------'
+// .--------------------------------------------------.
+// | Bus  | Device ID                                 |
+// |------|-------------------------------------------|
+// | SCSI | /vm-13010/ParaVirtualSCSIController0:0    |
+// | SCSI | /vm-13011/VirtualBusLogicController0:0    |
+// | SCSI | /vm-13012/VirtualLsiLogicController0:0    |
+// | SCSI | /vm-13013/VirtualLsiLogicSASController0:0 |
+// | SATA | /vm-13767/VirtualAHCIController0:1        |
+// | IDE  | /vm-5678/VirtualIDEController1:0          |
+// | NVMe | /vm-2468/VirtualNVMEController0:0         |
+// | USB  | /vm-54321/VirtualUSBController0:0         |
+// '--------------------------------------------------'
+// References:
+// - https://github.com/vmware/pyvmomi/tree/master/pyVmomi/vim/vm/device
+// - https://vdc-download.vmware.com/vmwb-repository/dcr-public/d1902b0e-d479-46bf-8ac9-cee0e31e8ec0/07ce8dbd-db48-4261-9b8f-c6d3ad8ba472/vim.vm.device.VirtualSCSIController.html
+// - https://libvirt.org/formatdomain.html#controllers
+// - https://kubevirt.io/api-reference/v1.1.0/definitions.html#_v1_disktarget
 func detectBusType(deviceID string) kubevirt.DiskBus {
 	deviceID = strings.ToLower(deviceID)
-	// https://kubevirt.io/api-reference/v1.1.0/definitions.html#_v1_disktarget
 	switch {
-	case strings.Contains(deviceID, "scsi"):
+	case strings.Contains(deviceID, "paravirtualscsi"):
+		// The pvscsi (Paravirtual SCSI) controller cannot be mapped to
+		// SCSI bus type because in KubeVirt it is not possible to specify
+		// the exact model (pvscsi, lsilogic, ...) of the disk via the
+		// VirtualMachine API. Attempting to map pvscsi to SCSI prevents
+		// the VM from booting.
+		// As a workaround, the SATA bus type is utilized in such case.
+		// Note, VirtIO would be better, but it is not said that the
+		// required drivers are installed in the VM.
+		return kubevirt.DiskBusSATA
+	case strings.Contains(deviceID, "scsi"), strings.Contains(deviceID, "buslogic"), strings.Contains(deviceID, "lsilogic"):
 		return kubevirt.DiskBusSCSI
 	case strings.Contains(deviceID, "ahci"), strings.Contains(deviceID, "sata"), strings.Contains(deviceID, "ide"):
 		return kubevirt.DiskBusSATA

pkg/source/vmware/client_test.go

@@ -314,8 +314,23 @@ func Test_adapterType(t *testing.T) {
 		expected kubevirt.DiskBus
 	}{
 		{
-			desc:     "SCSI disk",
+			desc:     "SCSI disk - VMware Paravirtual",
 			deviceID: "/vm-13010/ParaVirtualSCSIController0:0",
+			expected: kubevirt.DiskBusSATA,
+		},
+		{
+			desc:     "SCSI disk - BusLogic Parallel",
+			deviceID: "/vm-13011/VirtualBusLogicController0:0",
+			expected: kubevirt.DiskBusSCSI,
+		},
+		{
+			desc:     "SCSI disk - LSI Logic Parallel",
+			deviceID: "/vm-13012/VirtualLsiLogicController0:0",
+			expected: kubevirt.DiskBusSCSI,
+		},
+		{
+			desc:     "SCSI disk - LSI Logic SAS",
+			deviceID: "/vm-13013/VirtualLsiLogicSASController0:0",
 			expected: kubevirt.DiskBusSCSI,
 		},
 		{