From 34a66f2ed929d0b36ff39891439599a7b8347d62 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BA=86=E9=98=94=E4=BB=A5?= Date: Mon, 30 Oct 2023 15:57:27 +0800 Subject: [PATCH] add the default value MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 了阔以 --- tools-v2/pkg/cli/command/curvebs/list/snapshot/snapshot.go | 4 +++- tools-v2/pkg/config/bs.go | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/tools-v2/pkg/cli/command/curvebs/list/snapshot/snapshot.go b/tools-v2/pkg/cli/command/curvebs/list/snapshot/snapshot.go index da9927c2ca..79957c811e 100644 --- a/tools-v2/pkg/cli/command/curvebs/list/snapshot/snapshot.go +++ b/tools-v2/pkg/cli/command/curvebs/list/snapshot/snapshot.go @@ -112,11 +112,13 @@ func (sCmd *SnapShotCommand) RunCommand(cmd *cobra.Command, args []string) error cobrautil.QueryAction: cobrautil.ActionGetFileSnapshotList, cobrautil.QueryVersion: cobrautil.Version, cobrautil.QueryUser: sCmd.user, - cobrautil.QueryUUID: sCmd.uuid, cobrautil.QueryFile: sCmd.file, cobrautil.QueryLimit: cobrautil.Limit, cobrautil.QueryOffset: cobrautil.Offset, } + if sCmd.uuid != "*" { + params[cobrautil.QueryUUID] = sCmd.uuid + } snapshotsInfo, err := ListSnapShot(sCmd.snapshotAddrs, sCmd.timeout, params) if err != nil { sCmd.Error = err diff --git a/tools-v2/pkg/config/bs.go b/tools-v2/pkg/config/bs.go index 27af198fbe..75e1dddefa 100644 --- a/tools-v2/pkg/config/bs.go +++ b/tools-v2/pkg/config/bs.go @@ -144,6 +144,7 @@ const ( VIPER_CURVEBS_TASKID = "curvebs.taskid" CURVEBS_SNAPSHOT_ID = "snapshotid" VIPER_CURVEBS_SNAPSHOT_ID = "curvebs.snapshotqid" + CURVEBS_DEFAULT_SNAPSHOT_ID = "*" CURVEBS_FAILED = "failed" VIPER_CURVEBS_FAILED = "curvebs.failed" ) @@ -224,6 +225,7 @@ var ( CURVEBS_ALL: CURVEBS_DEFAULT_ALL, CURVEBS_LOGIC_POOL_ID: CURVEBS_DEFAULT_LOGIC_POOL_ID, CURVEBS_COPYSET_ID: CURVEBS_DEFAULT_COPYSET_ID, + CURVEBS_SNAPSHOT_ID: CURVEBS_DEFAULT_SNAPSHOT_ID, } )