Add DefaultDiskBusType field to VirtualMachineImportSpec

This allows the user to customize the disk bus type in case the auto-detection fails. Note, the OpenStack source client does not support auto-detection, thus it will always make use of the `DefaultDiskBusType` field if specified. The `DefaultDiskBusType` defaults to `virtio`.

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

Author: votdev

pkg/apis/migration.harvesterhci.io/v1beta1/virtualmachines.go

@@ -4,6 +4,7 @@ import (
 	"github.com/rancher/wrangler/pkg/condition"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/utils/ptr"
 	kubevirtv1 "kubevirt.io/api/core/v1"
 
 	"github.com/harvester/vm-import-controller/pkg/apis/common"
@@ -33,6 +34,12 @@ type VirtualMachineImportSpec struct {
 	Folder       string           `json:"folder,omitempty"`
 	Mapping      []NetworkMapping `json:"networkMapping,omitempty"` //If empty new VirtualMachineImport will be mapped to Management Network
 	StorageClass string           `json:"storageClass,omitempty"`
+
+	// The bus type that is used for imported disks if auto-detection fails.
+	// Note, the OpenStack source client does not support auto-detection,
+	// therefore it always makes use of this field if specified.
+	// Defaults to "virtio".
+	DefaultDiskBusType *kubevirtv1.DiskBus `json:"defaultDiskBusType,omitempty"`
 }
 
 // VirtualMachineImportStatus tracks the status of the VirtualMachineImport export from migration and import into the Harvester cluster
@@ -93,3 +100,7 @@ const (
 	VirtualMachineExportFailed    condition.Cond = "VMExportFailed"
 	VirtualMachineMigrationFailed ImportStatus   = "VMMigrationFailed"
 )
+
+func (in *VirtualMachineImport) GetDefaultDiskBusType() kubevirtv1.DiskBus {
+	return ptr.Deref[kubevirtv1.DiskBus](in.Spec.DefaultDiskBusType, kubevirtv1.DiskBusVirtio)
+}

pkg/source/openstack/client.go

@@ -373,7 +373,7 @@ func (c *Client) ExportVirtualMachine(vm *migration.VirtualMachineImport) error
 			Name:          rawImageFileName,
 			DiskSize:      int64(volObj.Size),
 			DiskLocalPath: server.TempDir(),
-			BusType:       kubevirt.DiskBusVirtio,
+			BusType:       vm.GetDefaultDiskBusType(),
 		})
 	}
 

pkg/source/vmware/client.go

@@ -187,7 +187,7 @@ func (c *Client) ExportVirtualMachine(vm *migration.VirtualMachineImport) (err e
 				i.Path = vm.Name + "-" + vm.Namespace + "-" + i.Path
 			}
 
-			busType := detectBusType(i.DeviceId)
+			busType := detectDiskBusType(i.DeviceId, vm.GetDefaultDiskBusType())
 
 			logrus.WithFields(logrus.Fields{
 				"name":                    vm.Name,
@@ -504,8 +504,9 @@ func mapNetworkCards(networkCards []networkInfo, mapping []migration.NetworkMapp
 	return retNetwork
 }
 
-// detectBusType tries to identify the disk bus type from VMware to attempt and
-// set correct bus types in KubeVirt.
+// detectDiskBusType tries to identify the disk bus type from VMware to attempt and
+// set correct bus types in KubeVirt. Defaults to the specified bus type in `def`
+// if auto-detection fails.
 // Examples:
 // .--------------------------------------------------.
 // | Bus  | Device ID                                 |
@@ -524,7 +525,7 @@ func mapNetworkCards(networkCards []networkInfo, mapping []migration.NetworkMapp
 // - 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 {
+func detectDiskBusType(deviceID string, def kubevirt.DiskBus) kubevirt.DiskBus {
 	deviceID = strings.ToLower(deviceID)
 	switch {
 	case strings.Contains(deviceID, "paravirtualscsi"):
@@ -546,7 +547,7 @@ func detectBusType(deviceID string) kubevirt.DiskBus {
 	case strings.Contains(deviceID, "usb"):
 		return kubevirt.DiskBusUSB
 	default:
-		return kubevirt.DiskBusVirtio
+		return def
 	}
 }
 

pkg/source/vmware/client_test.go

@@ -306,62 +306,78 @@ func Test_identifyNetworkCards(t *testing.T) {
 	assert.Len(noMappedInfo, 0, "expected to find no item in the mapped networkinfo")
 }
 
-func Test_adapterType(t *testing.T) {
+func Test_detectDiskBusType(t *testing.T) {
 	assert := require.New(t)
 	testCases := []struct {
 		desc     string
 		deviceID string
+		def      kubevirt.DiskBus
 		expected kubevirt.DiskBus
 	}{
 		{
 			desc:     "SCSI disk - VMware Paravirtual",
 			deviceID: "/vm-13010/ParaVirtualSCSIController0:0",
+			def:      kubevirt.DiskBusVirtio,
 			expected: kubevirt.DiskBusSATA,
 		},
 		{
 			desc:     "SCSI disk - BusLogic Parallel",
 			deviceID: "/vm-13011/VirtualBusLogicController0:0",
+			def:      kubevirt.DiskBusVirtio,
 			expected: kubevirt.DiskBusSCSI,
 		},
 		{
 			desc:     "SCSI disk - LSI Logic Parallel",
 			deviceID: "/vm-13012/VirtualLsiLogicController0:0",
+			def:      kubevirt.DiskBusVirtio,
 			expected: kubevirt.DiskBusSCSI,
 		},
 		{
 			desc:     "SCSI disk - LSI Logic SAS",
 			deviceID: "/vm-13013/VirtualLsiLogicSASController0:0",
+			def:      kubevirt.DiskBusVirtio,
 			expected: kubevirt.DiskBusSCSI,
 		},
 		{
 			desc:     "NVMe disk",
 			deviceID: "/vm-2468/VirtualNVMEController0:0",
+			def:      kubevirt.DiskBusVirtio,
 			expected: kubevirt.DiskBusVirtio,
 		},
 		{
 			desc:     "USB disk",
 			deviceID: "/vm-54321/VirtualUSBController0:0",
+			def:      kubevirt.DiskBusVirtio,
 			expected: kubevirt.DiskBusUSB,
 		},
 		{
 			desc:     "SATA disk",
 			deviceID: "/vm-13767/VirtualAHCIController0:1",
+			def:      kubevirt.DiskBusVirtio,
 			expected: kubevirt.DiskBusSATA,
 		},
 		{
 			desc:     "IDE disk",
 			deviceID: "/vm-5678/VirtualIDEController1:0",
+			def:      kubevirt.DiskBusVirtio,
 			expected: kubevirt.DiskBusSATA,
 		},
 		{
-			desc:     "Unknown disk",
+			desc:     "Unknown disk 1",
 			deviceID: "foo",
+			def:      kubevirt.DiskBusVirtio,
 			expected: kubevirt.DiskBusVirtio,
 		},
+		{
+			desc:     "Unknown disk 2",
+			deviceID: "bar",
+			def:      kubevirt.DiskBusSATA,
+			expected: kubevirt.DiskBusSATA,
+		},
 	}
 
 	for _, tc := range testCases {
-		busType := detectBusType(tc.deviceID)
+		busType := detectDiskBusType(tc.deviceID, tc.def)
 		assert.Equal(tc.expected, busType)
 	}
 }