From 7d79c4462f42330af7e162f17e75bb442235c6bc Mon Sep 17 00:00:00 2001 From: Jian Qiu Date: Wed, 20 Jul 2022 22:16:49 +0800 Subject: [PATCH] fix: minor fixes for creating disks from exisint file (#14686) Co-authored-by: Qiu Jian --- pkg/compute/models/disks.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkg/compute/models/disks.go b/pkg/compute/models/disks.go index ad17bea169..57d46ea65a 100644 --- a/pkg/compute/models/disks.go +++ b/pkg/compute/models/disks.go @@ -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 }