fix(region): add device for disk (#23690)

Author: ioito

go.mod

@@ -98,7 +98,7 @@ require (
 	k8s.io/cri-api v0.28.15
 	k8s.io/klog/v2 v2.20.0
 	moul.io/http2curl/v2 v2.3.0
-	yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20251031063556-cfcc66d60507
+	yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20251105060645-39907b8eac4a
 	yunion.io/x/executor v0.0.0-20250518005516-5402e9e0bed0
 	yunion.io/x/jsonutils v1.0.1-0.20250507052344-1abcf4f443b1
 	yunion.io/x/log v1.0.1-0.20240305175729-7cf2d6cd5a91

go.sum

@@ -1470,8 +1470,8 @@ sigs.k8s.io/structured-merge-diff/v4 v4.0.1/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK
 sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o=
 sigs.k8s.io/yaml v1.2.0 h1:kr/MCeFWJWTwyaHoR9c8EjH9OumOmoF9YGiZd7lFm/Q=
 sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc=
-yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20251031063556-cfcc66d60507 h1:g0nP+pDPhwH9wgQDtwIcW/u+3lBzIkqQE8qwPpGLi1g=
-yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20251031063556-cfcc66d60507/go.mod h1:MeA5UnvNhLXMvy+xPMOzRqjWMWMkZ3QXZP0u1bYEM0M=
+yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20251105060645-39907b8eac4a h1:BtmF6BX/yZfULtJ7pRdMS6wYz5noZTYloBbQ0/5vWPI=
+yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20251105060645-39907b8eac4a/go.mod h1:MeA5UnvNhLXMvy+xPMOzRqjWMWMkZ3QXZP0u1bYEM0M=
 yunion.io/x/executor v0.0.0-20250518005516-5402e9e0bed0 h1:msG4SiDSVU7CrXH06WuHlNEZXIooTcmNbfrIGHuIHBU=
 yunion.io/x/executor v0.0.0-20250518005516-5402e9e0bed0/go.mod h1:Uxuou9WQIeJXNpy7t2fPLL0BYLvLiMvGQwY7Qc6aSws=
 yunion.io/x/jsonutils v0.0.0-20190625054549-a964e1e8a051/go.mod h1:4N0/RVzsYL3kH3WE/H1BjUQdFiWu50JGCFQuuy+Z634=

pkg/compute/guestdrivers/managedvirtual.go

@@ -459,6 +459,12 @@ func (drv *SManagedVirtualizedGuestDriver) RequestAttachDisk(ctx context.Context
 					if err != nil {
 						return false, errors.Wrapf(err, "RequestAttachDisk.iVM.WaitStatus")
 					}
+					if device := iDisks[i].GetDeviceName(); len(device) > 0 {
+						db.Update(disk, func() error {
+							disk.Device = device
+							return nil
+						})
+					}
 
 					return true, nil
 				}
@@ -1226,6 +1232,7 @@ func (drv *SManagedVirtualizedGuestDriver) OnGuestDeployTaskDataReceived(ctx con
 				disk.ExternalId = diskInfo[i].Uuid
 				disk.DiskType = diskInfo[i].DiskType
 				disk.Status = api.DISK_READY
+				disk.Device = diskInfo[i].Device
 
 				disk.FsFormat = diskInfo[i].FsFromat
 				if diskInfo[i].AutoDelete {

pkg/compute/guestdrivers/utils.go

@@ -41,6 +41,7 @@ type SDiskInfo struct {
 	CacheMode         string
 	ExpiredAt         time.Time
 	StorageExternalId string
+	Device            string
 
 	Metadata map[string]string
 }
@@ -97,6 +98,7 @@ func fetchIVMinfo(desc cloudprovider.SManagedVMCreateConfig, iVM cloudprovider.I
 			dinfo.TemplateId = idisks[i].GetTemplateId()
 			dinfo.FsFromat = idisks[i].GetFsFormat()
 			dinfo.ExpiredAt = idisks[i].GetExpiredAt()
+			dinfo.Device = idisks[i].GetDeviceName()
 			dinfo.StorageExternalId = idisks[i].GetIStorageId()
 			diskSysTags := idisks[i].GetSysTags()
 			diskTags, _ := idisks[i].GetTags()

pkg/compute/models/disks.go

@@ -114,6 +114,9 @@ type SDisk struct {
 	// 备份Id
 	BackupId string `width:"256" charset:"ascii" nullable:"true" list:"user" json:"backup_id"`
 
+	// 设备名称
+	Device string `width:"32" charset:"ascii" nullable:"true" get:"user" list:"user"`
+
 	// 文件系统
 	FsFormat string `width:"32" charset:"ascii" nullable:"true" list:"user" json:"fs_format"`
 	// 文件系统特性
@@ -1927,6 +1930,9 @@ func (self *SDisk) syncWithCloudDisk(ctx context.Context, userCred mcclient.Toke
 		if extDisk.GetIsAutoDelete() {
 			self.AutoDelete = true
 		}
+		if device := extDisk.GetDeviceName(); len(device) > 0 {
+			self.Device = device
+		}
 		// self.TemplateId = extDisk.GetTemplateId() no sync template ID
 		if templateId := extDisk.GetTemplateId(); len(templateId) > 0 {
 			cachedImage, err := db.FetchByExternalId(CachedimageManager, templateId)
@@ -2011,6 +2017,7 @@ func (manager *SDiskManager) newFromCloudDisk(ctx context.Context, userCred mccl
 		disk.DiskType = api.DISK_TYPE_SYS
 	}
 	disk.Nonpersistent = extDisk.GetIsNonPersistent()
+	disk.Device = extDisk.GetDeviceName()
 
 	disk.IsEmulated = extDisk.IsEmulated()
 

vendor/modules.txt

@@ -2039,7 +2039,7 @@ sigs.k8s.io/structured-merge-diff/v4/value
 # sigs.k8s.io/yaml v1.2.0
 ## explicit; go 1.12
 sigs.k8s.io/yaml
-# yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20251031063556-cfcc66d60507
+# yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20251105060645-39907b8eac4a
 ## explicit; go 1.24
 yunion.io/x/cloudmux/pkg/apis
 yunion.io/x/cloudmux/pkg/apis/billing