Fix the ListLoadBalancerRuleInstances response (#59)

Sander van Harmelen · web-flow · commit d717c7f019c0 · 2016-07-27T13:02:17.000+02:00
This one can have two possible response types, depending on the query values used. By adding this, both types are supported.
diff --git a/cloudstack/ISOService.go b/cloudstack/ISOService.go
@@ -1770,7 +1770,6 @@ func (s *ISOService) GetIsoPermissionByID(id string, opts ...OptionFunc) (*IsoPe
 	p := &ListIsoPermissionsParams{}
 	p.p = make(map[string]interface{})
 
-	p.p["id"] = id
 	p.p["id"] = id
 
 	for _, fn := range opts {
diff --git a/cloudstack/LoadBalancerService.go b/cloudstack/LoadBalancerService.go
@@ -1959,11 +1959,10 @@ func (s *LoadBalancerService) NewListLoadBalancerRuleInstancesParams(id string)
 }
 
 // This is a courtesy helper function, which in some cases may not work as expected!
-func (s *LoadBalancerService) GetLoadBalancerRuleInstanceByID(id string, opts ...OptionFunc) (*LoadBalancerRuleInstance, int, error) {
+func (s *LoadBalancerService) GetLoadBalancerRuleInstanceByID(id string, opts ...OptionFunc) (*VirtualMachine, int, error) {
 	p := &ListLoadBalancerRuleInstancesParams{}
 	p.p = make(map[string]interface{})
 
-	p.p["id"] = id
 	p.p["id"] = id
 
 	for _, fn := range opts {
@@ -2008,7 +2007,8 @@ func (s *LoadBalancerService) ListLoadBalancerRuleInstances(p *ListLoadBalancerR
 
 type ListLoadBalancerRuleInstancesResponse struct {
 	Count                     int                         `json:"count"`
-	LoadBalancerRuleInstances []*LoadBalancerRuleInstance `json:"lbrulevmidip"`
+	LBRuleVMIDIPs             []*LoadBalancerRuleInstance `json:"lbrulevmidip,omitempty"`
+	LoadBalancerRuleInstances []*VirtualMachine           `json:"loadbalancerruleinstance,omitempty"`
 }
 
 type LoadBalancerRuleInstance struct {
diff --git a/cloudstack/TemplateService.go b/cloudstack/TemplateService.go
@@ -1627,7 +1627,6 @@ func (s *TemplateService) GetTemplatePermissionByID(id string, opts ...OptionFun
 	p := &ListTemplatePermissionsParams{}
 	p.p = make(map[string]interface{})
 
-	p.p["id"] = id
 	p.p["id"] = id
 
 	for _, fn := range opts {
diff --git a/generate/generate.go b/generate/generate.go
@@ -904,15 +904,19 @@ func (s *service) generateHelperFuncs(a *API) {
 					p("%s %s, ", s.parseParamName(ap.Name), mapType(ap.Type))
 				}
 			}
-			pn("opts ...OptionFunc) (*%s, int, error) {", parseSingular(ln))
+			if ln == "LoadBalancerRuleInstances" {
+				pn("opts ...OptionFunc) (*VirtualMachine, int, error) {")
+			} else {
+				pn("opts ...OptionFunc) (*%s, int, error) {", parseSingular(ln))
+			}
 
 			// Generate the function body
 			pn("	p := &List%sParams{}", ln)
 			pn("	p.p = make(map[string]interface{})")
 			pn("")
 			pn("	p.p[\"id\"] = id")
 			for _, ap := range a.Params {
-				if ap.Required {
+				if ap.Required && s.parseParamName(ap.Name) != "id" {
 					pn("	p.p[\"%s\"] = %s", s.parseParamName(ap.Name), s.parseParamName(ap.Name))
 				}
 			}
@@ -1102,7 +1106,8 @@ func (s *service) generateResponseType(a *API) {
 		case "listEgressFirewallRules":
 			pn("	%s []*%s `json:\"%s\"`", ln, parseSingular(ln), "firewallrule")
 		case "listLoadBalancerRuleInstances":
-			pn("	%s []*%s `json:\"%s\"`", ln, parseSingular(ln), "lbrulevmidip")
+			pn("	LBRuleVMIDIPs []*%s `json:\"%s,omitempty\"`", parseSingular(ln), "lbrulevmidip")
+			pn("	LoadBalancerRuleInstances []*VirtualMachine `json:\"%s,omitempty\"`", strings.ToLower(parseSingular(ln)))
 		case "registerTemplate":
 			pn("	%s []*%s `json:\"%s\"`", ln, parseSingular(ln), "template")
 		default:
