Add v2r mapping for Fabric Counters in VoQ Chassis #341

SuvarnaMeenakshi · 2025-01-21T19:05:21Z

Why I did it

In order to retrieve Fabric Counters using Streaming telemetry, the COUNTERS_FABRIC_PORT_NAME_MAP table in COUNTERS_DB has to be queried first to get PORT name to OID mapping, then COUNTERS:oid:<> table in COUNTERS_DB has to be queried to get the Fabric Counters.
To make the retrieval easy, changes are made in this PR to add v2r mapping for Fabric Counters in Packet Chassis similar to Ethernet interface counters. Reference [multi-asic] Added Support for multi-asic for telemetry/gnmi server sonic-telemetry#77
2 The Fabric counters Port name is unique within a given asic namespace and is not unique across a linecard. For example, there will be a port named PORT0 in asic0 and PORT0 in asic1 namespace as well. In order to make this unique across a multi-asic linecard, this PR appends asic namespace in the interface name. For example, PORT0 in asic0 will be called "PORT0-asic0".

How I did it

Add v2r mapping support to read all ports from COUNTERS_FABRIC_PORT_NAME_MAP so that Streaming telemetry can query using Fabric port name and COUNTERS_DB.
Modify the Fabric Port name by appending Asic namespace.
Add unit-test
Modify clean up and set up multi namespace to reset countersFabricPortNameMap so that the port map is re-initialized when changing from single to multi- namespace in unit-test

How to verify it

Verified on a multi-asic linecard:

gnmi_get -target_addr localhost:50051 -xpath COUNTERS/PORT0-asic0 -xpath_target COUNTERS_DB -insecure            
== getRequest:
prefix: <
  target: "COUNTERS_DB"
>
path: <
  elem: <
    name: "COUNTERS"
  >
  elem: <
    name: "PORT0-asic0"
  >
>
encoding: JSON_IETF

== getResponse:
notification: <
  timestamp: 1737484675266818454
  prefix: <
    target: "COUNTERS_DB"
  >
  update: <
    path: <
      elem: <
        name: "COUNTERS"
      >
      elem: <
        name: "PORT0-asic0"
      >
    >
    val: <
      json_ietf_val: "{\"SAI_PORT_STAT_IF_IN_ERRORS\":\"0\",\"SAI_PORT_STAT_IF_IN_FABRIC_DATA_UNITS\":\"0\",\"SAI_PORT_STAT_IF_IN_FEC_CORRECTABLE_FRAMES\":\"0\",\"SAI_PORT_STAT_IF_IN_FEC_NOT_CORRECTABLE_FRAMES\":\"0\",\"SAI_PORT_STAT_IF_IN_FEC_SYMBOL_ERRORS\":\"0\",\"SAI_PORT_STAT_IF_IN_OCTETS\":\"0\",\"SAI_PORT_STAT_IF_OUT_FABRIC_DATA_UNITS\":\"0\",\"SAI_PORT_STAT_IF_OUT_OCTETS\":\"0\"}"
    >
  >
>

Verified on single asic Linecard:

gnmi_get -target_addr localhost:50051 -xpath COUNTERS/PORT0   -xpath_target COUNTERS_DB -insecure 
== getRequest:
prefix: <
  target: "COUNTERS_DB"
>
path: <
  elem: <
    name: "COUNTERS"
  >
  elem: <
    name: "PORT0"
  >
>
encoding: JSON_IETF

== getResponse:
notification: <
  timestamp: 1737567049704926166
  prefix: <
    target: "COUNTERS_DB"
  >
  update: <
    path: <
      elem: <
        name: "COUNTERS"
      >
      elem: <
        name: "PORT0"
      >
    >
    val: <
      json_ietf_val: "{\"SAI_PORT_STAT_IF_IN_ERRORS\":\"0\",\"SAI_PORT_STAT_IF_IN_FABRIC_DATA_UNITS\":\"181562945\",\"SAI_PORT_STAT_IF_IN_FEC_CORRECTABLE_FRAMES\":\"0\",\"SAI_PORT_STAT_IF_IN_FEC_NOT_CORRECTABLE_FRAMES\":\"0\",\"SAI_PORT_STAT_IF_IN_FEC_SYMBOL_ERRORS\":\"0\",\"SAI_PORT_STAT_IF_IN_OCTETS\":\"40499614075\",\"SAI_PORT_STAT_IF_OUT_FABRIC_DATA_UNITS\":\"11152\",\"SAI_PORT_STAT_IF_OUT_OCTETS\":\"2588370\"}"
    >
  >
>

gnmi_get -target_addr localhost:50051 -xpath COUNTERS/PORT*   -xpath_target COUNTERS_DB -insecure

Verified on Pizza box to ensure no error log is seen.

Which release branch to backport (provide reason below if selected)

Description for the changelog

Link to config_db schema for YANG module changes

A picture of a cute animal (not mandatory but encouraged)

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

