Merge pull request #1694 from ioito/hotfix/qx-ksyun-vm-charge-type

fix(region): ksyun charge type

Author: ioito

pkg/cloudprovider/instance.go

@@ -161,6 +161,10 @@ type SManagedVMCreateConfig struct {
 	ProjectId           string
 	EnableMonitorAgent  bool
 
+	// 金山云按量付费类型
+	// Daily（按量付费（按日月结）)、 HourlyInstantSettlement（按量付费（按小时月结））
+	KsyunPostpaidChargeType string
+
 	SPublicIpInfo
 
 	Tags map[string]string

pkg/multicloud/ksyun/host.go

@@ -22,6 +22,7 @@ import (
 	"yunion.io/x/cloudmux/pkg/cloudprovider"
 	"yunion.io/x/cloudmux/pkg/multicloud"
 	"yunion.io/x/pkg/errors"
+	"yunion.io/x/pkg/utils"
 
 	"yunion.io/x/jsonutils"
 )
@@ -92,6 +93,9 @@ func (region *SRegion) CreateVM(opts *cloudprovider.SManagedVMCreateConfig) (*SI
 		"SystemDisk.DiskSize": fmt.Sprintf("%d", opts.SysDisk.SizeGB),
 		"SyncTag":             "true",
 	}
+	if utils.IsInStringArray(opts.KsyunPostpaidChargeType, []string{"HourlyInstantSettlement", "Daily"}) {
+		params["ChargeType"] = opts.KsyunPostpaidChargeType
+	}
 	if len(opts.Hostname) > 0 {
 		params["HostName"] = opts.Hostname
 	}