Merge pull request #89 from yunify/fix-lb-listener-timeout

runzexia · web-flow · commit da57260c8f38 · 2018-01-04T17:13:31.000+08:00
fix timeout field location
diff --git a/service/types.go b/service/types.go
@@ -1351,7 +1351,6 @@ type LoadBalancerBackend struct {
 	Port                    *int       `json:"port" name:"port"`
 	ResourceID              *string    `json:"resource_id" name:"resource_id"`
 	Status                  *string    `json:"status" name:"status"`
-	Timeout                 *int       `json:"timeout" name:"timeout"`
 	Weight                  *int       `json:"weight" name:"weight"`
 }
 
@@ -1377,6 +1376,7 @@ type LoadBalancerListener struct {
 	LoadBalancerListenerName *string    `json:"loadbalancer_listener_name" name:"loadbalancer_listener_name"`
 	ServerCertificateID      *string    `json:"server_certificate_id" name:"server_certificate_id"`
 	SessionSticky            *string    `json:"session_sticky" name:"session_sticky"`
+	Timeout                  *int       `json:"timeout" name:"timeout"`
 }
 
 func (v *LoadBalancerListener) Validate() error {

Original file line number	Diff line number	Diff line change
`@@ -1351,7 +1351,6 @@ type LoadBalancerBackend struct {`
`1351`	`1351`	Port *int `json:"port" name:"port"`
`1352`	`1352`	ResourceID *string `json:"resource_id" name:"resource_id"`
`1353`	`1353`	Status *string `json:"status" name:"status"`
`1354`		- Timeout *int `json:"timeout" name:"timeout"`
`1355`	`1354`	Weight *int `json:"weight" name:"weight"`
`1356`	`1355`	`}`
`1357`	`1356`
`@@ -1377,6 +1376,7 @@ type LoadBalancerListener struct {`
`1377`	`1376`	LoadBalancerListenerName *string `json:"loadbalancer_listener_name" name:"loadbalancer_listener_name"`
`1378`	`1377`	ServerCertificateID *string `json:"server_certificate_id" name:"server_certificate_id"`
`1379`	`1378`	SessionSticky *string `json:"session_sticky" name:"session_sticky"`
	`1379`	+ Timeout *int `json:"timeout" name:"timeout"`
`1380`	`1380`	`}`
`1381`	`1381`
`1382`	`1382`	`func (v *LoadBalancerListener) Validate() error {`