Add v2r mapping for Fabric Counters in VoQ Chassis

sonic_data_client/db_client.go

@@ -609,6 +609,10 @@ func populateDbtablePath(prefix, path *gnmipb.Path, pathG2S *map[*gnmipb.Path][]
 		if err != nil {
 			return err
 		}
+        err = initCountersFabricPortNameMap()
+        if err != nil {
+            return err
+        }
 	}
 
 

sonic_data_client/virtual_db.go

@@ -44,6 +44,9 @@ var (
 	// SONiC interface name to their PFC-WD enabled queues, then to oid map
 	countersPfcwdNameMap = make(map[string]map[string]string)
 
+	// SONiC interface name to their Fabric port name map, then to oid map
+	countersFabricPortNameMap = make(map[string]string)
+
 	// path2TFuncTbl is used to populate trie tree which is reponsible
 	// for virtual path to real data path translation
 	pathTransFuncTbl = []pathTransFunc{
@@ -59,7 +62,10 @@ var (
 		}, { // PFC WD stats for one or all Ethernet ports
 			path:      []string{"COUNTERS_DB", "COUNTERS", "Ethernet*", "Pfcwd"},
 			transFunc: v2rTranslate(v2rEthPortPfcwdStats),
-		},
+		}, { // stats for one or all Fabric ports
+                        path:      []string{"COUNTERS_DB", "COUNTERS", "PORT*"},
+                        transFunc: v2rTranslate(v2rFabricPortStats),
+                },
 	}
 )
 
@@ -117,6 +123,17 @@ func initCountersPfcwdNameMap() error {
 	}
 	return nil
 }
+func initCountersFabricPortNameMap() error {
+        var err error
+		fmt.Errorf("in initCountersFabricPortNameMap")
+        if len(countersFabricPortNameMap) == 0 {
+                countersFabricPortNameMap, err = getFabricCountersMap("COUNTERS_FABRIC_PORT_NAME_MAP")
+                if err != nil {
+                        return err
+                }
+        }
+        return nil
+}
 
 // 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) {
@@ -284,6 +301,85 @@ func getCountersMap(tableName string) (map[string]string, error) {
 	return counter_map, nil
 }
 
+
+// Get the mapping between objects in counters DB, Ex. port name to oid in "COUNTERS_PORT_NAME_MAP" table.
+// Aussuming static port name to oid map in COUNTERS table
+func getFabricCountersMap(tableName string) (map[string]string, error) {
+	counter_map := make(map[string]string)
+	dbName := "COUNTERS_DB"
+	redis_client_map, err := GetRedisClientsForDb(dbName)
+	if err != nil {
+                return nil, err
+	}
+	for namespace, redisDb := range redis_client_map {
+		fv, err := redisDb.HGetAll(tableName).Result()
+		if err != nil {
+			log.V(2).Infof("redis HGetAll failed for COUNTERS_DB in namespace %v, tableName: %s", namespace, tableName)
+			return nil, err
+		}
+		namespaceFv := make(map[string]string)
+		for k, v := range fv {
+			var namespace_str = ""
+            if len(namespace) != 0 {
+                namespace_str = string('-') + namespace
+            }
+			namespaceFv[k + namespace_str] = v
+		}
+		addmap(counter_map, namespaceFv)
+		log.V(6).Infof("tableName: %s in namespace %v, map %v", tableName, namespace, namespaceFv)
+	}
+	return counter_map, nil
+}
+
+// Populate real data paths from paths like
+// [COUNTER_DB COUNTERS Ethernet*] or [COUNTER_DB COUNTERS Ethernet68]
+func v2rFabricPortStats(paths []string) ([]tablePath, error) {
+	var tblPaths []tablePath
+	fmt.Errorf("in v2rFabricPortStats")
+	if strings.HasSuffix(paths[KeyIdx], "*") { // All Ethernet ports
+		for port, oid := range countersFabricPortNameMap {
+			var namespace string
+			if strings.Contains(port, "-"){
+			    namespace = strings.Split(port, "-")[1]
+			} else {
+				namespace = ""
+			}
+			separator, _ := GetTableKeySeparator(paths[DbIdx], namespace)
+			tblPath := tablePath{
+				dbNamespace:  namespace,
+				dbName:       paths[DbIdx],
+				tableName:    paths[TblIdx],
+				tableKey:     oid,
+				delimitor:    separator,
+				jsonTableKey: port,
+			}
+			tblPaths = append(tblPaths, tblPath)
+		}
+	} else { //single port
+		var port, namespace string
+		port = paths[KeyIdx]
+		oid, ok := countersFabricPortNameMap[port]
+		if !ok {
+			return nil, fmt.Errorf("%v not a valid sonic fabric interface.", port)
+		}
+		if strings.Contains(port, "-"){
+			namespace = strings.Split(port, "-")[1]
+		} else {
+			namespace = ""
+		}
+		separator, _ := GetTableKeySeparator(paths[DbIdx], namespace)
+		tblPaths = []tablePath{{
+			dbNamespace: namespace,
+			dbName:      paths[DbIdx],
+			tableName:   paths[TblIdx],
+			tableKey:    oid,
+			delimitor:   separator,
+		}}
+	}
+	log.V(6).Infof("v2rFabricPortStats: %v", tblPaths)
+	return tblPaths, nil
+}
+
 // Populate real data paths from paths like
 // [COUNTER_DB COUNTERS Ethernet*] or [COUNTER_DB COUNTERS Ethernet68]
 func v2rEthPortStats(paths []string) ([]tablePath, error) {