Don't aggregate L2 errors with L3 errors for physical ports with RIF

Signed-off-by: Stepan Blyschak <[email protected]>

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)

src/sonic_ax_impl/mibs/ietf/rfc1213.py

@@ -343,7 +343,7 @@ def _get_counter(self, oid, table_name):
         :return: the counter for the respective sub_id/table.
         """
         # Enum.name or table_name = 'name_of_the_table'
-        # Example: 
+        # Example:
         # table_name = <DbTables.SAI_PORT_STAT_IF_OUT_ERRORS: 20>
         # _table_name = 'SAI_PORT_STAT_IF_OUT_ERRORS'
         _table_name = getattr(table_name, 'name', table_name)
@@ -401,7 +401,7 @@ def get_counter(self, sub_id, table_name):
         elif oid in self.oid_lag_name_map:
             counter_value = 0
             # Sum the values of this counter for all ports in the LAG.
-            # Example: 
+            # Example:
             # table_name = <DbTables.SAI_PORT_STAT_IF_OUT_ERRORS: 20>
             # oid = 1001
             # self.oid_lag_name_map = {1001: 'PortChannel01', 1002: 'PortChannel02', 1003: 'PortChannel03'}
@@ -423,14 +423,14 @@ def get_counter(self, sub_id, table_name):
             sai_lag_rif_id = self.port_rif_map[sai_lag_id] if sai_lag_id in self.port_rif_map else None
             if sai_lag_rif_id in self.rif_port_map:
                 # Extract the 'name' part of 'table_name'.
-                # Example: 
+                # Example:
                 # table_name = <DbTables.SAI_PORT_STAT_IF_OUT_ERRORS: 20>
                 # _table_name = 'SAI_PORT_STAT_IF_OUT_ERRORS'
                 table_name = getattr(table_name, 'name', table_name)
                 # Find rif counter table if applicable and add the count for this table.
                 # Example:
                 # mibs.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'}
-                # self.rif_counters['6000000000006'] = {'SAI_ROUTER_INTERFACE_STAT_IN_PACKETS': 6, ... 'SAI_ROUTER_INTERFACE_STAT_OUT_ERROR_PACKETS': 6, ...} 
+                # self.rif_counters['6000000000006'] = {'SAI_ROUTER_INTERFACE_STAT_IN_PACKETS': 6, ... 'SAI_ROUTER_INTERFACE_STAT_OUT_ERROR_PACKETS': 6, ...}
                 if table_name in mibs.RIF_DROPS_AGGR_MAP:
                     rif_table_name = mibs.RIF_DROPS_AGGR_MAP[table_name]
                     counter_value += self.rif_counters[sai_lag_rif_id].get(rif_table_name, 0)

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",