Skip to content

Commit 1c3035e

Browse files
stepanblyschakssithaia-ebay
stepanblyschak
authored and
ssithaia-ebay
committed
Aggregate L3 errors with L2 discards for interfaces with RIF (sonic-net#325)
Signed-off-by: Stepan Blyschak <stepanb@nvidia.com>
1 parent ae49772 commit 1c3035e

6 files changed

Lines changed: 276 additions & 62 deletions

File tree

‎src/sonic_ax_impl/mibs/__init__.py‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,15 +33,15 @@
3333
RIF_COUNTERS_AGGR_MAP = {
3434
"SAI_PORT_STAT_IF_IN_OCTETS": "SAI_ROUTER_INTERFACE_STAT_IN_OCTETS",
3535
"SAI_PORT_STAT_IF_IN_UCAST_PKTS": "SAI_ROUTER_INTERFACE_STAT_IN_PACKETS",
36-
"SAI_PORT_STAT_IF_IN_ERRORS": "SAI_ROUTER_INTERFACE_STAT_IN_ERROR_PACKETS",
36+
"SAI_PORT_STAT_IF_IN_DISCARDS": "SAI_ROUTER_INTERFACE_STAT_IN_ERROR_PACKETS",
3737
"SAI_PORT_STAT_IF_OUT_OCTETS": "SAI_ROUTER_INTERFACE_STAT_OUT_OCTETS",
3838
"SAI_PORT_STAT_IF_OUT_UCAST_PKTS": "SAI_ROUTER_INTERFACE_STAT_OUT_PACKETS",
39-
"SAI_PORT_STAT_IF_OUT_ERRORS": "SAI_ROUTER_INTERFACE_STAT_OUT_ERROR_PACKETS"
39+
"SAI_PORT_STAT_IF_OUT_DISCARDS": "SAI_ROUTER_INTERFACE_STAT_OUT_ERROR_PACKETS"
4040
}
4141

4242
RIF_DROPS_AGGR_MAP = {
43-
"SAI_PORT_STAT_IF_IN_ERRORS": "SAI_ROUTER_INTERFACE_STAT_IN_ERROR_PACKETS",
44-
"SAI_PORT_STAT_IF_OUT_ERRORS": "SAI_ROUTER_INTERFACE_STAT_OUT_ERROR_PACKETS"
43+
"SAI_PORT_STAT_IF_IN_DISCARDS": "SAI_ROUTER_INTERFACE_STAT_IN_ERROR_PACKETS",
44+
"SAI_PORT_STAT_IF_OUT_DISCARDS": "SAI_ROUTER_INTERFACE_STAT_OUT_ERROR_PACKETS"
4545
}
4646

4747
redis_kwargs = {'unix_socket_path': '/var/run/redis/redis.sock'}
@@ -231,7 +231,7 @@ def init_db():
231231
:return: db_conn
232232
"""
233233
Namespace.init_sonic_db_config()
234-
234+
235235
# SyncD database connector. THIS MUST BE INITIALIZED ON A PER-THREAD BASIS.
236236
# Redis PubSub objects (such as those within swsscommon) are NOT thread-safe.
237237
db_conn = SonicV2Connector(**redis_kwargs)
@@ -575,7 +575,7 @@ def init_namespace_dbs():
575575
db_conn = []
576576
Namespace.init_sonic_db_config()
577577
host_namespace_idx = 0
578-
for idx, namespace in enumerate(SonicDBConfig.get_ns_list()):
578+
for idx, namespace in enumerate(SonicDBConfig.get_ns_list()):
579579
if namespace == multi_asic.DEFAULT_NAMESPACE:
580580
host_namespace_idx = idx
581581
db = SonicV2Connector(use_unix_socket_path=True, namespace=namespace)

‎tests/mock_tables/asic0/counters_db.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@
216216
"SAI_PORT_STAT_IF_IN_ERRORS": "100",
217217
"SAI_PORT_STAT_ETHER_STATS_PKTS": "0",
218218
"SAI_PORT_STAT_ETHER_STATS_BROADCAST_PKTS": "0",
219-
"SAI_PORT_STAT_IF_IN_DISCARDS": "0",
219+
"SAI_PORT_STAT_IF_IN_DISCARDS": "8",
220220
"SAI_PORT_STAT_IP_OUT_DISCARDS": "0",
221221
"SAI_PORT_STAT_IF_IN_UNKNOWN_PROTOS": "0",
222222
"SAI_PORT_STAT_IPV6_IN_DISCARDS": "0",
@@ -241,7 +241,7 @@
241241
"SAI_PORT_STAT_IPV6_IN_UCAST_PKTS": "0",
242242
"SAI_PORT_STAT_IPV6_IN_RECEIVES": "0",
243243
"SAI_PORT_STAT_ETHER_STATS_PKTS_4096_TO_9216_OCTETS": "0",
244-
"SAI_PORT_STAT_IF_OUT_DISCARDS": "0",
244+
"SAI_PORT_STAT_IF_OUT_DISCARDS": "14",
245245
"SAI_PORT_STAT_ETHER_STATS_DROP_EVENTS": "0",
246246
"SAI_PORT_STAT_IPV6_OUT_MCAST_PKTS": "0",
247247
"SAI_PORT_STAT_ETHER_RX_OVERSIZE_PKTS": "0",

‎tests/mock_tables/asic1/counters_db.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -577,7 +577,7 @@
577577
"SAI_PORT_STAT_IF_IN_ERRORS": "100",
578578
"SAI_PORT_STAT_ETHER_STATS_PKTS": "0",
579579
"SAI_PORT_STAT_ETHER_STATS_BROADCAST_PKTS": "0",
580-
"SAI_PORT_STAT_IF_IN_DISCARDS": "0",
580+
"SAI_PORT_STAT_IF_IN_DISCARDS": "13",
581581
"SAI_PORT_STAT_IP_OUT_DISCARDS": "0",
582582
"SAI_PORT_STAT_IF_IN_UNKNOWN_PROTOS": "0",
583583
"SAI_PORT_STAT_IPV6_IN_DISCARDS": "0",
@@ -602,7 +602,7 @@
602602
"SAI_PORT_STAT_IPV6_IN_UCAST_PKTS": "0",
603603
"SAI_PORT_STAT_IPV6_IN_RECEIVES": "0",
604604
"SAI_PORT_STAT_ETHER_STATS_PKTS_4096_TO_9216_OCTETS": "0",
605-
"SAI_PORT_STAT_IF_OUT_DISCARDS": "0",
605+
"SAI_PORT_STAT_IF_OUT_DISCARDS": "15",
606606
"SAI_PORT_STAT_ETHER_STATS_DROP_EVENTS": "0",
607607
"SAI_PORT_STAT_IPV6_OUT_MCAST_PKTS": "0",
608608
"SAI_PORT_STAT_ETHER_RX_OVERSIZE_PKTS": "0",

‎tests/mock_tables/counters_db.json‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"SAI_PORT_STAT_IF_IN_ERRORS": "0",
1313
"SAI_PORT_STAT_ETHER_STATS_PKTS": "0",
1414
"SAI_PORT_STAT_ETHER_STATS_BROADCAST_PKTS": "0",
15-
"SAI_PORT_STAT_IF_IN_DISCARDS": "0",
15+
"SAI_PORT_STAT_IF_IN_DISCARDS": "5",
1616
"SAI_PORT_STAT_IP_OUT_DISCARDS": "0",
1717
"SAI_PORT_STAT_IF_IN_UNKNOWN_PROTOS": "0",
1818
"SAI_PORT_STAT_IPV6_IN_DISCARDS": "0",
@@ -37,7 +37,7 @@
3737
"SAI_PORT_STAT_IPV6_IN_UCAST_PKTS": "0",
3838
"SAI_PORT_STAT_IPV6_IN_RECEIVES": "0",
3939
"SAI_PORT_STAT_ETHER_STATS_PKTS_4096_TO_9216_OCTETS": "0",
40-
"SAI_PORT_STAT_IF_OUT_DISCARDS": "0",
40+
"SAI_PORT_STAT_IF_OUT_DISCARDS": "10",
4141
"SAI_PORT_STAT_ETHER_STATS_DROP_EVENTS": "0",
4242
"SAI_PORT_STAT_IPV6_OUT_MCAST_PKTS": "0",
4343
"SAI_PORT_STAT_ETHER_RX_OVERSIZE_PKTS": "0",
@@ -828,7 +828,7 @@
828828
"SAI_PORT_STAT_IF_IN_ERRORS": "100",
829829
"SAI_PORT_STAT_ETHER_STATS_PKTS": "0",
830830
"SAI_PORT_STAT_ETHER_STATS_BROADCAST_PKTS": "0",
831-
"SAI_PORT_STAT_IF_IN_DISCARDS": "0",
831+
"SAI_PORT_STAT_IF_IN_DISCARDS": "7",
832832
"SAI_PORT_STAT_IP_OUT_DISCARDS": "0",
833833
"SAI_PORT_STAT_IF_IN_UNKNOWN_PROTOS": "0",
834834
"SAI_PORT_STAT_IPV6_IN_DISCARDS": "0",
@@ -853,7 +853,7 @@
853853
"SAI_PORT_STAT_IPV6_IN_UCAST_PKTS": "0",
854854
"SAI_PORT_STAT_IPV6_IN_RECEIVES": "0",
855855
"SAI_PORT_STAT_ETHER_STATS_PKTS_4096_TO_9216_OCTETS": "0",
856-
"SAI_PORT_STAT_IF_OUT_DISCARDS": "0",
856+
"SAI_PORT_STAT_IF_OUT_DISCARDS": "11",
857857
"SAI_PORT_STAT_ETHER_STATS_DROP_EVENTS": "0",
858858
"SAI_PORT_STAT_IPV6_OUT_MCAST_PKTS": "0",
859859
"SAI_PORT_STAT_ETHER_RX_OVERSIZE_PKTS": "0",
@@ -3112,7 +3112,7 @@
31123112
"SAI_PORT_STAT_IF_IN_ERRORS": "100",
31133113
"SAI_PORT_STAT_ETHER_STATS_PKTS": "0",
31143114
"SAI_PORT_STAT_ETHER_STATS_BROADCAST_PKTS": "0",
3115-
"SAI_PORT_STAT_IF_IN_DISCARDS": "0",
3115+
"SAI_PORT_STAT_IF_IN_DISCARDS": "110",
31163116
"SAI_PORT_STAT_IP_OUT_DISCARDS": "0",
31173117
"SAI_PORT_STAT_IF_IN_UNKNOWN_PROTOS": "0",
31183118
"SAI_PORT_STAT_IPV6_IN_DISCARDS": "0",
@@ -3137,7 +3137,7 @@
31373137
"SAI_PORT_STAT_IPV6_IN_UCAST_PKTS": "0",
31383138
"SAI_PORT_STAT_IPV6_IN_RECEIVES": "0",
31393139
"SAI_PORT_STAT_ETHER_STATS_PKTS_4096_TO_9216_OCTETS": "0",
3140-
"SAI_PORT_STAT_IF_OUT_DISCARDS": "0",
3140+
"SAI_PORT_STAT_IF_OUT_DISCARDS": "120",
31413141
"SAI_PORT_STAT_ETHER_STATS_DROP_EVENTS": "0",
31423142
"SAI_PORT_STAT_IPV6_OUT_MCAST_PKTS": "0",
31433143
"SAI_PORT_STAT_ETHER_RX_OVERSIZE_PKTS": "0",

0 commit comments

Comments
 (0)