Aggregate L3 errors with L2 discards for interfaces with RIF (#325)

Signed-off-by: Stepan Blyschak <stepanb@nvidia.com>

src/sonic_ax_impl/mibs/__init__.py

@@ -33,15 +33,15 @@
 RIF_COUNTERS_AGGR_MAP = {
     "SAI_PORT_STAT_IF_IN_OCTETS": "SAI_ROUTER_INTERFACE_STAT_IN_OCTETS",
     "SAI_PORT_STAT_IF_IN_UCAST_PKTS": "SAI_ROUTER_INTERFACE_STAT_IN_PACKETS",
-    "SAI_PORT_STAT_IF_IN_ERRORS": "SAI_ROUTER_INTERFACE_STAT_IN_ERROR_PACKETS",
+    "SAI_PORT_STAT_IF_IN_DISCARDS": "SAI_ROUTER_INTERFACE_STAT_IN_ERROR_PACKETS",
     "SAI_PORT_STAT_IF_OUT_OCTETS": "SAI_ROUTER_INTERFACE_STAT_OUT_OCTETS",
     "SAI_PORT_STAT_IF_OUT_UCAST_PKTS": "SAI_ROUTER_INTERFACE_STAT_OUT_PACKETS",
-    "SAI_PORT_STAT_IF_OUT_ERRORS": "SAI_ROUTER_INTERFACE_STAT_OUT_ERROR_PACKETS"
+    "SAI_PORT_STAT_IF_OUT_DISCARDS": "SAI_ROUTER_INTERFACE_STAT_OUT_ERROR_PACKETS"
 }
 
 RIF_DROPS_AGGR_MAP = {
-    "SAI_PORT_STAT_IF_IN_ERRORS": "SAI_ROUTER_INTERFACE_STAT_IN_ERROR_PACKETS",
-    "SAI_PORT_STAT_IF_OUT_ERRORS": "SAI_ROUTER_INTERFACE_STAT_OUT_ERROR_PACKETS"
+    "SAI_PORT_STAT_IF_IN_DISCARDS": "SAI_ROUTER_INTERFACE_STAT_IN_ERROR_PACKETS",
+    "SAI_PORT_STAT_IF_OUT_DISCARDS": "SAI_ROUTER_INTERFACE_STAT_OUT_ERROR_PACKETS"
 }
 
 redis_kwargs = {'unix_socket_path': '/var/run/redis/redis.sock'}
@@ -231,7 +231,7 @@ def init_db():
     :return: db_conn
     """
     Namespace.init_sonic_db_config()
-    
+
     # SyncD database connector. THIS MUST BE INITIALIZED ON A PER-THREAD BASIS.
     # Redis PubSub objects (such as those within swsscommon) are NOT thread-safe.
     db_conn = SonicV2Connector(**redis_kwargs)
@@ -575,7 +575,7 @@ def init_namespace_dbs():
         db_conn = []
         Namespace.init_sonic_db_config()
         host_namespace_idx = 0
-        for idx, namespace in enumerate(SonicDBConfig.get_ns_list()): 
+        for idx, namespace in enumerate(SonicDBConfig.get_ns_list()):
             if namespace == multi_asic.DEFAULT_NAMESPACE:
                 host_namespace_idx = idx
             db = SonicV2Connector(use_unix_socket_path=True, namespace=namespace)

tests/mock_tables/asic0/counters_db.json

@@ -216,7 +216,7 @@
     "SAI_PORT_STAT_IF_IN_ERRORS": "100",
     "SAI_PORT_STAT_ETHER_STATS_PKTS": "0",
     "SAI_PORT_STAT_ETHER_STATS_BROADCAST_PKTS": "0",
-    "SAI_PORT_STAT_IF_IN_DISCARDS": "0",
+    "SAI_PORT_STAT_IF_IN_DISCARDS": "8",
     "SAI_PORT_STAT_IP_OUT_DISCARDS": "0",
     "SAI_PORT_STAT_IF_IN_UNKNOWN_PROTOS": "0",
     "SAI_PORT_STAT_IPV6_IN_DISCARDS": "0",
@@ -241,7 +241,7 @@
     "SAI_PORT_STAT_IPV6_IN_UCAST_PKTS": "0",
     "SAI_PORT_STAT_IPV6_IN_RECEIVES": "0",
     "SAI_PORT_STAT_ETHER_STATS_PKTS_4096_TO_9216_OCTETS": "0",
-    "SAI_PORT_STAT_IF_OUT_DISCARDS": "0",
+    "SAI_PORT_STAT_IF_OUT_DISCARDS": "14",
     "SAI_PORT_STAT_ETHER_STATS_DROP_EVENTS": "0",
     "SAI_PORT_STAT_IPV6_OUT_MCAST_PKTS": "0",
     "SAI_PORT_STAT_ETHER_RX_OVERSIZE_PKTS": "0",

tests/mock_tables/asic1/counters_db.json

@@ -577,7 +577,7 @@
     "SAI_PORT_STAT_IF_IN_ERRORS": "100",
     "SAI_PORT_STAT_ETHER_STATS_PKTS": "0",
     "SAI_PORT_STAT_ETHER_STATS_BROADCAST_PKTS": "0",
-    "SAI_PORT_STAT_IF_IN_DISCARDS": "0",
+    "SAI_PORT_STAT_IF_IN_DISCARDS": "13",
     "SAI_PORT_STAT_IP_OUT_DISCARDS": "0",
     "SAI_PORT_STAT_IF_IN_UNKNOWN_PROTOS": "0",
     "SAI_PORT_STAT_IPV6_IN_DISCARDS": "0",
@@ -602,7 +602,7 @@
     "SAI_PORT_STAT_IPV6_IN_UCAST_PKTS": "0",
     "SAI_PORT_STAT_IPV6_IN_RECEIVES": "0",
     "SAI_PORT_STAT_ETHER_STATS_PKTS_4096_TO_9216_OCTETS": "0",
-    "SAI_PORT_STAT_IF_OUT_DISCARDS": "0",
+    "SAI_PORT_STAT_IF_OUT_DISCARDS": "15",
     "SAI_PORT_STAT_ETHER_STATS_DROP_EVENTS": "0",
     "SAI_PORT_STAT_IPV6_OUT_MCAST_PKTS": "0",
     "SAI_PORT_STAT_ETHER_RX_OVERSIZE_PKTS": "0",

tests/mock_tables/counters_db.json

@@ -12,7 +12,7 @@
     "SAI_PORT_STAT_IF_IN_ERRORS": "0",
     "SAI_PORT_STAT_ETHER_STATS_PKTS": "0",
     "SAI_PORT_STAT_ETHER_STATS_BROADCAST_PKTS": "0",
-    "SAI_PORT_STAT_IF_IN_DISCARDS": "0",
+    "SAI_PORT_STAT_IF_IN_DISCARDS": "5",
     "SAI_PORT_STAT_IP_OUT_DISCARDS": "0",
     "SAI_PORT_STAT_IF_IN_UNKNOWN_PROTOS": "0",
     "SAI_PORT_STAT_IPV6_IN_DISCARDS": "0",
@@ -37,7 +37,7 @@
     "SAI_PORT_STAT_IPV6_IN_UCAST_PKTS": "0",
     "SAI_PORT_STAT_IPV6_IN_RECEIVES": "0",
     "SAI_PORT_STAT_ETHER_STATS_PKTS_4096_TO_9216_OCTETS": "0",
-    "SAI_PORT_STAT_IF_OUT_DISCARDS": "0",
+    "SAI_PORT_STAT_IF_OUT_DISCARDS": "10",
     "SAI_PORT_STAT_ETHER_STATS_DROP_EVENTS": "0",
     "SAI_PORT_STAT_IPV6_OUT_MCAST_PKTS": "0",
     "SAI_PORT_STAT_ETHER_RX_OVERSIZE_PKTS": "0",
@@ -828,7 +828,7 @@
     "SAI_PORT_STAT_IF_IN_ERRORS": "100",
     "SAI_PORT_STAT_ETHER_STATS_PKTS": "0",
     "SAI_PORT_STAT_ETHER_STATS_BROADCAST_PKTS": "0",
-    "SAI_PORT_STAT_IF_IN_DISCARDS": "0",
+    "SAI_PORT_STAT_IF_IN_DISCARDS": "7",
     "SAI_PORT_STAT_IP_OUT_DISCARDS": "0",
     "SAI_PORT_STAT_IF_IN_UNKNOWN_PROTOS": "0",
     "SAI_PORT_STAT_IPV6_IN_DISCARDS": "0",
@@ -853,7 +853,7 @@
     "SAI_PORT_STAT_IPV6_IN_UCAST_PKTS": "0",
     "SAI_PORT_STAT_IPV6_IN_RECEIVES": "0",
     "SAI_PORT_STAT_ETHER_STATS_PKTS_4096_TO_9216_OCTETS": "0",
-    "SAI_PORT_STAT_IF_OUT_DISCARDS": "0",
+    "SAI_PORT_STAT_IF_OUT_DISCARDS": "11",
     "SAI_PORT_STAT_ETHER_STATS_DROP_EVENTS": "0",
     "SAI_PORT_STAT_IPV6_OUT_MCAST_PKTS": "0",
     "SAI_PORT_STAT_ETHER_RX_OVERSIZE_PKTS": "0",
@@ -3112,7 +3112,7 @@
     "SAI_PORT_STAT_IF_IN_ERRORS": "100",
     "SAI_PORT_STAT_ETHER_STATS_PKTS": "0",
     "SAI_PORT_STAT_ETHER_STATS_BROADCAST_PKTS": "0",
-    "SAI_PORT_STAT_IF_IN_DISCARDS": "0",
+    "SAI_PORT_STAT_IF_IN_DISCARDS": "110",
     "SAI_PORT_STAT_IP_OUT_DISCARDS": "0",
     "SAI_PORT_STAT_IF_IN_UNKNOWN_PROTOS": "0",
     "SAI_PORT_STAT_IPV6_IN_DISCARDS": "0",
@@ -3137,7 +3137,7 @@
     "SAI_PORT_STAT_IPV6_IN_UCAST_PKTS": "0",
     "SAI_PORT_STAT_IPV6_IN_RECEIVES": "0",
     "SAI_PORT_STAT_ETHER_STATS_PKTS_4096_TO_9216_OCTETS": "0",
-    "SAI_PORT_STAT_IF_OUT_DISCARDS": "0",
+    "SAI_PORT_STAT_IF_OUT_DISCARDS": "120",
     "SAI_PORT_STAT_ETHER_STATS_DROP_EVENTS": "0",
     "SAI_PORT_STAT_IPV6_OUT_MCAST_PKTS": "0",
     "SAI_PORT_STAT_ETHER_RX_OVERSIZE_PKTS": "0",