polling and async complete

Author: lixiaojun629

ansi/code.go

@@ -0,0 +1,18 @@
+// Reference https://github.com/sindresorhus/ansi-escapes
+package ansi
+
+import (
+	"fmt"
+)
+
+const ESC = "\x1b["
+const OSC = "\x1b]"
+const BEL = "\x07"
+const SEP = ";"
+
+var CursorLeft = fmt.Sprintf("%sG", ESC)
+var EraseDown = fmt.Sprintf("%sJ", ESC)
+
+func CursorUp(count int) string {
+	return fmt.Sprintf("%s%dA", ESC, count)
+}

base/client.go

@@ -0,0 +1,34 @@
+package base
+
+import (
+	"github.com/ucloud/ucloud-sdk-go/services/pathx"
+	"github.com/ucloud/ucloud-sdk-go/services/uaccount"
+	"github.com/ucloud/ucloud-sdk-go/services/uhost"
+	"github.com/ucloud/ucloud-sdk-go/services/ulb"
+	"github.com/ucloud/ucloud-sdk-go/services/unet"
+	"github.com/ucloud/ucloud-sdk-go/services/vpc"
+	"github.com/ucloud/ucloud-sdk-go/ucloud"
+	"github.com/ucloud/ucloud-sdk-go/ucloud/auth"
+)
+
+//Client aggregate client for business
+type Client struct {
+	uaccount.UAccountClient
+	uhost.UHostClient
+	unet.UNetClient
+	ulb.ULBClient
+	vpc.VPCClient
+	pathx.PathXClient
+}
+
+// NewClient will return a aggregate client
+func NewClient(config *ucloud.Config, credential *auth.Credential) *Client {
+	return &Client{
+		*uaccount.NewClient(config, credential),
+		*uhost.NewClient(config, credential),
+		*unet.NewClient(config, credential),
+		*ulb.NewClient(config, credential),
+		*vpc.NewClient(config, credential),
+		*pathx.NewClient(config, credential),
+	}
+}

base/config.go

@@ -8,10 +8,9 @@ import (
 	"strings"
 	"time"
 
-	"github.com/ucloud/ucloud-sdk-go/sdk"
-	"github.com/ucloud/ucloud-sdk-go/sdk/auth"
-	service "github.com/ucloud/ucloud-sdk-go/services"
 	"github.com/ucloud/ucloud-sdk-go/services/uaccount"
+	sdk "github.com/ucloud/ucloud-sdk-go/ucloud"
+	"github.com/ucloud/ucloud-sdk-go/ucloud/auth"
 )
 
 const configFile = "config.json"
@@ -204,5 +203,5 @@ func init() {
 	SdkClient = sdk.NewClient(ClientConfig, Credential)
 
 	//bizClient 用于调用业务接口
-	BizClient = service.NewClient(ClientConfig, Credential)
+	BizClient = NewClient(ClientConfig, Credential)
 }

base/cli.go base/util.gobase/cli.go renamed to base/util.go

@@ -13,10 +13,9 @@ import (
 	"time"
 	"unicode"
 
-	"github.com/ucloud/ucloud-sdk-go/sdk"
-	uerr "github.com/ucloud/ucloud-sdk-go/sdk/error"
-	"github.com/ucloud/ucloud-sdk-go/sdk/response"
-	service "github.com/ucloud/ucloud-sdk-go/services"
+	sdk "github.com/ucloud/ucloud-sdk-go/ucloud"
+	uerr "github.com/ucloud/ucloud-sdk-go/ucloud/error"
+	"github.com/ucloud/ucloud-sdk-go/ucloud/response"
 
 	"github.com/ucloud/ucloud-cli/model"
 )
@@ -34,7 +33,7 @@ var Cxt = model.GetContext(os.Stdout)
 var SdkClient *sdk.Client
 
 //BizClient 用于调用业务接口
