jack77213
/
qingcloud-sdk-go
1
0
Fork 0
Code Issues Pull Requests Releases 3 Wiki Activity

Merge pull request #101 from yunify/loadbalancer-server-crt 

Loadbalancer server crt string to array
This commit is contained in:
runzexia 2018-06-25 18:36:00 +08:00 committed by GitHub
parent 8afb238210 a7e602921d
commit ccbddbb914
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 34 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
service/instance.go
View File

@ -562,7 +562,9 @@ type RunInstancesInput struct {
// CPU's available values: 1, 2, 4, 8, 16
CPU *int `json:"cpu" name:"cpu" default:"1" location:"params"`
// CPUMax's available values: 1, 2, 4, 8, 16
CPUMax *int `json:"cpu_max" name:"cpu_max" location:"params"`
CPUMax *int `json:"cpu_max" name:"cpu_max" location:"params"`
// CPUModel's available values: Westmere, SandyBridge, IvyBridge, Haswell, Broadwell
CPUModel *string `json:"cpu_model" name:"cpu_model" default:"Westmere" location:"params"`
Gpu *int `json:"gpu" name:"gpu" default:"0" location:"params"`
Hostname *string `json:"hostname" name:"hostname" location:"params"`
ImageID *string `json:"image_id" name:"image_id" location:"params"` // Required
@ -635,6 +637,26 @@ func (v *RunInstancesInput) Validate() error {
}
}
if v.CPUModel != nil {
cpuModelValidValues := []string{"Westmere", "SandyBridge", "IvyBridge", "Haswell", "Broadwell"}
cpuModelParameterValue := fmt.Sprint(*v.CPUModel)
cpuModelIsValid := false
for _, value := range cpuModelValidValues {
if value == cpuModelParameterValue {
cpuModelIsValid = true
}
}
if !cpuModelIsValid {
return errors.ParameterValueNotAllowedError{
ParameterName: "CPUModel",
ParameterValue: cpuModelParameterValue,
AllowedValues: cpuModelValidValues,
}
}
}
if v.ImageID == nil {
return errors.ParameterRequiredError{
ParameterName: "ImageID",

20
service/load_balancer.go
View File

@ -1392,16 +1392,16 @@ func (s *LoadBalancerService) ModifyLoadBalancerListenerAttributes(i *ModifyLoad
}
type ModifyLoadBalancerListenerAttributesInput struct {
BalanceMode *string `json:"balance_mode" name:"balance_mode" location:"params"`
Forwardfor *int `json:"forwardfor" name:"forwardfor" location:"params"`
HealthyCheckMethod *string `json:"healthy_check_method" name:"healthy_check_method" location:"params"`
HealthyCheckOption *string `json:"healthy_check_option" name:"healthy_check_option" location:"params"`
ListenerOption *int `json:"listener_option" name:"listener_option" location:"params"`
LoadBalancerListener *string `json:"loadbalancer_listener" name:"loadbalancer_listener" location:"params"` // Required
LoadBalancerListenerName *string `json:"loadbalancer_listener_name" name:"loadbalancer_listener_name" location:"params"`
ServerCertificateID *string `json:"server_certificate_id" name:"server_certificate_id" location:"params"`
SessionSticky *string `json:"session_sticky" name:"session_sticky" location:"params"`
Timeout *int `json:"timeout" name:"timeout" location:"params"`
BalanceMode *string `json:"balance_mode" name:"balance_mode" location:"params"`
Forwardfor *int `json:"forwardfor" name:"forwardfor" location:"params"`
HealthyCheckMethod *string `json:"healthy_check_method" name:"healthy_check_method" location:"params"`
HealthyCheckOption *string `json:"healthy_check_option" name:"healthy_check_option" location:"params"`
ListenerOption *int `json:"listener_option" name:"listener_option" location:"params"`
LoadBalancerListener *string `json:"loadbalancer_listener" name:"loadbalancer_listener" location:"params"` // Required
LoadBalancerListenerName *string `json:"loadbalancer_listener_name" name:"loadbalancer_listener_name" location:"params"`
ServerCertificateID []*string `json:"server_certificate_id" name:"server_certificate_id" location:"params"`
SessionSticky *string `json:"session_sticky" name:"session_sticky" location:"params"`
Timeout *int `json:"timeout" name:"timeout" location:"params"`
}
func (v *ModifyLoadBalancerListenerAttributesInput) Validate() error {

2
service/types.go
View File

@ -1369,7 +1369,7 @@ type LoadBalancerListener struct {
LoadBalancerID *string `json:"loadbalancer_id" name:"loadbalancer_id"`
LoadBalancerListenerID *string `json:"loadbalancer_listener_id" name:"loadbalancer_listener_id"`
LoadBalancerListenerName *string `json:"loadbalancer_listener_name" name:"loadbalancer_listener_name"`
ServerCertificateID *string `json:"server_certificate_id" name:"server_certificate_id"`
ServerCertificateID []*string `json:"server_certificate_id" name:"server_certificate_id"`
SessionSticky *string `json:"session_sticky" name:"session_sticky"`
Timeout *int `json:"timeout" name:"timeout"`
}