Use global variable UnitTest as a flag to reinit

fabric counters if invoked during unit testing

Signed-off-by: Suvarna Meenakshi <[email protected]>

gnmi_server/server_test.go

@@ -4932,6 +4932,7 @@ func init() {
 
 	// Inform gNMI server to use redis tcp localhost connection
 	sdc.UseRedisLocalTcpPort = true
+	sdc.UnitTest = true
 }
 
 func TestMain(m *testing.M) {

sonic_data_client/virtual_db.go

@@ -69,6 +69,9 @@ var (
 	}
 )
 
+// Will be set to True due unit testing to reset COUNTERS_DB
+var UnitTest bool = false
+
 func (t *Trie) v2rTriePopulate() {
 	for _, pt := range pathTransFuncTbl {
 		n := t.Add(pt.path, pt.transFunc)
@@ -125,7 +128,9 @@ func initCountersPfcwdNameMap() error {
 }
 func initCountersFabricPortNameMap() error {
 	var err error
-	if len(countersFabricPortNameMap) == 0 {
+	// Reset map for Unit test to ensure that counters db is updated
+	// after changing from single to multi-asic config
+	if len(countersFabricPortNameMap) == 0 || UnitTest == true {
 		countersFabricPortNameMap, err = getFabricCountersMap("COUNTERS_FABRIC_PORT_NAME_MAP")
 		if err != nil {
 			return err
@@ -134,12 +139,6 @@ func initCountersFabricPortNameMap() error {
 	return nil
 }
 
-func ResetFabricCountersMap() {
-	// Added this to support modification from
-	// single to multi-ns in unit-test 
-	countersFabricPortNameMap = make(map[string]string)
-}
-
 // Get the mapping between sonic interface name and oids of their PFC-WD enabled queues in COUNTERS_DB
 func GetPfcwdMap() (map[string]map[string]string, error) {
 	var pfcwdName_map = make(map[string]map[string]string)

test_utils/test_utils.go

@@ -3,15 +3,13 @@ package test_utils
 import (
 	"io"
 	"os"
-	"github.com/sonic-net/sonic-gnmi/sonic_data_client"
 )
 
 func SetupMultiNamespace() error {
 	err := os.MkdirAll("/var/run/redis0/sonic-db/", 0755)
 	if err != nil {
 		return err
 	}
-	client.ResetFabricCountersMap()
 	srcFileName := [2]string{"../testdata/database_global.json", "../testdata/database_config_asic0.json"}
 	dstFileName := [2]string{"/var/run/redis/sonic-db/database_global.json", "/var/run/redis0/sonic-db/database_config_asic0.json"}
 	for i := 0; i < len(srcFileName); i++ {
@@ -103,7 +101,6 @@ func CleanUpMultiInstance() error {
 	if err != nil {
 		return err
 	}
-	client.ResetFabricCountersMap()
 	return nil
 }