to form unique port name within a linecard module Signed-off-by: Suvarna Meenakshi <[email protected]>

mssonicbld · 2025-01-21T19:05:24Z

/azp run

azure-pipelines · 2025-01-21T19:05:35Z

Azure Pipelines successfully started running 1 pipeline(s).

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

mssonicbld · 2025-01-22T17:33:24Z

/azp run

azure-pipelines · 2025-01-22T17:33:35Z

Azure Pipelines successfully started running 1 pipeline(s).

sonic_data_client/db_client.go

abdosi · 2025-01-22T17:36:52Z

sonic_data_client/virtual_db.go

+			var namespace_str = ""
+            if len(namespace) != 0 {
+                namespace_str = string('-') + namespace
+            }


can we add some comment what are we doing here.

added comments

sonic_data_client/virtual_db.go

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

mssonicbld · 2025-01-30T01:54:32Z

/azp run

azure-pipelines · 2025-01-30T01:54:42Z

Azure Pipelines successfully started running 1 pipeline(s).

This reverts commit e90e6cd.

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

mssonicbld · 2025-01-30T02:02:52Z

/azp run

azure-pipelines · 2025-01-30T02:03:02Z

Azure Pipelines successfully started running 1 pipeline(s).

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

mssonicbld · 2025-01-30T02:19:32Z

/azp run

azure-pipelines · 2025-01-30T02:19:41Z

Azure Pipelines successfully started running 1 pipeline(s).

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

azure-pipelines · 2025-01-30T23:53:15Z

Azure Pipelines successfully started running 1 pipeline(s).

abdosi

lgtm

fabric counters if invoked during unit testing Signed-off-by: Suvarna Meenakshi <[email protected]>

mssonicbld · 2025-02-05T02:10:59Z

/azp run

azure-pipelines · 2025-02-05T02:11:09Z

Azure Pipelines successfully started running 1 pipeline(s).

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

mssonicbld · 2025-02-05T07:24:47Z

/azp run

azure-pipelines · 2025-02-05T07:24:57Z

Azure Pipelines successfully started running 1 pipeline(s).

SuvarnaMeenakshi · 2025-02-05T18:56:38Z

/azp run

azure-pipelines · 2025-02-05T18:56:48Z

Azure Pipelines successfully started running 1 pipeline(s).

sonic_data_client/db_client.go

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

mssonicbld · 2025-02-07T23:49:26Z

/azp run

azure-pipelines · 2025-02-07T23:49:37Z

Azure Pipelines successfully started running 1 pipeline(s).

rlhui · 2025-02-08T04:04:20Z

this is not for packet chassis right?

SuvarnaMeenakshi · 2025-02-10T19:50:18Z

this is not for packet chassis right?

yes, it is only for VoQ chassis, corrected the title to reflect the same

zbud-msft

Discussed with @SuvarnaMeenakshi, sonic-mgmt testcase will be added as follow-up

rlhui · 2025-02-12T06:13:25Z

@SuvarnaMeenakshi , we'll need this for 202411 as well. Thanks.

mssonicbld · 2025-02-19T18:25:54Z

Cherry-pick PR to 202411: #365

SuvarnaMeenakshi added 3 commits January 15, 2025 21:50

Add multi-asic support for Fabric port counters

8ff0269

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

Modify Fabric port name to append asic namespace

316a491

to form unique port name within a linecard module Signed-off-by: Suvarna Meenakshi <[email protected]>

Merge remote-tracking branch 'origin/master' into fabric_masic

76314e3

SuvarnaMeenakshi requested review from abdosi and zbud-msft January 21, 2025 19:05

SuvarnaMeenakshi requested a review from arlakshm January 21, 2025 19:05

Modify to work for single asic linecard

65187b8

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

abdosi reviewed Jan 22, 2025

View reviewed changes

sonic_data_client/db_client.go Outdated Show resolved Hide resolved

abdosi reviewed Jan 22, 2025

View reviewed changes

sonic_data_client/virtual_db.go Show resolved Hide resolved

SuvarnaMeenakshi added Request for 202405 Branch and removed Request for 202405 Branch labels Jan 22, 2025

rlhui assigned SuvarnaMeenakshi Jan 29, 2025

rlhui added the P0 label Jan 29, 2025

Add unit-test

e90e6cd

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

SuvarnaMeenakshi added 2 commits January 30, 2025 01:56

Revert "Add unit-test"

3246434

This reverts commit e90e6cd.

Add unit test

728c3d9

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

SuvarnaMeenakshi added 2 commits January 30, 2025 02:09

Fix whitespace

4555836

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

Fix white space add comment as per review comment

583707b

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

Remove debug prints

c3fa03d

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

abdosi previously approved these changes Jan 31, 2025

View reviewed changes

Use global variable UnitTest as a flag to reinit

812b1d0

fabric counters if invoked during unit testing Signed-off-by: Suvarna Meenakshi <[email protected]>

