Add logic for identifying device path on VMware

Author: Pearl1594

pkg/mount/mount.go

@@ -115,22 +115,23 @@ func (m *mounter) GetDevicePath(ctx context.Context, volumeID string) (string, e
 
 func (m *mounter) getDevicePathBySerialID(volumeID string) (string, error) {
 	// First try XenServer device paths
-	for i := 'b'; i <= 'z'; i++ {
-		devicePath := fmt.Sprintf("/dev/xvd%c", i)
-		fmt.Printf("Checking XenServer device path: %s\n", devicePath)
-
-		if _, err := os.Stat(devicePath); err == nil {
-			isBlock, err := m.IsBlockDevice(devicePath)
-			if err == nil && isBlock {
-				if m.verifyXenServerDevice(devicePath, volumeID) {
-					fmt.Printf("Found and verified XenServer device: %s\n", devicePath)
-					return devicePath, nil
-				}
-			}
-		}
+	xenDevicePath, err := m.getDevicePathForXenServer(volumeID)
+	if err != nil {
+		fmt.Printf("Failed to get VMware device path: %v\n", err)
+	}
+	if xenDevicePath != "" {
+		return xenDevicePath, nil
 	}
 
-	// Fall back to standard device paths
+	// Try VMware device paths
+	vmwareDevicePath, err := m.getDevicePathForVMware(volumeID)
+	if err != nil {
+		fmt.Printf("Failed to get VMware device path: %v\n", err)
+	}
+	if vmwareDevicePath != "" {
+		return vmwareDevicePath, nil
+	}
+	// Fall back to standard device paths (for KVM)
 	sourcePathPrefixes := []string{"virtio-", "scsi-", "scsi-0QEMU_QEMU_HARDDISK_"}
 	serial := diskUUIDToSerial(volumeID)
 	fmt.Printf("Searching for device with serial: %s\n", serial)
@@ -150,6 +151,24 @@ func (m *mounter) getDevicePathBySerialID(volumeID string) (string, error) {
 	return "", nil
 }
 
+func (m *mounter) getDevicePathForXenServer(volumeID string) (string, error) {
+	for i := 'b'; i <= 'z'; i++ {
+		devicePath := fmt.Sprintf("/dev/xvd%c", i)
+		fmt.Printf("Checking XenServer device path: %s\n", devicePath)
+
+		if _, err := os.Stat(devicePath); err == nil {
+			isBlock, err := m.IsBlockDevice(devicePath)
+			if err == nil && isBlock {
+				if m.verifyXenServerDevice(devicePath, volumeID) {
+					fmt.Printf("Found and verified XenServer device: %s\n", devicePath)
+					return devicePath, nil
+				}
+			}
+		}
+	}
+	return "", fmt.Errorf("device not found for volume %s", volumeID)
+}
+
 func (m *mounter) verifyXenServerDevice(devicePath string, volumeID string) bool {
 	size, err := m.GetBlockSizeBytes(devicePath)
 	if err != nil {
@@ -372,3 +391,51 @@ func (m *mounter) Unpublish(path string) error {
 func (m *mounter) Unstage(path string) error {
 	return mount.CleanupMountPoint(path, m, true)
 }
+
+func (m *mounter) getDevicePathForVMware(volumeID string) (string, error) {
+	// Loop through /dev/sdb to /dev/sdz (/dev/sda -> the root disk)
+	for i := 'b'; i <= 'z'; i++ {
+		devicePath := fmt.Sprintf("/dev/sd%c", i)
+		fmt.Printf("Checking VMware device path: %s\n", devicePath)
+
+		if _, err := os.Stat(devicePath); err == nil {
+			isBlock, err := m.IsBlockDevice(devicePath)
+			if err == nil && isBlock {
+				// Use the same verification as for XenServer
+				if m.verifyVMwareDevice(devicePath, volumeID) {
+					fmt.Printf("Found and verified VMware device: %s\n", devicePath)
+					return devicePath, nil
+				}
+			}
+		}
+	}
+	return "", fmt.Errorf("device not found for volume %s", volumeID)
+}
+
+func (m *mounter) verifyVMwareDevice(devicePath string, volumeID string) bool {
+	size, err := m.GetBlockSizeBytes(devicePath)
+	if err != nil {
+		fmt.Printf("Failed to get device size: %v\n", err)
+		return false
+	}
+	fmt.Printf("Device size: %d bytes\n", size)
+
+	mounted, err := m.isDeviceMounted(devicePath)
+	if err != nil {
+		fmt.Printf("Failed to check if device is mounted: %v\n", err)
+		return false
+	}
+	if mounted {
+		fmt.Printf("Device is already mounted: %s\n", devicePath)
+		return false
+	}
+
+	props, err := m.getDeviceProperties(devicePath)
+	if err != nil {
+		fmt.Printf("Failed to get device properties: %v\n", err)
+		return false
+	}
+	fmt.Printf("Device properties: %v\n", props)
+
+	return true
+}