Merge pull request #3 from sbrueseke/fix_websocket_object

fix websocket generation

Author: sbrueseke

cloudstack/ConsoleEndpointService.go

@@ -103,12 +103,12 @@ func (s *ConsoleEndpointService) CreateConsoleEndpoint(p *CreateConsoleEndpointP
 }
 
 type CreateConsoleEndpointResponse struct {
-	Details   string `json:"details"`
-	JobID     string `json:"jobid"`
-	Jobstatus int    `json:"jobstatus"`
-	Success   bool   `json:"success"`
-	Url       string `json:"url"`
-	Websocket string `json:"websocket"`
+	Details   string                 `json:"details"`
+	JobID     string                 `json:"jobid"`
+	Jobstatus int                    `json:"jobstatus"`
+	Success   bool                   `json:"success"`
+	Url       string                 `json:"url"`
+	Websocket map[string]interface{} `json:"websocket"`
 }
 
 func (r *CreateConsoleEndpointResponse) UnmarshalJSON(b []byte) error {

cloudstack/NetworkService.go

@@ -351,7 +351,7 @@ func (s *NetworkService) NewAddOpenDaylightControllerParams(password string, phy
 	return p
 }
 
-// Adds an OpenDaylight controller
+// Adds an OpenDyalight controler
 func (s *NetworkService) AddOpenDaylightController(p *AddOpenDaylightControllerParams) (*AddOpenDaylightControllerResponse, error) {
 	resp, err := s.cs.newRequest("addOpenDaylightController", p.toURLValues())
 	if err != nil {
@@ -2229,7 +2229,7 @@ func (s *NetworkService) NewDeleteOpenDaylightControllerParams(id string) *Delet
 	return p
 }
 
-// Removes an OpenDaylight controller
+// Removes an OpenDyalight controler
 func (s *NetworkService) DeleteOpenDaylightController(p *DeleteOpenDaylightControllerParams) (*DeleteOpenDaylightControllerResponse, error) {
 	resp, err := s.cs.newRequest("deleteOpenDaylightController", p.toURLValues())
 	if err != nil {
@@ -4075,7 +4075,7 @@ func (s *NetworkService) GetOpenDaylightControllerByID(id string, opts ...Option
 	return nil, l.Count, fmt.Errorf("There is more then one result for OpenDaylightController UUID: %s!", id)
 }
 
-// Lists OpenDaylight controllers
+// Lists OpenDyalight controllers
 func (s *NetworkService) ListOpenDaylightControllers(p *ListOpenDaylightControllersParams) (*ListOpenDaylightControllersResponse, error) {
 	resp, err := s.cs.newRequest("listOpenDaylightControllers", p.toURLValues())
 	if err != nil {

examples/AddHost.go

@@ -24,7 +24,7 @@ import (
 	"fmt"
 	"log"
 
-	"github.com/apache/cloudstack-go/v2/cloudstack"
+	"github.com/sbrueseke/cloudstack-go/v2/cloudstack"
 )
 
 func AddHost() {

examples/CreateDeleteDomain.go

@@ -24,7 +24,7 @@ import (
 	"fmt"
 	"log"
 
-	"github.com/apache/cloudstack-go/v2/cloudstack"
+	"github.com/sbrueseke/cloudstack-go/v2/cloudstack"
 )
 
 func CreateDomain() {

examples/HostOperations.go

@@ -23,7 +23,7 @@ import (
 	"encoding/json"
 	"log"
 
-	"github.com/apache/cloudstack-go/v2/cloudstack"
+	"github.com/sbrueseke/cloudstack-go/v2/cloudstack"
 )
 
 func PerformHostOperations() {

examples/mock_test.go

@@ -22,8 +22,8 @@ package main
 import (
 	"testing"
 
-	"github.com/apache/cloudstack-go/v2/cloudstack"
 	"github.com/golang/mock/gomock"
+	"github.com/sbrueseke/cloudstack-go/v2/cloudstack"
 )
 
 func Test_Mock(t *testing.T) {

generate/generate.go

@@ -2166,6 +2166,8 @@ func mapType(aName string, pName string, pType string) string {
 		return "OutOfBandManagementResponse"
 	case "hostharesponse":
 		return "HAForHostResponse"
+	case "consoleendpointwebsocketresponse":
+		return "map[string]interface{}"
 	default:
 		return "string"
 	}

go.sum

@@ -1,3 +1,5 @@
+github.com/apache/cloudstack-go/v2 v2.15.0 h1:oojn1qx0+wBwrFSSmA2rL8XjWd4BXqwYo0RVCrAXoHk=
+github.com/apache/cloudstack-go/v2 v2.15.0/go.mod h1:Mc+tXpujtslBuZFk5atoGT2LanVxOrXS2GGgidAoz1A=
 github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI=
 github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI=
 github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU=

test/APIDiscoveryService_test.go

@@ -22,7 +22,7 @@ package test
 import (
 	"testing"
 
-	"github.com/apache/cloudstack-go/v2/cloudstack"
+	"github.com/sbrueseke/cloudstack-go/v2/cloudstack"
 )
 
 func TestAPIDiscoveryService(t *testing.T) {

test/AccountService_test.go

@@ -22,7 +22,7 @@ package test
 import (
 	"testing"
 
-	"github.com/apache/cloudstack-go/v2/cloudstack"
+	"github.com/sbrueseke/cloudstack-go/v2/cloudstack"
 )
 
 func TestAccountService(t *testing.T) {