Fix bug in scs

Author: duanliguo

services/scs/client_test.go

@@ -2,6 +2,7 @@ package scs
 
 import (
 	"encoding/json"
+	"fmt"
 	"github.com/baidubce/bce-sdk-go/model"
 	"os"
 	"path/filepath"
@@ -102,15 +103,19 @@ func TestClient_CreateInstance(t *testing.T) {
 	ExpectEqual(t.Errorf, nil, err)
 
 	if len(result.InstanceIds) > 0 {
-		SCS_TEST_ID = result.InstanceIds[0].InstanceId
+		SCS_TEST_ID = result.InstanceIds[0]
 	}
 	isAvailable(SCS_TEST_ID)
+	data, _ := json.Marshal(result)
+	fmt.Println(string(data))
 }
 
 func TestClient_ListInstances(t *testing.T) {
 	args := &ListInstancesArgs{}
 	result, err := SCS_CLIENT.ListInstances(args)
 	ExpectEqual(t.Errorf, nil, err)
+	data, _ := json.Marshal(result)
+	fmt.Println(string(data))
 	for _, e := range result.Instances {
 		if e.InstanceID == SCS_TEST_ID {
 			ExpectEqual(t.Errorf, "Postpaid", e.PaymentTiming)
@@ -120,8 +125,10 @@ func TestClient_ListInstances(t *testing.T) {
 }
 
 func TestClient_GetInstanceDetail(t *testing.T) {
-	_, err := SCS_CLIENT.GetInstanceDetail(SCS_TEST_ID)
+	result, err := SCS_CLIENT.GetInstanceDetail("scs-su-vizlxyjqkfnm")
 	ExpectEqual(t.Errorf, nil, err)
+	data, _ := json.Marshal(result)
+	fmt.Println(string(data))
 }
 
 func TestClient_UpdateInstanceName(t *testing.T) {
@@ -297,6 +304,7 @@ func TestClient_AddSecurityIp(t *testing.T) {
 				SecurityIps:  []string{
 					"192.0.0.1",
 				},
+				ClientToken:   getClientToken(),
 			}
 			err := SCS_CLIENT.AddSecurityIp(e.InstanceID, args)
 			ExpectEqual(t.Errorf, nil, err)
@@ -316,6 +324,7 @@ func TestClient_DeleteSecurityIp(t *testing.T) {
 				SecurityIps:  []string{
 					"192.0.0.1",
 				},
+				ClientToken:   getClientToken(),
 			}
 			err := SCS_CLIENT.DeleteSecurityIp(e.InstanceID, args)
 			ExpectEqual(t.Errorf, nil, err)
@@ -348,6 +357,7 @@ func TestClient_ModifyParameters(t *testing.T) {
 					Name: "timeout",
 					Value: "0",
 				},
+				ClientToken:   getClientToken(),
 			}
 			err := SCS_CLIENT.ModifyParameters(e.InstanceID, args)
 			ExpectEqual(t.Errorf, nil, err)
@@ -379,6 +389,7 @@ func TestClient_ModifyBackupPolicy(t *testing.T) {
 				BackupDays: "Sun,Mon,Tue,Wed,Thu,Fri,Sta",
 				BackupTime: "01:05:00",
 				ExpireDay: 7,
+				ClientToken:   getClientToken(),
 			}
 			err := SCS_CLIENT.ModifyBackupPolicy(e.InstanceID, args)
 			ExpectEqual(t.Errorf, nil, err)

services/scs/model.go

@@ -30,7 +30,7 @@ type Billing struct {
 	Reservation   *Reservation `json:"reservation,omitempty"`
 }
 
-type SubnetMap struct {
+type Subnet struct {
 	ZoneName string `json:"zoneName"`
 	SubnetID string `json:"subnetId"`
 }
@@ -49,19 +49,16 @@ type CreateInstanceArgs struct {
 	Port              int         `json:"port"`
 	EngineVersion     string      `json:"engineVersion"`
 	VpcID             string      `json:"vpcId"`
-	Subnets           []SubnetMap `json:"subnets,omitempty"`
+	Subnets           []Subnet    `json:"subnets,omitempty"`
 	AutoRenewTimeUnit string      `json:"autoRenewTimeUnit,omitempty"`
 	AutoRenewTime     int         `json:"autoRenewTime,omitempty"`
 	ClientToken       string      `json:"-"`
 }
 
 type CreateInstanceResult struct {
-	InstanceIds []InstanceId `json:"instanceIds"`
+	InstanceIds []string `json:"instanceIds"`
 }
 
-type InstanceId struct {
-	InstanceId string `json:"instanceId"`
-}
 type InstanceModel struct {
 	InstanceID         string           `json:"instanceId"`
 	InstanceName       string           `json:"instanceName"`
@@ -73,11 +70,11 @@ type InstanceModel struct {
 	Domain             string           `json:"domain"`
 	Port               int              `json:"port"`
 	InstanceCreateTime string           `json:"instanceCreateTime"`
-	InstanceExpireTime string           `json:"instanceExpireTime"`
 	Capacity           int              `json:"capacity"`
 	UsedCapacity       float64          `json:"usedCapacity"`
 	PaymentTiming      string           `json:"paymentTiming"`
 	ZoneNames          []string         `json:"zoneNames"`
+	Tags               []model.TagModel `json:"tags"`
 }
 
 type ListInstancesArgs struct {
@@ -94,7 +91,6 @@ type ListInstancesResult struct {
 }
 
 type ResizeInstanceArgs struct {
-	Billing     Billing `json:"billing"`
 	NodeType    string  `json:"nodeType"`
 	ShardNum    int     `json:"shardNum"`
 	ClientToken string  `json:"-"`
@@ -118,7 +114,8 @@ type GetInstanceDetailResult struct {
 	VpcID              string           `json:"vpcId"`
 	ZoneNames          []string         `json:"zoneNames"`
 	Subnets            []Subnet         `json:"subnets"`
-	AutoRenew          bool             `json:"autoRenew"`
+	AutoRenew          int              `json:"autoRenew"`
+	Tags               []model.TagModel `json:"tags"`
 }
 
 type UpdateInstanceNameArgs struct {
@@ -143,15 +140,15 @@ type GetNodeTypeListResult struct {
 }
 
 type ListSubnetsArgs struct {
-	VpcID               string
-	ZoneName            string
+	VpcID               string  `json:"vpcId"`
+	ZoneName            string  `json:"zoneName"`
 }
 
 type ListSubnetsResult struct {
-	Subnets            []Subnet         `json:"subnets"`
+	SubnetOriginals            []SubnetOriginal         `json:"subnets"`
 }
 
-type Subnet struct {
+type SubnetOriginal struct {
 	Name     string `json:"name"`
 	SubnetID string `json:"subnetId"`
 	ZoneName string `json:"zoneName"`