fix(region): optional vcpu when change vm config (#18825)

yunionio · Nov 30, 2023 · 127711a · 127711a
1 parent a5c5f4f
commit 127711a
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/pkg/apis/compute/guests.go b/pkg/apis/compute/guests.go
@@ -771,7 +771,7 @@ type ServerChangeConfigInput struct {
 	// cpu卡槽数
 	CpuSockets *int `json:"cpu_sockets"`
 	// cpu大小
-	VcpuCount int `json:"vcpu_count"`
+	VcpuCount *int `json:"vcpu_count"`
 	// 内存大小, 1024M, 1G
 	VmemSize string `json:"vmem_size"`
 

diff --git a/pkg/compute/models/guest_actions.go b/pkg/compute/models/guest_actions.go
@@ -2731,10 +2731,10 @@ func (self *SGuest) PerformChangeConfig(ctx context.Context, userCred mcclient.T
 			}
 		}
 	} else {
-		if input.VcpuCount != self.VcpuCount {
+		if input.VcpuCount != nil && *input.VcpuCount != self.VcpuCount {
 			cpuChanged = true
-			addCpu = input.VcpuCount - self.VcpuCount
-			confs.Add(jsonutils.NewInt(int64(input.VcpuCount)), "vcpu_count")
+			addCpu = *input.VcpuCount - self.VcpuCount
+			confs.Add(jsonutils.NewInt(int64(*input.VcpuCount)), "vcpu_count")
 		}
 		if len(input.VmemSize) > 0 {
 			if !regutils.MatchSize(input.VmemSize) {

diff --git a/pkg/mcclient/cloudpods/instance.go b/pkg/mcclient/cloudpods/instance.go
@@ -293,7 +293,7 @@ func (self *SInstance) DeployVM(ctx context.Context, name string, username strin
 func (self *SInstance) ChangeConfig(ctx context.Context, opts *cloudprovider.SManagedVMChangeConfig) error {
 	input := api.ServerChangeConfigInput{}
 	input.VmemSize = fmt.Sprintf("%dM", opts.MemoryMB)
-	input.VcpuCount = opts.Cpu
+	input.VcpuCount = &opts.Cpu
 	input.InstanceType = opts.InstanceType
 	_, err := self.host.zone.region.perform(&modules.Servers, self.Id, "change-config", input)
 	return err