handle differing JSON keys for API calls (#358)

Author: KerDav

api/container/containerv2/worker_pool.go

@@ -9,8 +9,18 @@ import (
 // WorkerPoolRequest provides worker pool data
 // swagger:model
 type WorkerPoolRequest struct {
-	Cluster string `json:"cluster" description:"cluster name where the worker pool will be created"`
-	WorkerPoolConfig
+	Cluster                string                  `json:"cluster" description:"cluster name where the worker pool will be created"`
+	DiskEncryption         bool                    `json:"diskEncryption,omitempty"`
+	Entitlement            string                  `json:"entitlement"`
+	Flavor                 string                  `json:"flavor"`
+	HostPoolID             string                  `json:"hostPool,omitempty"`
+	Isolation              string                  `json:"isolation,omitempty"`
+	Labels                 map[string]string       `json:"labels,omitempty"`
+	Name                   string                  `json:"name" binding:"required" description:"The workerpool's name"`
+	VpcID                  string                  `json:"vpcID"`
+	WorkerCount            int                     `json:"workerCount"`
+	Zones                  []Zone                  `json:"zones"`
+	WorkerVolumeEncryption *WorkerVolumeEncryption `json:"workerVolumeEncryption,omitempty"`
 }
 type WorkerPoolTaintRequest struct {
 	Cluster    string            `json:"cluster" description:"cluster name"`

api/container/containerv2/worker_pool_test.go

@@ -28,7 +28,7 @@ var _ = Describe("workerpools", func() {
 				server.AppendHandlers(
 					ghttp.CombineHandlers(
 						ghttp.VerifyRequest(http.MethodPost, "/v2/vpc/createWorkerPool"),
-						ghttp.VerifyJSON(`{"cluster":"bm64u3ed02o93vv36hb0","flavor":"b2.4x16", "hostPoolID":"hostpoolid1", "name":"mywork211","vpcID":"6015365a-9d93-4bb4-8248-79ae0db2dc26","workerCount":1,"zones":[], "entitlement":""}`),
+						ghttp.VerifyJSON(`{"cluster":"bm64u3ed02o93vv36hb0","flavor":"b2.4x16", "hostPool":"hostpoolid1", "name":"mywork211","vpcID":"6015365a-9d93-4bb4-8248-79ae0db2dc26","workerCount":1,"zones":[], "entitlement":""}`),
 						ghttp.RespondWith(http.StatusCreated, `{
 							"workerPoolID":"string"
 						}`),
@@ -39,16 +39,14 @@ var _ = Describe("workerpools", func() {
 			It("should create Workerpool in a cluster", func() {
 				target := ClusterTargetHeader{}
 				params := WorkerPoolRequest{
-					Cluster: "bm64u3ed02o93vv36hb0",
-					WorkerPoolConfig: WorkerPoolConfig{
-						Flavor:      "b2.4x16",
-						HostPoolID:  "hostpoolid1",
-						Name:        "mywork211",
-						VpcID:       "6015365a-9d93-4bb4-8248-79ae0db2dc26",
-						WorkerCount: 1,
-						Zones:       []Zone{},
-						Entitlement: "",
-					},
+					Cluster:     "bm64u3ed02o93vv36hb0",
+					Flavor:      "b2.4x16",
+					HostPoolID:  "hostpoolid1",
+					Name:        "mywork211",
+					VpcID:       "6015365a-9d93-4bb4-8248-79ae0db2dc26",
+					WorkerCount: 1,
+					Zones:       []Zone{},
+					Entitlement: "",
 				}
 				_, err := newWorkerPool(server.URL()).CreateWorkerPool(params, target)
 				Expect(err).NotTo(HaveOccurred())
@@ -70,15 +68,13 @@ var _ = Describe("workerpools", func() {
 
 			It("should return error during creating workerpool", func() {
 				params := WorkerPoolRequest{
-					Cluster: "bm64u3ed02o93vv36hb0",
-					WorkerPoolConfig: WorkerPoolConfig{
-						Flavor:      "b2.4x16",
-						Name:        "mywork211",
-						VpcID:       "6015365a-9d93-4bb4-8248-79ae0db2dc26",
-						WorkerCount: 1,
-						Zones:       []Zone{},
-						Entitlement: "",
-					},
+					Cluster:     "bm64u3ed02o93vv36hb0",
+					Flavor:      "b2.4x16",
+					Name:        "mywork211",
+					VpcID:       "6015365a-9d93-4bb4-8248-79ae0db2dc26",
+					WorkerCount: 1,
+					Zones:       []Zone{},
+					Entitlement: "",
 				}
 				target := ClusterTargetHeader{}
 				_, err := newWorkerPool(server.URL()).CreateWorkerPool(params, target)

examples/container/V2containers/CreateWorkerpoolV2/main.go

@@ -18,14 +18,12 @@ func main() {
 	trace.Logger = trace.NewLogger("true")
 
 	var poolinfo = v2.WorkerPoolRequest{
-		Cluster: "bm64u3ed02o93vv36hb0",
-		WorkerPoolConfig: v2.WorkerPoolConfig{
-			Flavor:      "c2.2x4",
-			Name:        "mywork21",
-			VpcID:       "6015365a-9d93-4bb4-8248-79ae0db2dc26",
-			WorkerCount: 1,
-			Zones:       []v2.Zone{},
-		},
+		Cluster:     "bm64u3ed02o93vv36hb0",
+		Flavor:      "c2.2x4",
+		Name:        "mywork21",
+		VpcID:       "6015365a-9d93-4bb4-8248-79ae0db2dc26",
+		WorkerCount: 1,
+		Zones:       []v2.Zone{},
 	}
 	sess, err := session.New(c)
 	if err != nil {

examples/container/V2containers/DedicatedHost/CreateDedicatedHostWorkerpool/main.go

@@ -0,0 +1,62 @@
+package main
+
+import (
+	"flag"
+	"fmt"
+	"log"
+
+	bluemix "github.com/IBM-Cloud/bluemix-go"
+	v2 "github.com/IBM-Cloud/bluemix-go/api/container/containerv2"
+	"github.com/IBM-Cloud/bluemix-go/session"
+	"github.com/IBM-Cloud/bluemix-go/trace"
+)
+
+func main() {
+	var VpcID string
+	flag.StringVar(&VpcID, "vpcid", "", "VpcID")
+	var SubnetID string
+	flag.StringVar(&SubnetID, "subnetid", "", "SubnetID")
+	var Name string
+	flag.StringVar(&Name, "name", "bluemixV2Test", "Name")
+	var Zone string
+	flag.StringVar(&Zone, "zone", "us-south-1", "Zone")
+	var HostPoolID string
+	flag.StringVar(&HostPoolID, "hostpoolid", "", "HostPoolID")
+	flag.Parse()
+	fmt.Println("[FLAG]VpcID: ", VpcID)
+	fmt.Println("[FLAG]SubnetID: ", SubnetID)
+	fmt.Println("[FLAG]Name: ", Name)
+	fmt.Println("[FLAG]Zone: ", Zone)
+	fmt.Println("[FLAG]HostPoolID: ", HostPoolID)
+	c := new(bluemix.Config)
+	trace.Logger = trace.NewLogger("true")
+	var workerPoolInfo = v2.WorkerPoolRequest{
+		Cluster:     Name,
+		Name:        fmt.Sprintf("%s-dhost-workerpool", Name),
+		Flavor:      "bx2d.16x64",
+		VpcID:       VpcID,
+		WorkerCount: 1,
+		HostPoolID:  HostPoolID,
+		Zones: []v2.Zone{
+			{
+				ID:       Zone,
+				SubnetID: SubnetID,
+			},
+		},
+	}
+	sess, err := session.New(c)
+	if err != nil {
+		log.Fatal(err)
+	}
+	target := v2.ClusterTargetHeader{}
+	v2Client, err := v2.New(sess)
+	if err != nil {
+		log.Fatal(err)
+	}
+	workerPoolAPI := v2Client.WorkerPools()
+	out, err := workerPoolAPI.CreateWorkerPool(workerPoolInfo, target)
+	if err != nil {
+		log.Fatal(err)
+	}
+	fmt.Println("out=", out)
+}