chore: use separate rows for ip and port in result

Signed-off-by: Tsong Lew <[email protected]>
opencurve · Nov 16, 2022 · 9a72037 · 9a72037
1 parent d03afff
commit 9a72037
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 10 deletions.
diff --git a/tools-v2/README.md b/tools-v2/README.md
@@ -854,11 +854,11 @@ curve bs list client
 Output:
 
 ```bash
-+-----------------+
-|      ADDR       |
-+-----------------+
-| 172.17.0.2:9000 |
-+-----------------+
++------------+------+
+|     IP     | PORT |
++------------+------+
+| 172.17.0.2 | 9000 |
++------------+------+
 ```
 
 ### query

diff --git a/tools-v2/internal/utils/row.go b/tools-v2/internal/utils/row.go
@@ -91,6 +91,8 @@ const (
 	ROW_USED            = "used"
 	ROW_VERSION         = "version"
 	ROW_ZONE            = "zone"
+	ROW_IP              = "ip"
+	ROW_PORT            = "port"
 
 	// s3
 	ROW_S3CHUNKINFO_CHUNKID = "s3ChunkId"

diff --git a/tools-v2/pkg/cli/command/curvebs/list/client/client.go b/tools-v2/pkg/cli/command/curvebs/list/client/client.go
@@ -25,7 +25,6 @@ package client
 import (
 	"context"
 	"fmt"
-
 	cmderror "github.com/opencurve/curve/tools-v2/internal/error"
 	cobrautil "github.com/opencurve/curve/tools-v2/internal/utils"
 	basecmd "github.com/opencurve/curve/tools-v2/pkg/cli/command"
@@ -103,10 +102,10 @@ func (pCmd *ClientCommand) Init(cmd *cobra.Command, args []string) error {
 	}
 	pCmd.Rpc = append(pCmd.Rpc, rpc)
 
-	header := []string{cobrautil.ROW_ADDR}
+	header := []string{cobrautil.ROW_IP, cobrautil.ROW_PORT}
 	pCmd.SetHeader(header)
 	pCmd.TableNew.SetAutoMergeCellsByColumnIndex(cobrautil.GetIndexSlice(
-		pCmd.Header, []string{cobrautil.ROW_ADDR},
+		pCmd.Header, header,
 	))
 	return nil
 }
@@ -135,12 +134,13 @@ func (pCmd *ClientCommand) RunCommand(cmd *cobra.Command, args []string) error {
 		infos := res.(*nameserver2.ListClientResponse).GetClientInfos()
 		for _, info := range infos {
 			row := make(map[string]string)
-			row[cobrautil.ROW_ADDR] = fmt.Sprintf("%s:%d", info.GetIp(), info.GetPort())
+			row[cobrautil.ROW_IP] = info.GetIp()
+			row[cobrautil.ROW_PORT] = fmt.Sprintf("%d", info.GetPort())
 			rows = append(rows, row)
 		}
 	}
 	list := cobrautil.ListMap2ListSortByKeys(rows, pCmd.Header, []string{
-		cobrautil.ROW_ADDR,
+		cobrautil.ROW_IP,
 	})
 	pCmd.TableNew.AppendBulk(list)
 	errRet := cmderror.MergeCmdError(errors)