From ead18eae11bf8c48aa506f4ffa940579f15e380b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B1=88=E8=BD=A9?= Date: Wed, 4 Sep 2024 10:44:38 +0800 Subject: [PATCH] fix(region): disk update disk type (#21161) --- cmd/climc/shell/compute/disks.go | 2 +- pkg/compute/models/disks.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cmd/climc/shell/compute/disks.go b/cmd/climc/shell/compute/disks.go index 1b8f02e02c..d3423b2edc 100644 --- a/cmd/climc/shell/compute/disks.go +++ b/cmd/climc/shell/compute/disks.go @@ -174,7 +174,7 @@ func init() { Desc string `help:"Description" metavar:"DESCRIPTION"` AutoDelete string `help:"enable/disable auto delete of disk" choices:"enable|disable"` AutoSnapshot string `help:"enable/disable auto snapshot of disk" choices:"enable|disable"` - DiskType string `help:"Disk type" choices:"data|volume"` + DiskType string `help:"Disk type" choices:"data|volume|sys"` IsSsd *bool `help:"mark disk as ssd" negative:"no-is-ssd"` } R(&DiskUpdateOptions{}, "disk-update", "Update property of a virtual disk", func(s *mcclient.ClientSession, args *DiskUpdateOptions) error { diff --git a/pkg/compute/models/disks.go b/pkg/compute/models/disks.go index 9abdb1ec2e..cea88d953a 100644 --- a/pkg/compute/models/disks.go +++ b/pkg/compute/models/disks.go @@ -425,7 +425,7 @@ func (self *SDisk) ValidateUpdateData(ctx context.Context, userCred mcclient.Tok var err error if input.DiskType != "" { - if !utils.IsInStringArray(input.DiskType, []string{api.DISK_TYPE_DATA, api.DISK_TYPE_VOLUME}) { + if !utils.IsInStringArray(input.DiskType, []string{api.DISK_TYPE_DATA, api.DISK_TYPE_VOLUME, api.DISK_TYPE_SYS}) { return input, httperrors.NewInputParameterError("not support update disk_type %s", input.DiskType) } }