opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-24 16:03:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: minor fixes for creating disks from exisint file (#14686)

Browse Source 
Co-authored-by: Qiu Jian <qiujian@yunionyun.com>
This commit is contained in:
Jian Qiu
2022-07-20 22:16:49 +08:00
committed by GitHub
co-authored by Qiu Jian
parent 98be503164
commit 7d79c4462f
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/compute/models/disks.go
+3 -2
View File
@@ -1844,7 +1844,7 @@ func parseDiskInfo(ctx context.Context, userCred mcclient.TokenCredential, info
// if len(diskConfig.ImageId) > 0 && diskConfig.SizeMb == 0 {
// diskConfig.SizeMb = options.Options.DefaultDiskSize // MB
// else
if len(info.ImageId) == 0 && info.SizeMb == 0 {
if len(info.ImageId) == 0 && info.SizeMb == 0 && info.ExistingPath == "" {
return nil, httperrors.NewInputParameterError("Diskinfo index %d: both imageID and size are absent", info.Index)
}
return info, nil
@@ -1991,7 +1991,8 @@ func fillDiskConfigByStorage(userCred mcclient.TokenCredential,
if storage.Status != api.STORAGE_ONLINE {
return errors.Wrap(httperrors.ErrInvalidStatus, "storage not online")
}
diskConfig.Storage = storageObj.GetId()
diskConfig.Storage = storage.Id
diskConfig.Backend = storage.StorageType
return nil
}