-var BizClient *service.Client
+var BizClient *Client
 
 //GetHomePath 获取家目录
 func GetHomePath() string {

base/cli_test.go base/util_test.gobase/cli_test.go renamed to base/util_test.go

@@ -19,9 +19,10 @@ import (
 	"strconv"
 	"time"
 
-	"github.com/ucloud/ucloud-sdk-go/sdk"
-
 	"github.com/spf13/cobra"
+
+	sdk "github.com/ucloud/ucloud-sdk-go/ucloud"
+
 	. "github.com/ucloud/ucloud-cli/base"
 )
 
@@ -133,9 +134,9 @@ func NewCmdEIPAllocate() *cobra.Command {
 	req.Name = cmd.Flags().String("name", "EIP", "Name of your EIP.")
 	req.Remark = cmd.Flags().String("remark", "", "Remark of your EIP.")
 	req.CouponId = cmd.Flags().String("coupon-id", "", "Coupon ID, The Coupon can deducte part of the payment")
-	cmd.Flags().SetFlagValues("line", []string{"BGP", "International"})
-	cmd.Flags().SetFlagValues("charge-mode", []string{"Bandwidth", "Traffic", "ShareBandwidth"})
-	cmd.Flags().SetFlagValues("charge-type", []string{"Month", "Year", "Dynamic", "Trial"})
+	cmd.Flags().SetFlagValues("line", "BGP", "International")
+	cmd.Flags().SetFlagValues("charge-mode", "Bandwidth", "Traffic", "ShareBandwidth")
+	cmd.Flags().SetFlagValues("charge-type", "Month", "Year", "Dynamic", "Trial")
 	cmd.MarkFlagRequired("line")
 	cmd.MarkFlagRequired("bandwidth")
 	return cmd

cmd/eip.go

@@ -186,8 +186,8 @@ func NewCmdGsshCreate() *cobra.Command {
 	req.CouponId = cmd.Flags().String("coupon-id", "", "Optional. Coupon ID, The Coupon can deduct part of the payment,see DescribeCoupon or https://accountv2.ucloud.cn")
 	cmd.MarkFlagRequired("area")
 	cmd.MarkFlagRequired("target-ip")
-	cmd.Flags().SetFlagValues("area", []string{"LosAngeles", "Singapore", "HongKong", "Tokyo", "Washington", "Frankfurt"})
-	cmd.Flags().SetFlagValues("charge-type", []string{"Month", "Year", "Dynamic", "Trial"})
+	cmd.Flags().SetFlagValues("area", "LosAngeles", "Singapore", "HongKong", "Tokyo", "Washington", "Frankfurt")
+	cmd.Flags().SetFlagValues("charge-type", "Month", "Year", "Dynamic", "Trial")
 	return cmd
 }
 

cmd/globalssh.go

@@ -17,13 +17,17 @@ package cmd
 import (
 	"fmt"
 	"strings"
+	"time"
 
 	"github.com/spf13/cobra"
 
-	"github.com/ucloud/ucloud-sdk-go/sdk"
 	"github.com/ucloud/ucloud-sdk-go/services/uhost"
+	sdk "github.com/ucloud/ucloud-sdk-go/ucloud"
+	"github.com/ucloud/ucloud-sdk-go/ucloud/helpers/waiter"
+	"github.com/ucloud/ucloud-sdk-go/ucloud/log"
 
 	. "github.com/ucloud/ucloud-cli/base"
+	"github.com/ucloud/ucloud-cli/ux"
 )
 
 //NewCmdUHost ucloud uhost
@@ -153,7 +157,6 @@ func NewCmdUHostCreate() *cobra.Command {
 
 	req.Disks = make([]uhost.UHostDisk, 2)
 	req.Disks[0].IsBoot = sdk.Bool(true)
-	req.Disks[0].Size = sdk.String("20")
 	req.Disks[1].IsBoot = sdk.Bool(false)
 
 	flags := cmd.Flags()
@@ -173,6 +176,7 @@ func NewCmdUHostCreate() *cobra.Command {
 	req.UHostType = flags.String("type", defaultUhostType, "Optional. Default is 'N2' of which cpu is V4 and sata disk. also support 'N1' means V3 cpu and sata disk;'I2' means V4 cpu and ssd disk;'D1' means big data model;'G1' means GPU type, model for K80;'G2' model for P40; 'G3' model for V100")
 	req.NetCapability = flags.String("net-capability", "Normal", "Optional. Default is 'Normal', also support 'Super' which will enhance multiple times network capability as before")
 	req.Disks[0].Type = flags.String("boot-disk-type", "LOCAL_NORMAL", "Optional. Enumeration value. 'LOCAL_NORMAL', Ordinary local disk; 'CLOUD_NORMAL', Ordinary cloud disk; 'LOCAL_SSD',local ssd disk; 'CLOUD_SSD',cloud ssd disk; 'EXCLUSIVE_LOCAL_DISK',big data. The disk only supports a limited combination.")
+	req.Disks[0].Size = flags.String("boot-disk-size", "20", "Optional. Default 20G. Windows should be bigger than 40G Unit GB")
 	req.Disks[0].BackupType = flags.String("boot-disk-backup-type", "NONE", "Optional. Enumeration value, 'NONE' or 'DATAARK'. DataArk supports real-time backup, which can restore the disk back to any moment within the last 12 hours. (Normal Local Disk and Normal Cloud Disk Only)")
 	req.Disks[1].Type = flags.String("data-disk-type", "LOCAL_NORMAL", "Optional. Enumeration value. 'LOCAL_NORMAL', Ordinary local disk; 'CLOUD_NORMAL', Ordinary cloud disk; 'LOCAL_SSD',local ssd disk; 'CLOUD_SSD',cloud ssd disk; 'EXCLUSIVE_LOCAL_DISK',big data. The disk only supports a limited combination.")
 	req.Disks[1].Size = flags.String("data-disk-size", "20", "Optional. Disk size. Unit GB")
@@ -182,14 +186,44 @@ func NewCmdUHostCreate() *cobra.Command {
 	req.Tag = flags.String("ugroup", "Default", "Optional. Business group")
 	req.CouponId = flags.String("coupon-id", "", "Optional. Coupon ID, The Coupon can deduct part of the payment,see DescribeCoupon or https://accountv2.ucloud.cn")
 
-	cmd.Flags().SetFlagValues("charge-type", []string{"Month", "Year", "Dynamic", "Trial"})
-	cmd.Flags().SetFlagValues("cpu", []string{"1", "2", "4", "8", "12", "16", "24", "32"})
-	cmd.Flags().SetFlagValues("type", []string{"N2", "N1", "I2", "D1", "G1", "G2", "G3"})
-	cmd.Flags().SetFlagValues("net-capability", []string{"Normal", "Super"})
-	cmd.Flags().SetFlagValues("boot-disk-type", []string{"LOCAL_NORMAL", "CLOUD_NORMAL", "LOCAL_SSD", "CLOUD_SSD", "EXCLUSIVE_LOCAL_DISK"})
-	cmd.Flags().SetFlagValues("boot-disk-backup-type", []string{"NONE", "DATAARK"})
-	cmd.Flags().SetFlagValues("data-disk-type", []string{"LOCAL_NORMAL", "CLOUD_NORMAL", "LOCAL_SSD", "CLOUD_SSD", "EXCLUSIVE_LOCAL_DISK"})
-	cmd.Flags().SetFlagValues("data-disk-backup-type", []string{"NONE", "DATAARK"})
+	cmd.Flags().SetFlagValues("charge-type", "Month", "Year", "Dynamic", "Trial")
+	cmd.Flags().SetFlagValues("cpu", "1", "2", "4", "8", "12", "16", "24", "32")
+	cmd.Flags().SetFlagValues("type", "N2", "N1", "I2", "D1", "G1", "G2", "G3")
+	cmd.Flags().SetFlagValues("net-capability", "Normal", "Super")
+	cmd.Flags().SetFlagValues("boot-disk-type", "LOCAL_NORMAL", "CLOUD_NORMAL", "LOCAL_SSD", "CLOUD_SSD", "EXCLUSIVE_LOCAL_DISK")
+	cmd.Flags().SetFlagValues("boot-disk-backup-type", "NONE", "DATAARK")
+	cmd.Flags().SetFlagValues("data-disk-type", "LOCAL_NORMAL", "CLOUD_NORMAL", "LOCAL_SSD", "CLOUD_SSD", "EXCLUSIVE_LOCAL_DISK")
+	cmd.Flags().SetFlagValues("data-disk-backup-type", "NONE", "DATAARK")
+
+	cmd.Flags().SetFlagValuesFunc("image-id", func() []string {
+		req := BizClient.NewDescribeImageRequest()
+		projectID, _ := flags.GetString("project-id")
+		if projectID == "" {
+			projectID = ConfigInstance.ProjectID
+		}
+		req.ProjectId = sdk.String(projectID)
+
+		region, _ := flags.GetString("region")
+		if region == "" {
+			region = ConfigInstance.Region
+		}
+		req.Region = sdk.String(region)
+
+		zone, _ := flags.GetString("zone")
+		if zone == "" {
+			zone = ConfigInstance.Zone
+		}
+		req.Zone = sdk.String(zone)
+		req.ImageType = sdk.String("Base")
+		result := make([]string, 0)
+		resp, err := BizClient.DescribeImage(req)
+		if err == nil {
+			for _, image := range resp.ImageSet {
+				result = append(result, image.ImageId)
+			}
+		}
+		return result
+	})
 
 	cmd.MarkFlagRequired("cpu")
 	cmd.MarkFlagRequired("memory")
@@ -220,6 +254,19 @@ func NewCmdUHostDelete() *cobra.Command {
 			} else {
 				req.EIPReleased = sdk.String("no")
 			}
+			hostIns, err := describeUHostByID(*req.UHostId, *req.ProjectId, *req.Region, *req.Zone)
+			if err != nil {
+				HandleError(err)
+			} else if hostIns != nil {
+				if hostIns.State == "Running" {
+					_req := BizClient.NewStopUHostInstanceRequest()
+					_req.ProjectId = req.ProjectId
+					_req.Region = req.Region
+					_req.Zone = req.Zone
+					_req.UHostId = req.UHostId
+					stopUhostIns(_req)
+				}
+			}
 			resp, err := BizClient.TerminateUHostInstance(req)
 			if err != nil {
 				HandleError(err)
@@ -235,6 +282,8 @@ func NewCmdUHostDelete() *cobra.Command {
 	req.UHostId = cmd.Flags().String("resource-id", "", "ResourceID of the uhost instance( or UHostId)")
 	isDestory = cmd.Flags().Bool("destory", false, "false,the uhost instance will be thrown to UHost recycle If you have permission; true,the uhost instance will be deleted directly")
 	isEipReleased = cmd.Flags().Bool("eip-released", false, "false,Unbind EIP only; true, Unbind EIP and release it")
+	cmd.Flags().SetFlagValues("destory", "true", "false")
+	cmd.Flags().SetFlagValues("eip-released", "true", "false")
 	cmd.MarkFlagRequired("resource-id")
 
 	return cmd
@@ -248,12 +297,7 @@ func NewCmdUHostStop() *cobra.Command {
 		Short: "Shut down uhost instance",
 		Long:  "Shut down uhost instance",
 		Run: func(cmd *cobra.Command, args []string) {
-			resp, err := BizClient.StopUHostInstance(req)
-			if err != nil {
-				HandleError(err)
-			} else {
-				Cxt.Printf("UHost:[%v] is shuting down. Wait a moment\n", resp.UhostId)
-			}
+			stopUhostIns(req)
 		},
 	}
 	req.ProjectId = cmd.Flags().String("project-id", ConfigInstance.ProjectID, "Assign project-id")
@@ -265,6 +309,19 @@ func NewCmdUHostStop() *cobra.Command {
 	return cmd
 }
 
+func stopUhostIns(req *uhost.StopUHostInstanceRequest) {
+	resp, err := BizClient.StopUHostInstance(req)
+	if err != nil {
+		HandleError(err)
+	} else {
+		text := fmt.Sprintf("UHost:[%v] is shuting down", resp.UhostId)
+		done := poll(resp.UhostId, *req.ProjectId, *req.Region, *req.Zone, "Stopped")
+		ux.DotSpinner.Start(text)
+		<-done
+		ux.DotSpinner.Stop()
+	}
+}
+
 //NewCmdUHostStart ucloud uhost start
 func NewCmdUHostStart() *cobra.Command {
 	req := BizClient.NewStartUHostInstanceRequest()
@@ -278,7 +335,11 @@ func NewCmdUHostStart() *cobra.Command {
 			if err != nil {
 				HandleError(err)
 			} else {
-				Cxt.Printf("UHost:[%v] is starting. Wait a moment\n", resp.UhostId)
+				text := fmt.Sprintf("UHost:[%v] is starting", resp.UhostId)
+				done := poll(resp.UhostId, *req.ProjectId, *req.Region, *req.Zone, "Running")
+				ux.DotSpinner.Start(text)
+				<-done
+				ux.DotSpinner.Stop()
 			}
 		},
 	}
@@ -304,7 +365,11 @@ func NewCmdUHostReboot() *cobra.Command {
 			if err != nil {
 				HandleError(err)
 			} else {
-				Cxt.Printf("UHost:[%v] is restarting. Wait a moment\n", resp.UhostId)
+				text := fmt.Sprintf("UHost:[%v] is restarting", resp.UhostId)
+				done := poll(resp.UhostId, *req.ProjectId, *req.Region, *req.Zone, "Running")
+				ux.DotSpinner.Start(text)
+				<-done
+				ux.DotSpinner.Stop()
 			}
 		},
 	}
@@ -382,3 +447,52 @@ func NewCmdUHostScale() *cobra.Command {
 	cmd.MarkFlagRequired("resource-id")
 	return cmd
 }
+
+func poll(uhostID, projectID, region, zone string, targetState string) chan bool {
+	w := waiter.StateWaiter{
+		Pending: []string{"pending"},
+		Target:  []string{"avaliable"},
+		Refresh: func() (interface{}, string, error) {
+			inst, err := describeUHostByID(uhostID, projectID, region, zone)
+			if err != nil {
+				return nil, "", err
+			}
+
+			if inst == nil || inst.State != targetState {
+				return nil, "pending", nil
+			}
+
+			return inst, "avaliable", nil
+		},
+		Timeout: 5 * time.Minute,
+	}
+
+	done := make(chan bool)
+	go func() {
+		if resp, err := w.Wait(); err != nil {
+			log.Error(err)
+		} else {
+			log.Infof("%#v", resp)
+		}
+		done <- true
+	}()
+	return done
+}
+
+func describeUHostByID(uhostID, projectID, region, zone string) (*uhost.UHostInstanceSet, error) {
+	req := BizClient.NewDescribeUHostInstanceRequest()
+	req.UHostIds = []string{uhostID}
+	req.ProjectId = &projectID
+	req.Region = &region
+	req.Zone = &zone
+
+	resp, err := BizClient.DescribeUHostInstance(req)
+	if err != nil {
+		return nil, err
+	}
+	if len(resp.UHostSet) < 1 {
+		return nil, nil
+	}
+
+	return &resp.UHostSet[0], nil
+}