Merge pull request #652 from tencentcloudstack/feature/add_cpu_for_mysql

add cpu params for mysql

Author: hellertang

tencentcloud/resource_tc_mysql_instance.go

@@ -133,6 +133,12 @@ func TencentMsyqlBasicInfo() map[string]*schema.Schema {
 			Required:    true,
 			Description: "Memory size (in MB).",
 		},
+		"cpu": {
+			Type:        schema.TypeInt,
+			Computed:    true,
+			Optional:    true,
+			Description: "CPU cores.",
+		},
 		"volume_size": {
 			Type:        schema.TypeInt,
 			Required:    true,
@@ -340,6 +346,13 @@ func mysqlAllInstanceRoleSet(ctx context.Context, requestInter interface{}, d *s
 		requestByUse.Memory = &memSize
 	}
 
+	cpu := int64(d.Get("cpu").(int))
+	if okByMonth {
+		requestByMonth.Cpu = &cpu
+	} else {
+		requestByUse.Cpu = &cpu
+	}
+
 	volumeSize := int64(d.Get("volume_size").(int))
 	if okByMonth {
 		requestByMonth.Volume = &volumeSize
@@ -692,6 +705,7 @@ func tencentMsyqlBasicInfoRead(ctx context.Context, d *schema.ResourceData, meta
 	}
 	_ = d.Set("auto_renew_flag", int(*mysqlInfo.AutoRenew))
 	_ = d.Set("mem_size", mysqlInfo.Memory)
+	_ = d.Set("cpu", mysqlInfo.Cpu)
 	_ = d.Set("volume_size", mysqlInfo.Volume)
 	if d.Get("vpc_id").(string) != "" {
 		errRet = d.Set("vpc_id", mysqlInfo.UniqVpcId)
@@ -907,12 +921,13 @@ func mysqlAllInstanceRoleUpdate(ctx context.Context, d *schema.ResourceData, met
 		}
 	}
 
-	if d.HasChange("mem_size") || d.HasChange("volume_size") {
+	if d.HasChange("mem_size") || d.HasChange("cpu") || d.HasChange("volume_size") {
 
 		memSize := int64(d.Get("mem_size").(int))
+		cpu := int64(d.Get("cpu").(int))
 		volumeSize := int64(d.Get("volume_size").(int))
 
-		asyncRequestId, err := mysqlService.UpgradeDBInstance(ctx, d.Id(), memSize, volumeSize)
+		asyncRequestId, err := mysqlService.UpgradeDBInstance(ctx, d.Id(), memSize, cpu, volumeSize)
 
 		if err != nil {
 			return err
@@ -947,6 +962,9 @@ func mysqlAllInstanceRoleUpdate(ctx context.Context, d *schema.ResourceData, met
 		if d.HasChange("mem_size") {
 			d.SetPartial("mem_size")
 		}
+		if d.HasChange("cpu") {
+			d.SetPartial("cpu")
+		}
 		if d.HasChange("volume_size") {
 			d.SetPartial("volume_size")
 		}

tencentcloud/service_tencentcloud_mysql.go

@@ -1095,7 +1095,7 @@ func (me *MysqlService) ModifyDBInstanceVipVport(ctx context.Context, mysqlId, v
 }
 
 func (me *MysqlService) UpgradeDBInstance(ctx context.Context, mysqlId string,
-	memSize, volumeSize int64) (asyncRequestId string, errRet error) {
+	memSize, cpu, volumeSize int64) (asyncRequestId string, errRet error) {
 
 	logId := getLogId(ctx)
 
@@ -1104,6 +1104,7 @@ func (me *MysqlService) UpgradeDBInstance(ctx context.Context, mysqlId string,
 	request := cdb.NewUpgradeDBInstanceRequest()
 	request.InstanceId = &mysqlId
 	request.Memory = &memSize
+	request.Cpu = &cpu
 	request.Volume = &volumeSize
 	request.WaitSwitch = &waitSwitch