From 5d3d8cde4b8f3c409871152573413029b19c03aa Mon Sep 17 00:00:00 2001 From: Sachin Holla Date: Tue, 4 Mar 2025 09:31:20 +0000 Subject: [PATCH] Remove sonic-db-cli dependency in cvl gotests --- cvl/cvl_test.go | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/cvl/cvl_test.go b/cvl/cvl_test.go index 8bbd400c8..73a540aa5 100644 --- a/cvl/cvl_test.go +++ b/cvl/cvl_test.go @@ -307,13 +307,16 @@ func clearDb() { "DSCP_TO_TC_MAP", } - for _, tbl := range tblList { - _, err := exec.Command("/bin/sh", "-c", - "sonic-db-cli CONFIG_DB del `sonic-db-cli CONFIG_DB keys '"+ - tbl+"|*' | cut -d ' ' -f 2`").Output() + rc := getConfigDbClient() + defer rc.Close() + for _, tbl := range tblList { + keys, err := rc.Keys(tbl + "|*").Result() + if err == nil && len(keys) != 0 { + _, err = rc.Del(keys...).Result() + } if err != nil { - fmt.Println(err.Error()) + fmt.Printf("Failed to clean %s: %s\n", tbl, err) } } }