Improve auto-detection of the bus type of the VMware importer

Related to: harvester/harvester#7987

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

Author: votdev

pkg/source/vmware/client.go

@@ -187,6 +187,8 @@ func (c *Client) ExportVirtualMachine(vm *migration.VirtualMachineImport) (err e
 				i.Path = vm.Name + "-" + vm.Namespace + "-" + i.Path
 			}
 
+			busType := detectBusType(i.DeviceId)
+
 			logrus.WithFields(logrus.Fields{
 				"name":                    vm.Name,
 				"namespace":               vm.Namespace,
@@ -195,6 +197,7 @@ func (c *Client) ExportVirtualMachine(vm *migration.VirtualMachineImport) (err e
 				"spec.sourceCluster.kind": vm.Spec.SourceCluster.Kind,
 				"deviceId":                i.DeviceId,
 				"path":                    i.Path,
+				"busType":                 busType,
 				"size":                    i.Size,
 			}).Info("Downloading an image")
 
@@ -206,7 +209,7 @@ func (c *Client) ExportVirtualMachine(vm *migration.VirtualMachineImport) (err e
 			vm.Status.DiskImportStatus = append(vm.Status.DiskImportStatus, migration.DiskInfo{
 				Name:     i.Path,
 				DiskSize: i.Size,
-				BusType:  adapterType(i.DeviceId),
+				BusType:  busType,
 			})
 		} else {
 			logrus.WithFields(logrus.Fields{
@@ -501,14 +504,33 @@ func mapNetworkCards(networkCards []networkInfo, mapping []migration.NetworkMapp
 	return retNetwork
 }
 
-// adapterType tries to identify the disk bus type from vmware
-// to attempt and set correct bus types in kubevirt
-// default is to switch to SATA to ensure device boots
-func adapterType(deviceID string) kubevirt.DiskBus {
-	if strings.Contains(deviceID, "SCSI") {
+// detectBusType tries to identify the disk bus type from VMware to attempt and
+// 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      |
+// '-----------------------------------------------'
+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"):
 		return kubevirt.DiskBusSCSI
+	case strings.Contains(deviceID, "ahci"), strings.Contains(deviceID, "sata"), strings.Contains(deviceID, "ide"):
+		return kubevirt.DiskBusSATA
+	case strings.Contains(deviceID, "nvme"):
+		return kubevirt.DiskBusVirtio
+	case strings.Contains(deviceID, "usb"):
+		return kubevirt.DiskBusUSB
+	default:
+		return kubevirt.DiskBusVirtio
 	}
-	return kubevirt.DiskBusSATA
 }
 
 // SanitizeVirtualMachineImport is used to sanitize the VirtualMachineImport object.

pkg/source/vmware/client_test.go

@@ -13,6 +13,7 @@ import (
 	"github.com/vmware/govmomi/vim25/mo"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	kubevirt "kubevirt.io/api/core/v1"
 
 	migration "github.com/harvester/vm-import-controller/pkg/apis/migration.harvesterhci.io/v1beta1"
 	"github.com/harvester/vm-import-controller/pkg/server"
@@ -304,3 +305,48 @@ func Test_identifyNetworkCards(t *testing.T) {
 	noMappedInfo := mapNetworkCards(networkInfo, noNetworkMapping)
 	assert.Len(noMappedInfo, 0, "expected to find no item in the mapped networkinfo")
 }
+
+func Test_adapterType(t *testing.T) {
+	assert := require.New(t)
+	testCases := []struct {
+		desc     string
+		deviceID string
+		expected kubevirt.DiskBus
+	}{
+		{
+			desc:     "SCSI disk",
+			deviceID: "/vm-13010/ParaVirtualSCSIController0:0",
+			expected: kubevirt.DiskBusSCSI,
+		},
+		{
+			desc:     "NVMe disk",
+			deviceID: "/vm-2468/VirtualNVMEController0:0",
+			expected: kubevirt.DiskBusVirtio,
+		},
+		{
+			desc:     "USB disk",
+			deviceID: "/vm-54321/VirtualUSBController0:0",
+			expected: kubevirt.DiskBusUSB,
+		},
+		{
+			desc:     "SATA disk",
+			deviceID: "/vm-13767/VirtualAHCIController0:1",
+			expected: kubevirt.DiskBusSATA,
+		},
+		{
+			desc:     "IDE disk",
+			deviceID: "/vm-5678/VirtualIDEController1:0",
+			expected: kubevirt.DiskBusSATA,
+		},
+		{
+			desc:     "Unknown disk",
+			deviceID: "foo",
+			expected: kubevirt.DiskBusVirtio,
+		},
+	}
+
+	for _, tc := range testCases {
+		busType := detectBusType(tc.deviceID)
+		assert.Equal(tc.expected, busType)
+	}
+}