shared bandwidth

Author: lixiaojun629

base/util.go

@@ -175,36 +175,48 @@ func displaySlice(listVal reflect.Value, fieldList []string) {
 	for i := 0; i < listVal.Len(); i++ {
 		elemVal := listVal.Index(i)
 		elemType := elemVal.Type()
-		row := make(map[string]interface{})
+		rows := []map[string]interface{}{}
 		for j := 0; j < elemVal.NumField(); j++ {
 			field := elemVal.Field(j)
 			fieldName := elemType.Field(j).Name
 			if _, ok := showFieldMap[fieldName]; ok {
-				row[fieldName] = field.Interface()
 				text := fmt.Sprintf("%v", field.Interface())
-				width := calcWidth(text)
-				if showFieldMap[fieldName] < width {
-					showFieldMap[fieldName] = width
+				cells := strings.Split(text, "\n")
+				for i, cell := range cells {
+					width := calcWidth(cell)
+					if showFieldMap[fieldName] < width {
+						showFieldMap[fieldName] = width
+					}
+					if len(rows) == i {
+						rows = append(rows, make(map[string]interface{}))
+					}
+					rows[i][fieldName] = cell
 				}
 			}
 		}
-		rowList = append(rowList, row)
+		rowList = append(rowList, rows...)
 	}
 	printTable(rowList, fieldList, showFieldMap)
 }
 
 func printTable(rowList []map[string]interface{}, fieldList []string, fieldWidthMap map[string]int) {
+	//打印表头
 	for _, field := range fieldList {
 		tmpl := "%-" + strconv.Itoa(fieldWidthMap[field]+GAP) + "s"
 		fmt.Printf(tmpl, field)
 	}
 	fmt.Printf("\n")
 
+	//打印数据
 	for _, row := range rowList {
 		for _, field := range fieldList {
 			cutWidth := calcCutWidth(fmt.Sprintf("%v", row[field]))
 			tmpl := "%-" + strconv.Itoa(fieldWidthMap[field]-cutWidth+GAP) + "v"
-			fmt.Printf(tmpl, row[field])
+			if row[field] != nil {
+				fmt.Printf(tmpl, row[field])
+			} else {
+				fmt.Printf(tmpl, "")
+			}
 		}
 		fmt.Printf("\n")
 	}

cmd/eip.go

@@ -27,6 +27,7 @@ import (
 	sdk "github.com/ucloud/ucloud-sdk-go/ucloud"
 
 	"github.com/ucloud/ucloud-cli/base"
+	"github.com/ucloud/ucloud-cli/model/status"
 )
 
 //NewCmdEIP ucloud eip
@@ -44,6 +45,8 @@ func NewCmdEIP() *cobra.Command {
 	cmd.AddCommand(NewCmdEIPUnbind())
 	cmd.AddCommand(NewCmdEIPModifyBandwidth())
 	cmd.AddCommand(NewCmdEIPSetChargeMode())
+	cmd.AddCommand(NewCmdEIPJoinSharedBW())
+	cmd.AddCommand(NewCmdEIPLeaveSharedBW())
 	return cmd
 }
 
@@ -440,3 +443,110 @@ func NewCmdEIPSetChargeMode() *cobra.Command {
 	cmd.MarkFlagRequired("charge-mode")
 	return cmd
 }
+
+//NewCmdEIPJoinSharedBW ucloud eip join-shared-bw
+func NewCmdEIPJoinSharedBW() *cobra.Command {
+	eipIDs := []string{}
+	req := base.BizClient.NewAssociateEIPWithShareBandwidthRequest()
+	cmd := &cobra.Command{
+		Use:   "join-shared-bw",
+		Short: "Join shared bandwidth",
+		Long:  "Join shared bandwidth",
+		Run: func(c *cobra.Command, args []string) {
+			for _, eip := range eipIDs {
+				req.EIPIds = append(req.EIPIds, base.PickResourceID(eip))
+			}
+			req.ShareBandwidthId = sdk.String(base.PickResourceID(*req.ShareBandwidthId))
+			_, err := base.BizClient.AssociateEIPWithShareBandwidth(req)
+			if err != nil {
+				base.HandleError(err)
+				return
+			}
+			base.Cxt.Printf("eip%v joined shared bandwidth[%s]\n", req.EIPIds, *req.ShareBandwidthId)
+		},
+	}
+	flags := cmd.Flags()
+	flags.SortFlags = false
+	flags.StringSliceVar(&eipIDs, "eip-id", nil, "Required. Resource ID of EIPs to join shared bandwdith")
+	req.ShareBandwidthId = flags.String("shared-bw-id", "", "Required. Resource ID of shared bandwidth to be joined")
+	req.Region = flags.String("region", base.ConfigInstance.Region, "Optional. Region, see 'ucloud region'")
+	req.ProjectId = flags.String("project-id", base.ConfigInstance.ProjectID, "Optional. Project-id, see 'ucloud project list'")
+	flags.SetFlagValuesFunc("eip-id", func() []string {
+		return getAllEip(*req.ProjectId, *req.Region, nil, []string{status.EIP_CHARGE_BANDWIDTH, status.EIP_CHARGE_TRAFFIC})
+	})
+	flags.SetFlagValuesFunc("shared-bw-id", func() []string {
+		list, _ := getAllSharedBW(*req.ProjectId, *req.Region)
+		return list
+	})
+	cmd.MarkFlagRequired("eip-id")
+	cmd.MarkFlagRequired("shared-bw-id")
+
+	return cmd
+}
+
+//NewCmdEIPLeaveSharedBW ucloud eip leave-shared-bw
+func NewCmdEIPLeaveSharedBW() *cobra.Command {
+	eipIDs := []string{}
+	req := base.BizClient.NewDisassociateEIPWithShareBandwidthRequest()
+	cmd := &cobra.Command{
+		Use:   "leave-shared-bw",
+		Short: "Leave shared bandwidth",
+		Long:  "Leave shared bandwidth",
+		Run: func(c *cobra.Command, args []string) {
+			if *req.ShareBandwidthId == "" {
+				for _, eipID := range eipIDs {
+					eipIns, err := getEIP(base.PickResourceID(eipID))
+					if err != nil {
+						base.HandleError(err)
+						continue
+					}
+					sharedBWID := eipIns.ShareBandwidthSet.ShareBandwidthId
+					if sharedBWID == "" {
+						base.Cxt.Printf("eip[%s] doesn't join any shared bandwidth\n", eipID)
+						continue
+					}
+					req.ShareBandwidthId = sdk.String(sharedBWID)
+					req.EIPIds = []string{base.PickResourceID(eipID)}
+					_, err = base.BizClient.DisassociateEIPWithShareBandwidth(req)
+					if err != nil {
+						base.HandleError(err)
+						continue
+					}
+					base.Cxt.Printf("eip[%s] left shared bandwidth[%s]\n", eipID, sharedBWID)
+				}
+			} else {
+				for _, id := range eipIDs {
+					req.EIPIds = append(req.EIPIds, base.PickResourceID(id))
+				}
+				*req.ShareBandwidthId = base.PickResourceID(*req.ShareBandwidthId)
+				_, err := base.BizClient.DisassociateEIPWithShareBandwidth(req)
+				if err != nil {
+					base.HandleError(err)
+					return
+				}
+				base.Cxt.Printf("eip%v left shared bandwidth[%s]\n", eipIDs, *req.ShareBandwidthId)
+			}
+		},
+	}
+	flags := cmd.Flags()
+	flags.SortFlags = false
+	flags.StringSliceVar(&eipIDs, "eip-id", nil, "Required. Resource ID of EIPs to leave shared bandwidth")
+	req.Bandwidth = flags.Int("bandwidth-mb", 1, "Required. Bandwidth of EIP after leaving shared bandwidth, ranging [1,300] for 'Traffic' charge mode, ranging [1,800] for 'Bandwidth' charge mode. Unit:Mb")
+	req.PayMode = flags.String("charge-mode", "Bandwidth", "Optional. Charge mode of the EIP after leaving shared bandwidth, 'Bandwidth' or 'Traffic'")
+	req.ShareBandwidthId = flags.String("shared-bw-id", "", "Optional. Resource ID of shared bandwidth instance, assign this flag to make the operation faster")
+	req.Region = flags.String("region", base.ConfigInstance.Region, "Optional. Region, see 'ucloud region'")
+	req.ProjectId = flags.String("project-id", base.ConfigInstance.ProjectID, "Optional. Project-id, see 'ucloud project list'")
+
+	flags.SetFlagValues("charge-mode", "Bandwidth", "Traffic")
+	flags.SetFlagValuesFunc("eip-id", func() []string {
+		return getAllEip(*req.ProjectId, *req.Region, nil, []string{status.EIP_CHARGE_SHARE})
+	})
+	flags.SetFlagValuesFunc("shared-bw-id", func() []string {
+		list, _ := getAllSharedBW(*req.ProjectId, *req.Region)
+		return list
+	})
+
+	cmd.MarkFlagRequired("bandwidth")
+	cmd.MarkFlagRequired("eip-id")
+	return cmd
+}

cmd/image.go

@@ -32,8 +32,8 @@ import (
 func NewCmdUImage() *cobra.Command {
 	cmd := &cobra.Command{
 		Use:   "image",
-		Short: "List images",
-		Long:  `List images`,
+		Short: "List and manipulate images",
+		Long:  `List and manipulate images`,
 		Args:  cobra.NoArgs,
 	}
 	writer := base.Cxt.GetWriter()

cmd/root.go

@@ -78,6 +78,7 @@ func NewCmdRoot() *cobra.Command {
 	cmd.AddCommand(NewCmdFirewall())
 	cmd.AddCommand(NewCmdDisk())
 	cmd.AddCommand(NewCmdBandwidthPkg())
+	cmd.AddCommand(NewCmdSharedBW())
 	return cmd
 }