SuvarnaMeenakshi dismissed abdosi’s stale review via 812b1d0 February 5, 2025 02:10

Modify to use environment variable to specify unit test

d7b74a5

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

abdosi previously approved these changes Feb 6, 2025

View reviewed changes

zbud-msft reviewed Feb 7, 2025

View reviewed changes

sonic_data_client/db_client.go Outdated Show resolved Hide resolved

Fix as per review comment

d3261f6

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

SuvarnaMeenakshi dismissed abdosi’s stale review via d3261f6 February 7, 2025 23:49

SuvarnaMeenakshi changed the title ~~Add v2r mapping for Fabric Counters in Packet Chassis~~ Add v2r mapping for Fabric Counters in VoQ Chassis Feb 10, 2025

zbud-msft approved these changes Feb 10, 2025

View reviewed changes

SuvarnaMeenakshi merged commit 22f767f into sonic-net:master Feb 10, 2025
5 checks passed

SuvarnaMeenakshi added the Request for 202411 Branch label Feb 19, 2025

kperumalbfn added the Approved for 202411 Branch label Feb 19, 2025

mssonicbld mentioned this pull request Feb 19, 2025

[action] [PR:341] Add v2r mapping for Fabric Counters in VoQ Chassis #365

Merged

6 tasks

mssonicbld added the Created PR to 202411 Branch label Feb 19, 2025

mssonicbld added Included in 202411 Branch and removed Created PR to 202411 Branch labels Feb 19, 2025

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add v2r mapping for Fabric Counters in VoQ Chassis #341

Add v2r mapping for Fabric Counters in VoQ Chassis #341

SuvarnaMeenakshi commented Jan 21, 2025 •

edited

Loading

mssonicbld commented Jan 21, 2025

azure-pipelines bot commented Jan 21, 2025

mssonicbld commented Jan 22, 2025

azure-pipelines bot commented Jan 22, 2025

abdosi Jan 22, 2025

SuvarnaMeenakshi Jan 30, 2025

mssonicbld commented Jan 30, 2025

azure-pipelines bot commented Jan 30, 2025

mssonicbld commented Jan 30, 2025

azure-pipelines bot commented Jan 30, 2025

mssonicbld commented Jan 30, 2025

azure-pipelines bot commented Jan 30, 2025

azure-pipelines bot commented Jan 30, 2025

abdosi left a comment

mssonicbld commented Feb 5, 2025

azure-pipelines bot commented Feb 5, 2025

mssonicbld commented Feb 5, 2025

azure-pipelines bot commented Feb 5, 2025

SuvarnaMeenakshi commented Feb 5, 2025

azure-pipelines bot commented Feb 5, 2025

mssonicbld commented Feb 7, 2025

azure-pipelines bot commented Feb 7, 2025

rlhui commented Feb 8, 2025

SuvarnaMeenakshi commented Feb 10, 2025

zbud-msft left a comment

rlhui commented Feb 12, 2025

mssonicbld commented Feb 19, 2025

Add v2r mapping for Fabric Counters in VoQ Chassis #341

Add v2r mapping for Fabric Counters in VoQ Chassis #341

Conversation

SuvarnaMeenakshi commented Jan 21, 2025 • edited Loading

Why I did it

How I did it

How to verify it

Which release branch to backport (provide reason below if selected)

Description for the changelog

Link to config_db schema for YANG module changes

A picture of a cute animal (not mandatory but encouraged)

mssonicbld commented Jan 21, 2025

azure-pipelines bot commented Jan 21, 2025

mssonicbld commented Jan 22, 2025

azure-pipelines bot commented Jan 22, 2025

abdosi Jan 22, 2025

Choose a reason for hiding this comment

SuvarnaMeenakshi Jan 30, 2025

Choose a reason for hiding this comment

mssonicbld commented Jan 30, 2025

azure-pipelines bot commented Jan 30, 2025

mssonicbld commented Jan 30, 2025

azure-pipelines bot commented Jan 30, 2025

mssonicbld commented Jan 30, 2025

azure-pipelines bot commented Jan 30, 2025

azure-pipelines bot commented Jan 30, 2025

abdosi left a comment

Choose a reason for hiding this comment

mssonicbld commented Feb 5, 2025

azure-pipelines bot commented Feb 5, 2025

mssonicbld commented Feb 5, 2025

azure-pipelines bot commented Feb 5, 2025

SuvarnaMeenakshi commented Feb 5, 2025

azure-pipelines bot commented Feb 5, 2025

mssonicbld commented Feb 7, 2025

azure-pipelines bot commented Feb 7, 2025

rlhui commented Feb 8, 2025

SuvarnaMeenakshi commented Feb 10, 2025

zbud-msft left a comment

Choose a reason for hiding this comment

rlhui commented Feb 12, 2025

mssonicbld commented Feb 19, 2025

SuvarnaMeenakshi commented Jan 21, 2025 •

edited

Loading