From 1a2b62a93028642ad77ce8c0f356d093850d0343 Mon Sep 17 00:00:00 2001 From: SuvarnaMeenakshi <50386592+SuvarnaMeenakshi@users.noreply.github.com> Date: Thu, 13 Aug 2020 08:29:32 -0700 Subject: [PATCH] [Namespace]: Fix SAI_ID key used in cpfcIfTable and csqIfQosGroupStatsTable implementation (#138) In multi-asic platform, SAI OID is not unique for the whole device. It is unique for an asic and within a single namespace. This PR is to make sure that data structures that use SAI Object ID as a key to retrieve data from COUNTERS_DB updated so that a combination of SAI Object ID and port index is used as a key. Update data structure to use combination SAI Object ID and port index as a key to retrieve data from COUNTERS_DB. Update Unit-test mock DB in namespaces, to reflect the scenario where SAI Object is same across different namespaces. Updates done to MIB implementation for the below MIB tables to get data from the right database instances: cpfcIfTable csqIfQosGroupStatsTable * Remove usage of oid_sai_map data structure as it is not being used. The required data can be retrieved from oid_name_map data structure. Signed-off-by: SuvarnaMeenakshi --- src/sonic_ax_impl/mibs/__init__.py | 27 +- src/sonic_ax_impl/mibs/ieee802_1ab.py | 6 +- src/sonic_ax_impl/mibs/ietf/rfc1213.py | 4 +- src/sonic_ax_impl/mibs/ietf/rfc2737.py | 2 +- src/sonic_ax_impl/mibs/ietf/rfc2863.py | 4 +- src/sonic_ax_impl/mibs/ietf/rfc4363.py | 2 - .../mibs/vendor/cisco/ciscoPfcExtMIB.py | 16 +- .../mibs/vendor/cisco/ciscoSwitchQosMIB.py | 32 +- tests/mock_tables/asic1/asic_db.json | 6 +- tests/mock_tables/asic1/counters_db.json | 291 +++++++++++++---- tests/mock_tables/asic2/counters_db.json | 294 ++++++++++++++---- tests/namespace/test_fdb.py | 2 +- tests/namespace/test_pfc.py | 2 - 13 files changed, 506 insertions(+), 182 deletions(-) diff --git a/src/sonic_ax_impl/mibs/__init__.py b/src/sonic_ax_impl/mibs/__init__.py index 3ed7c066ca46..8bc475d78114 100644 --- a/src/sonic_ax_impl/mibs/__init__.py +++ b/src/sonic_ax_impl/mibs/__init__.py @@ -245,12 +245,6 @@ def init_sync_d_interface_tables(db_conn): logger.debug("Port name map:\n" + pprint.pformat(if_name_map, indent=2)) logger.debug("Interface name map:\n" + pprint.pformat(if_id_map, indent=2)) - # { OID -> sai_id } - oid_sai_map = {get_index(if_name): sai_id for if_name, sai_id in if_name_map.items() - # only map the interface if it's a style understood to be a SONiC interface. - if get_index(if_name) is not None} - logger.debug("OID sai map:\n" + pprint.pformat(oid_sai_map, indent=2)) - # { OID -> if_name (SONiC) } oid_name_map = {get_index(if_name): if_name for if_name in if_name_map # only map the interface if it's a style understood to be a SONiC interface. @@ -259,14 +253,14 @@ def init_sync_d_interface_tables(db_conn): logger.debug("OID name map:\n" + pprint.pformat(oid_name_map, indent=2)) # SyncD consistency checks. - if not oid_sai_map: + if not oid_name_map: # In the event no interface exists that follows the SONiC pattern, no OIDs are able to be registered. # A RuntimeError here will prevent the 'main' module from loading. (This is desirable.) message = "No interfaces found matching pattern '{}'. SyncD database is incoherent." \ .format(port_util.SONIC_ETHERNET_RE_PATTERN) logger.error(message) raise RuntimeError(message) - elif len(if_id_map) < len(if_name_map) or len(oid_sai_map) < len(if_name_map): + elif len(if_id_map) < len(if_name_map) or len(oid_name_map) < len(if_name_map): # a length mismatch indicates a bad interface name logger.warning("SyncD database contains incoherent interface names. Interfaces must match pattern '{}'" .format(port_util.SONIC_ETHERNET_RE_PATTERN)) @@ -281,7 +275,7 @@ def init_sync_d_interface_tables(db_conn): logger.debug("Chassis name map:\n" + pprint.pformat(if_alias_map, indent=2)) - return if_name_map, if_alias_map, if_id_map, oid_sai_map, oid_name_map + return if_name_map, if_alias_map, if_id_map, oid_name_map def init_sync_d_lag_tables(db_conn): """ @@ -333,15 +327,15 @@ def init_sync_d_queue_tables(db_conn): :return: tuple(port_queues_map, queue_stat_map) """ - # { Port index : Queue index (SONiC) -> sai_id } - # ex: { "1:2" : "1000000000023" } + # { Port name : Queue index (SONiC) -> sai_id } + # ex: { "Ethernet0:2" : "1000000000023" } queue_name_map = db_conn.get_all(COUNTERS_DB, COUNTERS_QUEUE_NAME_MAP, blocking=True) logger.debug("Queue name map:\n" + pprint.pformat(queue_name_map, indent=2)) # Parse the queue_name_map and create the following maps: - # port_queues_map -> {"if_index : queue_index" : sai_oid} - # queue_stat_map -> {queue stat table name : {counter name : value}} - # port_queue_list_map -> {if_index: [sorted queue list]} + # port_queues_map -> {"port_index : queue_index" : sai_oid} + # queue_stat_map -> {"port_index : queue stat table name" : {counter name : value}} + # port_queue_list_map -> {port_index: [sorted queue list]} port_queues_map = {} queue_stat_map = {} port_queue_list_map = {} @@ -356,7 +350,8 @@ def init_sync_d_queue_tables(db_conn): queue_stat_name = queue_table(sai_id) queue_stat = db_conn.get_all(COUNTERS_DB, queue_stat_name, blocking=False) if queue_stat is not None: - queue_stat_map[queue_stat_name] = queue_stat + queue_stat_key = queue_key(port_index, queue_stat_name) + queue_stat_map[queue_stat_key] = queue_stat if not port_queue_list_map.get(int(port_index)): port_queue_list_map[int(port_index)] = [int(queue_index)] @@ -577,7 +572,7 @@ def get_non_host_dbs(dbs): return dbs else: return dbs[1:] - + @staticmethod def get_sync_d_from_all_namespace(per_namespace_func, dbs): # return merged tuple of dictionaries retrieved from per diff --git a/src/sonic_ax_impl/mibs/ieee802_1ab.py b/src/sonic_ax_impl/mibs/ieee802_1ab.py index aaa24b954be9..8770e2d5561c 100644 --- a/src/sonic_ax_impl/mibs/ieee802_1ab.py +++ b/src/sonic_ax_impl/mibs/ieee802_1ab.py @@ -145,7 +145,6 @@ def __init__(self): self.if_name_map = {} self.if_alias_map = {} self.if_id_map = {} - self.oid_sai_map = {} self.oid_name_map = {} self.mgmt_oid_name_map = {} @@ -165,7 +164,6 @@ def reinit_data(self): self.if_name_map, \ self.if_alias_map, \ self.if_id_map, \ - self.oid_sai_map, \ self.oid_name_map = Namespace.get_sync_d_from_all_namespace(mibs.init_sync_d_interface_tables, self.db_conn) self.mgmt_oid_name_map, \ @@ -382,7 +380,6 @@ def __init__(self): self.if_name_map = {} self.if_alias_map = {} self.if_id_map = {} - self.oid_sai_map = {} self.oid_name_map = {} self.mgmt_oid_name_map = {} @@ -400,7 +397,6 @@ def reinit_data(self): self.if_name_map, \ self.if_alias_map, \ self.if_id_map, \ - self.oid_sai_map, \ self.oid_name_map = Namespace.get_sync_d_from_all_namespace(mibs.init_sync_d_interface_tables, self.db_conn) self.mgmt_oid_name_map, _ = mibs.init_mgmt_interface_tables(self.db_conn[0]) @@ -566,7 +562,7 @@ def reinit_data(self): """ Subclass reinit data routine. """ - _, _, _, _, self.oid_name_map = Namespace.get_sync_d_from_all_namespace(mibs.init_sync_d_interface_tables, self.db_conn) + _, _, _, self.oid_name_map = Namespace.get_sync_d_from_all_namespace(mibs.init_sync_d_interface_tables, self.db_conn) self.mgmt_oid_name_map, _ = mibs.init_mgmt_interface_tables(self.db_conn[0]) diff --git a/src/sonic_ax_impl/mibs/ietf/rfc1213.py b/src/sonic_ax_impl/mibs/ietf/rfc1213.py index 4ba0c0f71267..c1b3b1bea172 100644 --- a/src/sonic_ax_impl/mibs/ietf/rfc1213.py +++ b/src/sonic_ax_impl/mibs/ietf/rfc1213.py @@ -200,7 +200,6 @@ def __init__(self): self.if_name_map = {} self.if_alias_map = {} self.if_id_map = {} - self.oid_sai_map = {} self.oid_name_map = {} self.namespace_db_map = Namespace.get_namespace_db_map(self.db_conn) @@ -211,7 +210,6 @@ def reinit_data(self): self.if_name_map, \ self.if_alias_map, \ self.if_id_map, \ - self.oid_sai_map, \ self.oid_name_map = Namespace.get_sync_d_from_all_namespace(mibs.init_sync_d_interface_tables, self.db_conn) """ db_conn - will have db_conn to all namespace DBs and @@ -236,7 +234,7 @@ def update_data(self): self.if_name_lag_name_map, \ self.oid_lag_name_map = Namespace.get_sync_d_from_all_namespace(mibs.init_sync_d_lag_tables, self.db_conn) - self.if_range = sorted(list(self.oid_sai_map.keys()) + + self.if_range = sorted(list(self.oid_name_map.keys()) + list(self.oid_lag_name_map.keys()) + list(self.mgmt_oid_name_map.keys())) self.if_range = [(i,) for i in self.if_range] diff --git a/src/sonic_ax_impl/mibs/ietf/rfc2737.py b/src/sonic_ax_impl/mibs/ietf/rfc2737.py index 0e364d536a2d..927ab6797211 100644 --- a/src/sonic_ax_impl/mibs/ietf/rfc2737.py +++ b/src/sonic_ax_impl/mibs/ietf/rfc2737.py @@ -152,7 +152,7 @@ def reinit_data(self): self.physical_model_name_map = {} # update interface maps - _, self.if_alias_map, _, _, _ = \ + _, self.if_alias_map, _, _ = \ Namespace.get_sync_d_from_all_namespace(mibs.init_sync_d_interface_tables, Namespace.init_namespace_dbs()) device_metadata = mibs.get_device_metadata(self.statedb[0]) diff --git a/src/sonic_ax_impl/mibs/ietf/rfc2863.py b/src/sonic_ax_impl/mibs/ietf/rfc2863.py index 2844cc9a1f0f..8ed4515d34cf 100644 --- a/src/sonic_ax_impl/mibs/ietf/rfc2863.py +++ b/src/sonic_ax_impl/mibs/ietf/rfc2863.py @@ -61,7 +61,6 @@ def __init__(self): self.if_name_map = {} self.if_alias_map = {} self.if_id_map = {} - self.oid_sai_map = {} self.oid_name_map = {} self.lag_name_if_name_map = {} self.if_name_lag_name_map = {} @@ -76,7 +75,6 @@ def reinit_data(self): self.if_name_map, \ self.if_alias_map, \ self.if_id_map, \ - self.oid_sai_map, \ self.oid_name_map = Namespace.get_sync_d_from_all_namespace(mibs.init_sync_d_interface_tables, self.db_conn) self.lag_name_if_name_map, \ @@ -90,7 +88,7 @@ def reinit_data(self): self.mgmt_oid_name_map, \ self.mgmt_alias_map = mibs.init_mgmt_interface_tables(self.db_conn[0]) - self.if_range = sorted(list(self.oid_sai_map.keys()) + + self.if_range = sorted(list(self.oid_name_map.keys()) + list(self.oid_lag_name_map.keys()) + list(self.mgmt_oid_name_map.keys())) self.if_range = [(i,) for i in self.if_range] diff --git a/src/sonic_ax_impl/mibs/ietf/rfc4363.py b/src/sonic_ax_impl/mibs/ietf/rfc4363.py index 5120c9380ec9..1e321fc6dd0d 100644 --- a/src/sonic_ax_impl/mibs/ietf/rfc4363.py +++ b/src/sonic_ax_impl/mibs/ietf/rfc4363.py @@ -15,7 +15,6 @@ def __init__(self): self.if_name_map = {} self.if_alias_map = {} self.if_id_map = {} - self.oid_sai_map = {} self.oid_name_map = {} self.vlanmac_ifindex_map = {} self.vlanmac_ifindex_list = [] @@ -40,7 +39,6 @@ def reinit_data(self): self.if_name_map, \ self.if_alias_map, \ self.if_id_map, \ - self.oid_sai_map, \ self.oid_name_map = Namespace.get_sync_d_from_all_namespace(mibs.init_sync_d_interface_tables, self.db_conn) self.if_bpid_map = Namespace.dbs_get_bridge_port_map(self.db_conn, mibs.ASIC_DB) diff --git a/src/sonic_ax_impl/mibs/vendor/cisco/ciscoPfcExtMIB.py b/src/sonic_ax_impl/mibs/vendor/cisco/ciscoPfcExtMIB.py index 285e5db7d896..fdb0b7766e89 100644 --- a/src/sonic_ax_impl/mibs/vendor/cisco/ciscoPfcExtMIB.py +++ b/src/sonic_ax_impl/mibs/vendor/cisco/ciscoPfcExtMIB.py @@ -17,7 +17,6 @@ def __init__(self): self.if_name_map = {} self.if_alias_map = {} self.if_id_map = {} - self.oid_sai_map = {} self.oid_name_map = {} self.lag_name_if_name_map = {} @@ -27,6 +26,7 @@ def __init__(self): # cache of interface counters self.if_counters = {} self.if_range = [] + self.namespace_db_map = Namespace.get_namespace_db_map(self.db_conn) def reinit_data(self): """ @@ -35,7 +35,6 @@ def reinit_data(self): self.if_name_map, \ self.if_alias_map, \ self.if_id_map, \ - self.oid_sai_map, \ self.oid_name_map = Namespace.get_sync_d_from_all_namespace(mibs.init_sync_d_interface_tables, self.db_conn) self.update_data() @@ -45,15 +44,17 @@ def update_data(self): Update redis (caches config) Pulls the table references for each interface. """ - self.if_counters = \ - {sai_id: Namespace.dbs_get_all(self.db_conn, mibs.COUNTERS_DB, mibs.counter_table(sai_id), blocking=True) - for sai_id in self.if_id_map} + for sai_id_key in self.if_id_map: + namespace, sai_id = mibs.split_sai_id_key(sai_id_key) + if_idx = mibs.get_index_from_str(self.if_id_map[sai_id_key]) + self.if_counters[if_idx] = self.namespace_db_map[namespace].get_all(mibs.COUNTERS_DB, \ + mibs.counter_table(sai_id), blocking=True) self.lag_name_if_name_map, \ self.if_name_lag_name_map, \ self.oid_lag_name_map = Namespace.get_sync_d_from_all_namespace(mibs.init_sync_d_lag_tables, self.db_conn) - self.if_range = sorted(list(self.oid_sai_map.keys()) + list(self.oid_lag_name_map.keys())) + self.if_range = sorted(list(self.oid_name_map.keys()) + list(self.oid_lag_name_map.keys())) self.if_range = [(i,) for i in self.if_range] def get_next(self, sub_id): @@ -88,13 +89,12 @@ def _get_counter(self, oid, counter_name): :param counter_name: the redis table (either IntEnum or string literal) to query. :return: the counter for the respective sub_id/table. """ - sai_id = self.oid_sai_map[oid] # Enum.name or counter_name = 'name_of_the_table' _counter_name = bytes(getattr(counter_name, 'name', counter_name), 'utf-8') try: - counter_value = self.if_counters[sai_id][_counter_name] + counter_value = self.if_counters[oid][_counter_name] counter_value = int(counter_value) & 0xffffffffffffffff # done! return counter_value diff --git a/src/sonic_ax_impl/mibs/vendor/cisco/ciscoSwitchQosMIB.py b/src/sonic_ax_impl/mibs/vendor/cisco/ciscoSwitchQosMIB.py index eba0a14db8e9..5c54d4fc17ff 100644 --- a/src/sonic_ax_impl/mibs/vendor/cisco/ciscoSwitchQosMIB.py +++ b/src/sonic_ax_impl/mibs/vendor/cisco/ciscoSwitchQosMIB.py @@ -54,7 +54,6 @@ def __init__(self): self.if_name_map = {} self.if_alias_map = {} self.if_id_map = {} - self.oid_sai_map = {} self.oid_name_map = {} self.port_queues_map = {} @@ -65,6 +64,8 @@ def __init__(self): self.mib_oid_list = [] self.queue_type_map = {} + self.port_index_namespace = {} + self.namespace_db_map = Namespace.get_namespace_db_map(self.db_conn) def reinit_data(self): """ @@ -73,14 +74,19 @@ def reinit_data(self): self.if_name_map, \ self.if_alias_map, \ self.if_id_map, \ - self.oid_sai_map, \ self.oid_name_map = Namespace.get_sync_d_from_all_namespace(mibs.init_sync_d_interface_tables, self.db_conn) + for sai_id_key in self.if_id_map: + namespace, sai_id = mibs.split_sai_id_key(sai_id_key) + if_idx = mibs.get_index_from_str(self.if_id_map[sai_id_key]) + self.port_index_namespace[if_idx] = namespace + self.port_queues_map, self.queue_stat_map, self.port_queue_list_map = \ Namespace.get_sync_d_from_all_namespace(mibs.init_sync_d_queue_tables, self.db_conn) - self.queue_type_map = Namespace.dbs_get_all(self.db_conn, mibs.COUNTERS_DB, "COUNTERS_QUEUE_TYPE_MAP", blocking=False) - + for db_conn in Namespace.get_non_host_dbs(self.db_conn): + self.queue_type_map[db_conn.namespace] = db_conn.get_all(mibs.COUNTERS_DB, "COUNTERS_QUEUE_TYPE_MAP", blocking=False) + self.update_data() def update_data(self): @@ -90,9 +96,15 @@ def update_data(self): """ for queue_key, sai_id in self.port_queues_map.items(): queue_stat_name = mibs.queue_table(sai_id) - queue_stat = Namespace.dbs_get_all(self.db_conn, mibs.COUNTERS_DB, queue_stat_name, blocking=False) + port_index, _ = queue_key.split(':') + queue_stat_idx = mibs.queue_key(port_index, queue_stat_name) + namespace = self.port_index_namespace[int(port_index)] + queue_stat = self.namespace_db_map[namespace].get_all( \ + mibs.COUNTERS_DB, queue_stat_name, blocking=False) if queue_stat is not None: - self.queue_stat_map[queue_stat_name] = queue_stat + self.queue_stat_map[queue_stat_idx] = queue_stat + else: + del self.queue_stat_map[queue_stat_idx] self.update_stats() @@ -109,13 +121,14 @@ def update_stats(self): self.mib_oid_list = [] # Sort the ports to keep the OID order in the MIB - if_range = list(self.oid_sai_map.keys()) + if_range = list(self.oid_name_map.keys()) # Update queue counters for port for if_index in if_range: if if_index not in self.port_queue_list_map: # Port does not has a queues, continue.. continue if_queues = self.port_queue_list_map[if_index] + namespace = self.port_index_namespace[if_index] # The first half of queue id is for ucast, and second half is for mcast # To simulate vendor OID, we wrap queues by half distance @@ -125,8 +138,9 @@ def update_stats(self): # Get queue type and statistics queue_sai_oid = self.port_queues_map[mibs.queue_key(if_index, queue)] queue_stat_table_name = mibs.queue_table(queue_sai_oid) - queue_type = self.queue_type_map.get(queue_sai_oid) - queue_stat = self.queue_stat_map.get(queue_stat_table_name, {}) + queue_stat_key = mibs.queue_key(if_index, queue_stat_table_name) + queue_type = self.queue_type_map[namespace].get(queue_sai_oid) + queue_stat = self.queue_stat_map.get(queue_stat_key, {}) # Add supported counters to MIBs list and store counters values for (counter, counter_type), counter_mib_id in CounterMap.items(): diff --git a/tests/mock_tables/asic1/asic_db.json b/tests/mock_tables/asic1/asic_db.json index 70dedc520c16..9da04af83c1b 100644 --- a/tests/mock_tables/asic1/asic_db.json +++ b/tests/mock_tables/asic1/asic_db.json @@ -1,11 +1,11 @@ { "ASIC_STATE:SAI_OBJECT_TYPE_FDB_ENTRY:{\"bridge_id\":\"oid:0x0\",\"bridge_type\":\"SAI_FDB_ENTRY_BRIDGE_TYPE_1Q\",\"mac\":\"7C:FE:90:80:9F:10\",\"switch_id\":\"oid:0x21000000000000\",\"vlan\":\"1000\"}": { - "SAI_FDB_ENTRY_ATTR_BRIDGE_PORT_ID": "oid:0x3a0000000006208", + "SAI_FDB_ENTRY_ATTR_BRIDGE_PORT_ID": "oid:0x3a000000000616", "SAI_FDB_ENTRY_ATTR_TYPE": "SAI_FDB_ENTRY_TYPE_DYNAMIC" }, - "ASIC_STATE:SAI_OBJECT_TYPE_BRIDGE_PORT:oid:0x3a000000000620": { + "ASIC_STATE:SAI_OBJECT_TYPE_BRIDGE_PORT:oid:0x3a000000000616": { "SAI_BRIDGE_PORT_ATTR_TYPE": "SAI_BRIDGE_PORT_TYPE_PORT", - "SAI_BRIDGE_PORT_ATTR_PORT_ID": "oid:0x1000000000010", + "SAI_BRIDGE_PORT_ATTR_PORT_ID": "oid:0x1000000000005", "SAI_BRIDGE_PORT_ATTR_ADMIN_STATE": "true" } } diff --git a/tests/mock_tables/asic1/counters_db.json b/tests/mock_tables/asic1/counters_db.json index cd56a10fe075..86289526d510 100644 --- a/tests/mock_tables/asic1/counters_db.json +++ b/tests/mock_tables/asic1/counters_db.json @@ -1,5 +1,5 @@ { - "COUNTERS:oid:0x1000000000010": { + "COUNTERS:oid:0x1000000000007": { "SAI_PORT_STAT_ETHER_STATS_TX_NO_ERRORS": "0", "SAI_PORT_STAT_ETHER_STATS_OVERSIZE_PKTS": "0", "SAI_PORT_STAT_IF_OUT_ERRORS": "0", @@ -101,16 +101,7 @@ "SAI_PORT_STAT_PFC_7_RX_PKTS": "8", "SAI_PORT_STAT_PFC_7_TX_PKTS": "8" }, - "COUNTERS_PORT_NAME_MAP": { - "Ethernet8": "oid:0x1000000000009", - "Ethernet12": "oid:0x1000000000008", - "Ethernet-BP8": "oid:0x1000000000010", - "Ethernet-BP12": "oid:0x1000000000011" - }, - "COUNTERS_LAG_NAME_MAP": { - "PortChannel02": "oid:0x1000000000012" - }, - "COUNTERS:oid:0x1000000000009": { + "COUNTERS:oid:0x1000000000006": { "SAI_PORT_STAT_ETHER_STATS_TX_NO_ERRORS": "0", "SAI_PORT_STAT_ETHER_STATS_OVERSIZE_PKTS": "0", "SAI_PORT_STAT_IF_OUT_ERRORS": "0", @@ -196,7 +187,7 @@ "SAI_PORT_STAT_PAUSE_RX_PKTS": "0", "SAI_PORT_STAT_PAUSE_TX_PKTS": "0", "SAI_PORT_STAT_PFC_0_RX_PKTS": "1", - "SAI_PORT_STAT_PFC_0_TX_PKTS": "209347219842134092490", + "SAI_PORT_STAT_PFC_0_TX_PKTS": "1", "SAI_PORT_STAT_PFC_1_RX_PKTS": "2", "SAI_PORT_STAT_PFC_1_TX_PKTS": "2", "SAI_PORT_STAT_PFC_2_RX_PKTS": "3", @@ -212,7 +203,7 @@ "SAI_PORT_STAT_PFC_7_RX_PKTS": "8", "SAI_PORT_STAT_PFC_7_TX_PKTS": "8" }, - "COUNTERS:oid:0x1000000000008": { + "COUNTERS:oid:0x1000000000005": { "SAI_PORT_STAT_ETHER_STATS_TX_NO_ERRORS": "0", "SAI_PORT_STAT_ETHER_STATS_OVERSIZE_PKTS": "0", "SAI_PORT_STAT_IF_OUT_ERRORS": "0", @@ -248,7 +239,6 @@ "SAI_PORT_STAT_IP_IN_NON_UCAST_PKTS": "0", "SAI_PORT_STAT_ETHER_STATS_FRAGMENTS": "0", "SAI_PORT_STAT_IPV6_IN_UCAST_PKTS": "0", - "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", @@ -315,7 +305,16 @@ "SAI_PORT_STAT_PFC_7_RX_PKTS": "8", "SAI_PORT_STAT_PFC_7_TX_PKTS": "8" }, - "COUNTERS:oid:0x1000000000011": { + "COUNTERS_PORT_NAME_MAP": { + "Ethernet8": "oid:0x1000000000003", + "Ethernet12": "oid:0x1000000000004", + "Ethernet-BP8": "oid:0x1000000000005", + "Ethernet-BP12": "oid:0x1000000000006" + }, + "COUNTERS_LAG_NAME_MAP": { + "PortChannel02": "oid:0x1000000000007" + }, + "COUNTERS:oid:0x1000000000004": { "SAI_PORT_STAT_ETHER_STATS_TX_NO_ERRORS": "0", "SAI_PORT_STAT_ETHER_STATS_OVERSIZE_PKTS": "0", "SAI_PORT_STAT_IF_OUT_ERRORS": "0", @@ -417,7 +416,7 @@ "SAI_PORT_STAT_PFC_7_RX_PKTS": "8", "SAI_PORT_STAT_PFC_7_TX_PKTS": "8" }, - "COUNTERS:oid:0x1000000000012": { + "COUNTERS:oid:0x1000000000003": { "SAI_PORT_STAT_ETHER_STATS_TX_NO_ERRORS": "0", "SAI_PORT_STAT_ETHER_STATS_OVERSIZE_PKTS": "0", "SAI_PORT_STAT_IF_OUT_ERRORS": "0", @@ -503,7 +502,7 @@ "SAI_PORT_STAT_PAUSE_RX_PKTS": "0", "SAI_PORT_STAT_PAUSE_TX_PKTS": "0", "SAI_PORT_STAT_PFC_0_RX_PKTS": "1", - "SAI_PORT_STAT_PFC_0_TX_PKTS": "1", + "SAI_PORT_STAT_PFC_0_TX_PKTS": "209347219842134092490", "SAI_PORT_STAT_PFC_1_RX_PKTS": "2", "SAI_PORT_STAT_PFC_1_TX_PKTS": "2", "SAI_PORT_STAT_PFC_2_RX_PKTS": "3", @@ -520,42 +519,90 @@ "SAI_PORT_STAT_PFC_7_TX_PKTS": "8" }, "COUNTERS_QUEUE_NAME_MAP": { - "Ethernet8:0": "oid:0x15000000000250", - "Ethernet8:1": "oid:0x15000000000251", - "Ethernet8:2": "oid:0x15000000000252", - "Ethernet8:3": "oid:0x15000000000253", - "Ethernet8:4": "oid:0x15000000000254", - "Ethernet8:5": "oid:0x15000000000255", - "Ethernet8:6": "oid:0x15000000000256", - "Ethernet8:7": "oid:0x15000000000257", - "Ethernet8:8": "oid:0x15000000010250", - "Ethernet8:9": "oid:0x15000000010251", - "Ethernet8:10": "oid:0x15000000010252", - "Ethernet8:11": "oid:0x15000000010253", - "Ethernet8:12": "oid:0x15000000010254", - "Ethernet8:13": "oid:0x15000000010255", - "Ethernet8:14": "oid:0x15000000010256", - "Ethernet8:15": "oid:0x15000000010257" + "Ethernet8:0": "oid:0x15000000000230", + "Ethernet8:1": "oid:0x15000000000231", + "Ethernet8:2": "oid:0x15000000000232", + "Ethernet8:3": "oid:0x15000000000233", + "Ethernet8:4": "oid:0x15000000000234", + "Ethernet8:5": "oid:0x15000000000235", + "Ethernet8:6": "oid:0x15000000000236", + "Ethernet8:7": "oid:0x15000000000237", + "Ethernet8:8": "oid:0x15000000010230", + "Ethernet8:9": "oid:0x15000000010231", + "Ethernet8:10": "oid:0x15000000010232", + "Ethernet8:11": "oid:0x15000000010233", + "Ethernet8:12": "oid:0x15000000010234", + "Ethernet8:13": "oid:0x15000000010235", + "Ethernet8:14": "oid:0x15000000010236", + "Ethernet8:15": "oid:0x15000000010237", + "Ethernet12:0": "oid:0x15000000000240", + "Ethernet12:1": "oid:0x15000000000241", + "Ethernet12:2": "oid:0x15000000000242", + "Ethernet12:3": "oid:0x15000000000243", + "Ethernet12:4": "oid:0x15000000000244", + "Ethernet12:5": "oid:0x15000000000245", + "Ethernet12:6": "oid:0x15000000000246", + "Ethernet12:7": "oid:0x15000000000247", + "Ethernet12:8": "oid:0x15000000010240", + "Ethernet12:9": "oid:0x15000000010241", + "Ethernet12:10": "oid:0x15000000010242", + "Ethernet12:11": "oid:0x15000000010243", + "Ethernet12:12": "oid:0x15000000010244", + "Ethernet12:13": "oid:0x15000000010245", + "Ethernet12:14": "oid:0x15000000010246", + "Ethernet12:15": "oid:0x15000000010247" }, "COUNTERS_QUEUE_TYPE_MAP": { - "oid:0x15000000000250": "SAI_QUEUE_TYPE_UNICAST", - "oid:0x15000000000251": "SAI_QUEUE_TYPE_UNICAST", - "oid:0x15000000000252": "SAI_QUEUE_TYPE_UNICAST", - "oid:0x15000000000253": "SAI_QUEUE_TYPE_UNICAST", - "oid:0x15000000000254": "SAI_QUEUE_TYPE_UNICAST", - "oid:0x15000000000255": "SAI_QUEUE_TYPE_UNICAST", - "oid:0x15000000000256": "SAI_QUEUE_TYPE_UNICAST", - "oid:0x15000000000257": "SAI_QUEUE_TYPE_UNICAST", - "oid:0x15000000010250": "SAI_QUEUE_TYPE_MULTICAST", - "oid:0x15000000010251": "SAI_QUEUE_TYPE_MULTICAST", - "oid:0x15000000010252": "SAI_QUEUE_TYPE_MULTICAST", - "oid:0x15000000010253": "SAI_QUEUE_TYPE_MULTICAST", - "oid:0x15000000010254": "SAI_QUEUE_TYPE_MULTICAST", - "oid:0x15000000010255": "SAI_QUEUE_TYPE_MULTICAST", - "oid:0x15000000010256": "SAI_QUEUE_TYPE_MULTICAST", - "oid:0x15000000010257": "SAI_QUEUE_TYPE_MULTICAST" - }, - "COUNTERS:oid:0x15000000000250": { + "oid:0x15000000000230": "SAI_QUEUE_TYPE_UNICAST", + "oid:0x15000000000231": "SAI_QUEUE_TYPE_UNICAST", + "oid:0x15000000000232": "SAI_QUEUE_TYPE_UNICAST", + "oid:0x15000000000233": "SAI_QUEUE_TYPE_UNICAST", + "oid:0x15000000000234": "SAI_QUEUE_TYPE_UNICAST", + "oid:0x15000000000235": "SAI_QUEUE_TYPE_UNICAST", + "oid:0x15000000000236": "SAI_QUEUE_TYPE_UNICAST", + "oid:0x15000000000237": "SAI_QUEUE_TYPE_UNICAST", + "oid:0x15000000000240": "SAI_QUEUE_TYPE_UNICAST", + "oid:0x15000000000241": "SAI_QUEUE_TYPE_UNICAST", + "oid:0x15000000000242": "SAI_QUEUE_TYPE_UNICAST", + "oid:0x15000000000243": "SAI_QUEUE_TYPE_UNICAST", + "oid:0x15000000000244": "SAI_QUEUE_TYPE_UNICAST", + "oid:0x15000000000245": "SAI_QUEUE_TYPE_UNICAST", + "oid:0x15000000000246": "SAI_QUEUE_TYPE_UNICAST", + "oid:0x15000000000247": "SAI_QUEUE_TYPE_UNICAST", + "oid:0x15000000010230": "SAI_QUEUE_TYPE_MULTICAST", + "oid:0x15000000010231": "SAI_QUEUE_TYPE_MULTICAST", + "oid:0x15000000010232": "SAI_QUEUE_TYPE_MULTICAST", + "oid:0x15000000010233": "SAI_QUEUE_TYPE_MULTICAST", + "oid:0x15000000010234": "SAI_QUEUE_TYPE_MULTICAST", + "oid:0x15000000010235": "SAI_QUEUE_TYPE_MULTICAST", + "oid:0x15000000010236": "SAI_QUEUE_TYPE_MULTICAST", + "oid:0x15000000010237": "SAI_QUEUE_TYPE_MULTICAST", + "oid:0x15000000010240": "SAI_QUEUE_TYPE_MULTICAST", + "oid:0x15000000010241": "SAI_QUEUE_TYPE_MULTICAST", + "oid:0x15000000010242": "SAI_QUEUE_TYPE_MULTICAST", + "oid:0x15000000010243": "SAI_QUEUE_TYPE_MULTICAST", + "oid:0x15000000010244": "SAI_QUEUE_TYPE_MULTICAST", + "oid:0x15000000010245": "SAI_QUEUE_TYPE_MULTICAST", + "oid:0x15000000010246": "SAI_QUEUE_TYPE_MULTICAST", + "oid:0x15000000010247": "SAI_QUEUE_TYPE_MULTICAST" + }, + "COUNTERS:oid:0x15000000000230": { + "SAI_QUEUE_STAT_PACKETS": "1", + "SAI_QUEUE_STAT_BYTES": "23492723984237432", + "SAI_QUEUE_STAT_DROPPED_PACKETS": "3", + "SAI_QUEUE_STAT_DISCARD_DROPPED_PACKETS": "4", + "SAI_QUEUE_STAT_CURR_OCCUPANCY_BYTES": "5", + "SAI_QUEUE_STAT_WATERMARK_BYTES": "6" + }, + "COUNTERS:oid:0x15000000000231": { + "SAI_QUEUE_STAT_PACKETS": "1", + "SAI_QUEUE_STAT_BYTES": "2", + "SAI_QUEUE_STAT_DROPPED_PACKETS": "3", + "SAI_QUEUE_STAT_DISCARD_DROPPED_PACKETS": "4", + "SAI_QUEUE_STAT_CURR_OCCUPANCY_BYTES": "5", + "SAI_QUEUE_STAT_WATERMARK_BYTES": "6" + }, + "COUNTERS:oid:0x15000000000232": { "SAI_QUEUE_STAT_PACKETS": "1", "SAI_QUEUE_STAT_BYTES": "2", "SAI_QUEUE_STAT_DROPPED_PACKETS": "3", @@ -563,7 +610,7 @@ "SAI_QUEUE_STAT_CURR_OCCUPANCY_BYTES": "5", "SAI_QUEUE_STAT_WATERMARK_BYTES": "6" }, - "COUNTERS:oid:0x15000000000251": { + "COUNTERS:oid:0x15000000000233": { "SAI_QUEUE_STAT_PACKETS": "1", "SAI_QUEUE_STAT_BYTES": "2", "SAI_QUEUE_STAT_DROPPED_PACKETS": "3", @@ -571,7 +618,7 @@ "SAI_QUEUE_STAT_CURR_OCCUPANCY_BYTES": "5", "SAI_QUEUE_STAT_WATERMARK_BYTES": "6" }, - "COUNTERS:oid:0x15000000000252": { + "COUNTERS:oid:0x15000000000234": { "SAI_QUEUE_STAT_PACKETS": "1", "SAI_QUEUE_STAT_BYTES": "2", "SAI_QUEUE_STAT_DROPPED_PACKETS": "3", @@ -579,7 +626,7 @@ "SAI_QUEUE_STAT_CURR_OCCUPANCY_BYTES": "5", "SAI_QUEUE_STAT_WATERMARK_BYTES": "6" }, - "COUNTERS:oid:0x15000000000253": { + "COUNTERS:oid:0x15000000000235": { "SAI_QUEUE_STAT_PACKETS": "1", "SAI_QUEUE_STAT_BYTES": "2", "SAI_QUEUE_STAT_DROPPED_PACKETS": "3", @@ -587,7 +634,7 @@ "SAI_QUEUE_STAT_CURR_OCCUPANCY_BYTES": "5", "SAI_QUEUE_STAT_WATERMARK_BYTES": "6" }, - "COUNTERS:oid:0x15000000000254": { + "COUNTERS:oid:0x15000000000236": { "SAI_QUEUE_STAT_PACKETS": "1", "SAI_QUEUE_STAT_BYTES": "2", "SAI_QUEUE_STAT_DROPPED_PACKETS": "3", @@ -595,7 +642,7 @@ "SAI_QUEUE_STAT_CURR_OCCUPANCY_BYTES": "5", "SAI_QUEUE_STAT_WATERMARK_BYTES": "6" }, - "COUNTERS:oid:0x15000000000255": { + "COUNTERS:oid:0x15000000000237": { "SAI_QUEUE_STAT_PACKETS": "1", "SAI_QUEUE_STAT_BYTES": "2", "SAI_QUEUE_STAT_DROPPED_PACKETS": "3", @@ -603,7 +650,7 @@ "SAI_QUEUE_STAT_CURR_OCCUPANCY_BYTES": "5", "SAI_QUEUE_STAT_WATERMARK_BYTES": "6" }, - "COUNTERS:oid:0x15000000000256": { + "COUNTERS:oid:0x15000000000240": { "SAI_QUEUE_STAT_PACKETS": "1", "SAI_QUEUE_STAT_BYTES": "2", "SAI_QUEUE_STAT_DROPPED_PACKETS": "3", @@ -611,7 +658,7 @@ "SAI_QUEUE_STAT_CURR_OCCUPANCY_BYTES": "5", "SAI_QUEUE_STAT_WATERMARK_BYTES": "6" }, - "COUNTERS:oid:0x15000000000257": { + "COUNTERS:oid:0x15000000000241": { "SAI_QUEUE_STAT_PACKETS": "1", "SAI_QUEUE_STAT_BYTES": "2", "SAI_QUEUE_STAT_DROPPED_PACKETS": "3", @@ -619,7 +666,55 @@ "SAI_QUEUE_STAT_CURR_OCCUPANCY_BYTES": "5", "SAI_QUEUE_STAT_WATERMARK_BYTES": "6" }, - "COUNTERS:oid:0x15000000010250": { + "COUNTERS:oid:0x15000000000242": { + "SAI_QUEUE_STAT_PACKETS": "1", + "SAI_QUEUE_STAT_BYTES": "2", + "SAI_QUEUE_STAT_DROPPED_PACKETS": "3", + "SAI_QUEUE_STAT_DISCARD_DROPPED_PACKETS": "4", + "SAI_QUEUE_STAT_CURR_OCCUPANCY_BYTES": "5", + "SAI_QUEUE_STAT_WATERMARK_BYTES": "6" + }, + "COUNTERS:oid:0x15000000000243": { + "SAI_QUEUE_STAT_PACKETS": "1", + "SAI_QUEUE_STAT_BYTES": "2", + "SAI_QUEUE_STAT_DROPPED_PACKETS": "3", + "SAI_QUEUE_STAT_DISCARD_DROPPED_PACKETS": "4", + "SAI_QUEUE_STAT_CURR_OCCUPANCY_BYTES": "5", + "SAI_QUEUE_STAT_WATERMARK_BYTES": "6" + }, + "COUNTERS:oid:0x15000000000244": { + "SAI_QUEUE_STAT_PACKETS": "1", + "SAI_QUEUE_STAT_BYTES": "2", + "SAI_QUEUE_STAT_DROPPED_PACKETS": "3", + "SAI_QUEUE_STAT_DISCARD_DROPPED_PACKETS": "4", + "SAI_QUEUE_STAT_CURR_OCCUPANCY_BYTES": "5", + "SAI_QUEUE_STAT_WATERMARK_BYTES": "6" + }, + "COUNTERS:oid:0x15000000000245": { + "SAI_QUEUE_STAT_PACKETS": "1", + "SAI_QUEUE_STAT_BYTES": "2", + "SAI_QUEUE_STAT_DROPPED_PACKETS": "3", + "SAI_QUEUE_STAT_DISCARD_DROPPED_PACKETS": "4", + "SAI_QUEUE_STAT_CURR_OCCUPANCY_BYTES": "5", + "SAI_QUEUE_STAT_WATERMARK_BYTES": "6" + }, + "COUNTERS:oid:0x15000000000246": { + "SAI_QUEUE_STAT_PACKETS": "1", + "SAI_QUEUE_STAT_BYTES": "2", + "SAI_QUEUE_STAT_DROPPED_PACKETS": "3", + "SAI_QUEUE_STAT_DISCARD_DROPPED_PACKETS": "4", + "SAI_QUEUE_STAT_CURR_OCCUPANCY_BYTES": "5", + "SAI_QUEUE_STAT_WATERMARK_BYTES": "6" + }, + "COUNTERS:oid:0x15000000000247": { + "SAI_QUEUE_STAT_PACKETS": "1", + "SAI_QUEUE_STAT_BYTES": "2", + "SAI_QUEUE_STAT_DROPPED_PACKETS": "3", + "SAI_QUEUE_STAT_DISCARD_DROPPED_PACKETS": "4", + "SAI_QUEUE_STAT_CURR_OCCUPANCY_BYTES": "5", + "SAI_QUEUE_STAT_WATERMARK_BYTES": "6" + }, + "COUNTERS:oid:0x15000000010230": { "SAI_QUEUE_STAT_PACKETS": "10", "SAI_QUEUE_STAT_BYTES": "2", "SAI_QUEUE_STAT_DROPPED_PACKETS": "3", @@ -627,7 +722,71 @@ "SAI_QUEUE_STAT_CURR_OCCUPANCY_BYTES": "5", "SAI_QUEUE_STAT_WATERMARK_BYTES": "6" }, - "COUNTERS:oid:0x15000000010251": { + "COUNTERS:oid:0x15000000010231": { + "SAI_QUEUE_STAT_PACKETS": "1", + "SAI_QUEUE_STAT_BYTES": "2", + "SAI_QUEUE_STAT_DROPPED_PACKETS": "3", + "SAI_QUEUE_STAT_DISCARD_DROPPED_PACKETS": "4", + "SAI_QUEUE_STAT_CURR_OCCUPANCY_BYTES": "5", + "SAI_QUEUE_STAT_WATERMARK_BYTES": "6" + }, + "COUNTERS:oid:0x15000000010232": { + "SAI_QUEUE_STAT_PACKETS": "1", + "SAI_QUEUE_STAT_BYTES": "2", + "SAI_QUEUE_STAT_DROPPED_PACKETS": "3", + "SAI_QUEUE_STAT_DISCARD_DROPPED_PACKETS": "4", + "SAI_QUEUE_STAT_CURR_OCCUPANCY_BYTES": "5", + "SAI_QUEUE_STAT_WATERMARK_BYTES": "6" + }, + "COUNTERS:oid:0x15000000010233": { + "SAI_QUEUE_STAT_PACKETS": "1", + "SAI_QUEUE_STAT_BYTES": "2", + "SAI_QUEUE_STAT_DROPPED_PACKETS": "3", + "SAI_QUEUE_STAT_DISCARD_DROPPED_PACKETS": "4", + "SAI_QUEUE_STAT_CURR_OCCUPANCY_BYTES": "5", + "SAI_QUEUE_STAT_WATERMARK_BYTES": "6" + }, + "COUNTERS:oid:0x15000000010234": { + "SAI_QUEUE_STAT_PACKETS": "1", + "SAI_QUEUE_STAT_BYTES": "2", + "SAI_QUEUE_STAT_DROPPED_PACKETS": "3", + "SAI_QUEUE_STAT_DISCARD_DROPPED_PACKETS": "4", + "SAI_QUEUE_STAT_CURR_OCCUPANCY_BYTES": "5", + "SAI_QUEUE_STAT_WATERMARK_BYTES": "6" + }, + "COUNTERS:oid:0x15000000010235": { + "SAI_QUEUE_STAT_PACKETS": "1", + "SAI_QUEUE_STAT_BYTES": "2", + "SAI_QUEUE_STAT_DROPPED_PACKETS": "3", + "SAI_QUEUE_STAT_DISCARD_DROPPED_PACKETS": "4", + "SAI_QUEUE_STAT_CURR_OCCUPANCY_BYTES": "5", + "SAI_QUEUE_STAT_WATERMARK_BYTES": "6" + }, + "COUNTERS:oid:0x15000000010236": { + "SAI_QUEUE_STAT_PACKETS": "1", + "SAI_QUEUE_STAT_BYTES": "2", + "SAI_QUEUE_STAT_DROPPED_PACKETS": "3", + "SAI_QUEUE_STAT_DISCARD_DROPPED_PACKETS": "4", + "SAI_QUEUE_STAT_CURR_OCCUPANCY_BYTES": "5", + "SAI_QUEUE_STAT_WATERMARK_BYTES": "6" + }, + "COUNTERS:oid:0x15000000010237": { + "SAI_QUEUE_STAT_PACKETS": "1", + "SAI_QUEUE_STAT_BYTES": "2", + "SAI_QUEUE_STAT_DROPPED_PACKETS": "3", + "SAI_QUEUE_STAT_DISCARD_DROPPED_PACKETS": "4", + "SAI_QUEUE_STAT_CURR_OCCUPANCY_BYTES": "5", + "SAI_QUEUE_STAT_WATERMARK_BYTES": "6" + }, + "COUNTERS:oid:0x15000000010240": { + "SAI_QUEUE_STAT_PACKETS": "1", + "SAI_QUEUE_STAT_BYTES": "2", + "SAI_QUEUE_STAT_DROPPED_PACKETS": "3", + "SAI_QUEUE_STAT_DISCARD_DROPPED_PACKETS": "4", + "SAI_QUEUE_STAT_CURR_OCCUPANCY_BYTES": "5", + "SAI_QUEUE_STAT_WATERMARK_BYTES": "6" + }, + "COUNTERS:oid:0x15000000010241": { "SAI_QUEUE_STAT_PACKETS": "1", "SAI_QUEUE_STAT_BYTES": "2", "SAI_QUEUE_STAT_DROPPED_PACKETS": "3", @@ -635,7 +794,7 @@ "SAI_QUEUE_STAT_CURR_OCCUPANCY_BYTES": "5", "SAI_QUEUE_STAT_WATERMARK_BYTES": "6" }, - "COUNTERS:oid:0x15000000010252": { + "COUNTERS:oid:0x15000000010242": { "SAI_QUEUE_STAT_PACKETS": "1", "SAI_QUEUE_STAT_BYTES": "2", "SAI_QUEUE_STAT_DROPPED_PACKETS": "3", @@ -643,7 +802,7 @@ "SAI_QUEUE_STAT_CURR_OCCUPANCY_BYTES": "5", "SAI_QUEUE_STAT_WATERMARK_BYTES": "6" }, - "COUNTERS:oid:0x15000000010253": { + "COUNTERS:oid:0x15000000010243": { "SAI_QUEUE_STAT_PACKETS": "1", "SAI_QUEUE_STAT_BYTES": "2", "SAI_QUEUE_STAT_DROPPED_PACKETS": "3", @@ -651,7 +810,7 @@ "SAI_QUEUE_STAT_CURR_OCCUPANCY_BYTES": "5", "SAI_QUEUE_STAT_WATERMARK_BYTES": "6" }, - "COUNTERS:oid:0x15000000010254": { + "COUNTERS:oid:0x15000000010244": { "SAI_QUEUE_STAT_PACKETS": "1", "SAI_QUEUE_STAT_BYTES": "2", "SAI_QUEUE_STAT_DROPPED_PACKETS": "3", @@ -659,7 +818,7 @@ "SAI_QUEUE_STAT_CURR_OCCUPANCY_BYTES": "5", "SAI_QUEUE_STAT_WATERMARK_BYTES": "6" }, - "COUNTERS:oid:0x15000000010255": { + "COUNTERS:oid:0x15000000010245": { "SAI_QUEUE_STAT_PACKETS": "1", "SAI_QUEUE_STAT_BYTES": "2", "SAI_QUEUE_STAT_DROPPED_PACKETS": "3", @@ -667,7 +826,7 @@ "SAI_QUEUE_STAT_CURR_OCCUPANCY_BYTES": "5", "SAI_QUEUE_STAT_WATERMARK_BYTES": "6" }, - "COUNTERS:oid:0x15000000010256": { + "COUNTERS:oid:0x15000000010246": { "SAI_QUEUE_STAT_PACKETS": "1", "SAI_QUEUE_STAT_BYTES": "2", "SAI_QUEUE_STAT_DROPPED_PACKETS": "3", @@ -675,7 +834,7 @@ "SAI_QUEUE_STAT_CURR_OCCUPANCY_BYTES": "5", "SAI_QUEUE_STAT_WATERMARK_BYTES": "6" }, - "COUNTERS:oid:0x15000000010257": { + "COUNTERS:oid:0x15000000010247": { "SAI_QUEUE_STAT_PACKETS": "1", "SAI_QUEUE_STAT_BYTES": "2", "SAI_QUEUE_STAT_DROPPED_PACKETS": "3", diff --git a/tests/mock_tables/asic2/counters_db.json b/tests/mock_tables/asic2/counters_db.json index 20febebe6a7b..6b8058da00fe 100644 --- a/tests/mock_tables/asic2/counters_db.json +++ b/tests/mock_tables/asic2/counters_db.json @@ -1,5 +1,5 @@ { - "COUNTERS:oid:0x1000000000018": { + "COUNTERS:oid:0x1000000000007": { "SAI_PORT_STAT_ETHER_STATS_TX_NO_ERRORS": "0", "SAI_PORT_STAT_ETHER_STATS_OVERSIZE_PKTS": "0", "SAI_PORT_STAT_IF_OUT_ERRORS": "0", @@ -66,7 +66,7 @@ "SAI_PORT_STAT_ETHER_IN_PKTS_2048_TO_4095_OCTETS": "0", "SAI_PORT_STAT_IP_OUT_NON_UCAST_PKTS": "0", "SAI_PORT_STAT_ETHER_STATS_JABBERS": "0", - "SAI_PORT_STAT_IF_IN_OCTETS": "4321", + "SAI_PORT_STAT_IF_IN_OCTETS": "0", "SAI_PORT_STAT_IPV6_IN_MCAST_PKTS": "0", "SAI_PORT_STAT_ETHER_STATS_PKTS_65_TO_127_OCTETS": "0", "SAI_PORT_STAT_IF_OUT_QLEN": "0", @@ -85,7 +85,7 @@ "SAI_PORT_STAT_PAUSE_RX_PKTS": "0", "SAI_PORT_STAT_PAUSE_TX_PKTS": "0", "SAI_PORT_STAT_PFC_0_RX_PKTS": "1", - "SAI_PORT_STAT_PFC_0_TX_PKTS": "209347219842134092490", + "SAI_PORT_STAT_PFC_0_TX_PKTS": "1", "SAI_PORT_STAT_PFC_1_RX_PKTS": "2", "SAI_PORT_STAT_PFC_1_TX_PKTS": "2", "SAI_PORT_STAT_PFC_2_RX_PKTS": "3", @@ -101,7 +101,7 @@ "SAI_PORT_STAT_PFC_7_RX_PKTS": "8", "SAI_PORT_STAT_PFC_7_TX_PKTS": "8" }, - "COUNTERS:oid:0x1000000000013": { + "COUNTERS:oid:0x1000000000006": { "SAI_PORT_STAT_ETHER_STATS_TX_NO_ERRORS": "0", "SAI_PORT_STAT_ETHER_STATS_OVERSIZE_PKTS": "0", "SAI_PORT_STAT_IF_OUT_ERRORS": "0", @@ -168,7 +168,7 @@ "SAI_PORT_STAT_ETHER_IN_PKTS_2048_TO_4095_OCTETS": "0", "SAI_PORT_STAT_IP_OUT_NON_UCAST_PKTS": "0", "SAI_PORT_STAT_ETHER_STATS_JABBERS": "0", - "SAI_PORT_STAT_IF_IN_OCTETS": "0", + "SAI_PORT_STAT_IF_IN_OCTETS": "40321", "SAI_PORT_STAT_IPV6_IN_MCAST_PKTS": "0", "SAI_PORT_STAT_ETHER_STATS_PKTS_65_TO_127_OCTETS": "0", "SAI_PORT_STAT_IF_OUT_QLEN": "0", @@ -203,7 +203,7 @@ "SAI_PORT_STAT_PFC_7_RX_PKTS": "8", "SAI_PORT_STAT_PFC_7_TX_PKTS": "8" }, - "COUNTERS:oid:0x1000000000015": { + "COUNTERS:oid:0x1000000000005": { "SAI_PORT_STAT_ETHER_STATS_TX_NO_ERRORS": "0", "SAI_PORT_STAT_ETHER_STATS_OVERSIZE_PKTS": "0", "SAI_PORT_STAT_IF_OUT_ERRORS": "0", @@ -305,7 +305,17 @@ "SAI_PORT_STAT_PFC_7_RX_PKTS": "8", "SAI_PORT_STAT_PFC_7_TX_PKTS": "8" }, - "COUNTERS:oid:0x1000000000014": { + "COUNTERS_PORT_NAME_MAP": { + "Ethernet-BP16": "oid:0x1000000000003", + "Ethernet-BP20": "oid:0x1000000000004", + "Ethernet-BP24": "oid:0x1000000000005", + "Ethernet-BP28": "oid:0x1000000000006" + }, + "COUNTERS_LAG_NAME_MAP": { + "PortChannel03": "oid:0x1000000000007", + "PortChannel04": "oid:0x1000000000008" + }, + "COUNTERS:oid:0x1000000000004": { "SAI_PORT_STAT_ETHER_STATS_TX_NO_ERRORS": "0", "SAI_PORT_STAT_ETHER_STATS_OVERSIZE_PKTS": "0", "SAI_PORT_STAT_IF_OUT_ERRORS": "0", @@ -407,7 +417,7 @@ "SAI_PORT_STAT_PFC_7_RX_PKTS": "8", "SAI_PORT_STAT_PFC_7_TX_PKTS": "8" }, - "COUNTERS:oid:0x1000000000017": { + "COUNTERS:oid:0x1000000000003": { "SAI_PORT_STAT_ETHER_STATS_TX_NO_ERRORS": "0", "SAI_PORT_STAT_ETHER_STATS_OVERSIZE_PKTS": "0", "SAI_PORT_STAT_IF_OUT_ERRORS": "0", @@ -493,7 +503,7 @@ "SAI_PORT_STAT_PAUSE_RX_PKTS": "0", "SAI_PORT_STAT_PAUSE_TX_PKTS": "0", "SAI_PORT_STAT_PFC_0_RX_PKTS": "1", - "SAI_PORT_STAT_PFC_0_TX_PKTS": "1", + "SAI_PORT_STAT_PFC_0_TX_PKTS": "2", "SAI_PORT_STAT_PFC_1_RX_PKTS": "2", "SAI_PORT_STAT_PFC_1_TX_PKTS": "2", "SAI_PORT_STAT_PFC_2_RX_PKTS": "3", @@ -509,7 +519,7 @@ "SAI_PORT_STAT_PFC_7_RX_PKTS": "8", "SAI_PORT_STAT_PFC_7_TX_PKTS": "8" }, - "COUNTERS:oid:0x1000000000016": { + "COUNTERS:oid:0x1000000000008": { "SAI_PORT_STAT_ETHER_STATS_TX_NO_ERRORS": "0", "SAI_PORT_STAT_ETHER_STATS_OVERSIZE_PKTS": "0", "SAI_PORT_STAT_IF_OUT_ERRORS": "0", @@ -576,7 +586,7 @@ "SAI_PORT_STAT_ETHER_IN_PKTS_2048_TO_4095_OCTETS": "0", "SAI_PORT_STAT_IP_OUT_NON_UCAST_PKTS": "0", "SAI_PORT_STAT_ETHER_STATS_JABBERS": "0", - "SAI_PORT_STAT_IF_IN_OCTETS": "40321", + "SAI_PORT_STAT_IF_IN_OCTETS": "4321", "SAI_PORT_STAT_IPV6_IN_MCAST_PKTS": "0", "SAI_PORT_STAT_ETHER_STATS_PKTS_65_TO_127_OCTETS": "0", "SAI_PORT_STAT_IF_OUT_QLEN": "0", @@ -595,7 +605,7 @@ "SAI_PORT_STAT_PAUSE_RX_PKTS": "0", "SAI_PORT_STAT_PAUSE_TX_PKTS": "0", "SAI_PORT_STAT_PFC_0_RX_PKTS": "1", - "SAI_PORT_STAT_PFC_0_TX_PKTS": "1", + "SAI_PORT_STAT_PFC_0_TX_PKTS": "209347219842134092490", "SAI_PORT_STAT_PFC_1_RX_PKTS": "2", "SAI_PORT_STAT_PFC_1_TX_PKTS": "2", "SAI_PORT_STAT_PFC_2_RX_PKTS": "3", @@ -611,45 +621,75 @@ "SAI_PORT_STAT_PFC_7_RX_PKTS": "8", "SAI_PORT_STAT_PFC_7_TX_PKTS": "8" }, - "COUNTERS_PORT_NAME_MAP": { - "Ethernet-BP16": "oid:0x1000000000013", - "Ethernet-BP20": "oid:0x1000000000014", - "Ethernet-BP24": "oid:0x1000000000015", - "Ethernet-BP28": "oid:0x1000000000016" - }, - "COUNTERS_LAG_NAME_MAP": { - "PortChannel03": "oid:0x1000000000017", - "PortChannel04": "oid:0x1000000000018" - }, "COUNTERS_QUEUE_NAME_MAP": { - "Ethernet-BP16:0": "oid:0x15000000000330", - "Ethernet-BP16:1": "oid:0x15000000000331", - "Ethernet-BP16:2": "oid:0x15000000000332", - "Ethernet-BP16:3": "oid:0x15000000000333", - "Ethernet-BP16:4": "oid:0x15000000000334", - "Ethernet-BP16:5": "oid:0x15000000000335", - "Ethernet-BP16:6": "oid:0x15000000000336", - "Ethernet-BP16:7": "oid:0x15000000000337", - "Ethernet-BP16:8": "oid:0x15000000010330", - "Ethernet-BP16:9": "oid:0x15000000010331", - "Ethernet-BP16:10": "oid:0x15000000010332", - "Ethernet-BP16:11": "oid:0x15000000010333", - "Ethernet-BP16:12": "oid:0x15000000010334", - "Ethernet-BP16:13": "oid:0x15000000010335", - "Ethernet-BP16:14": "oid:0x15000000010336", - "Ethernet-BP16:15": "oid:0x15000000010337" + "Ethernet-BP16:0": "oid:0x15000000000230", + "Ethernet-BP16:1": "oid:0x15000000000231", + "Ethernet-BP16:2": "oid:0x15000000000232", + "Ethernet-BP16:3": "oid:0x15000000000233", + "Ethernet-BP16:4": "oid:0x15000000000234", + "Ethernet-BP16:5": "oid:0x15000000000235", + "Ethernet-BP16:6": "oid:0x15000000000236", + "Ethernet-BP16:7": "oid:0x15000000000237", + "Ethernet-BP16:8": "oid:0x15000000010230", + "Ethernet-BP16:9": "oid:0x15000000010231", + "Ethernet-BP16:10": "oid:0x15000000010232", + "Ethernet-BP16:11": "oid:0x15000000010233", + "Ethernet-BP16:12": "oid:0x15000000010234", + "Ethernet-BP16:13": "oid:0x15000000010235", + "Ethernet-BP16:14": "oid:0x15000000010236", + "Ethernet-BP16:15": "oid:0x15000000010237", + "Ethernet-BP20:0": "oid:0x15000000000240", + "Ethernet-BP20:1": "oid:0x15000000000241", + "Ethernet-BP20:2": "oid:0x15000000000242", + "Ethernet-BP20:3": "oid:0x15000000000243", + "Ethernet-BP20:4": "oid:0x15000000000244", + "Ethernet-BP20:5": "oid:0x15000000000245", + "Ethernet-BP20:6": "oid:0x15000000000246", + "Ethernet-BP20:7": "oid:0x15000000000247", + "Ethernet-BP20:8": "oid:0x15000000010240", + "Ethernet-BP20:9": "oid:0x15000000010241", + "Ethernet-BP20:10": "oid:0x15000000010242", + "Ethernet-BP20:11": "oid:0x15000000010243", + "Ethernet-BP20:12": "oid:0x15000000010244", + "Ethernet-BP20:13": "oid:0x15000000010245", + "Ethernet-BP20:14": "oid:0x15000000010246", + "Ethernet-BP20:15": "oid:0x15000000010247" }, "COUNTERS_QUEUE_TYPE_MAP": { - "oid:0x15000000000330": "SAI_QUEUE_TYPE_UNICAST", - "oid:0x15000000000331": "SAI_QUEUE_TYPE_UNICAST", - "oid:0x15000000000332": "SAI_QUEUE_TYPE_UNICAST", - "oid:0x15000000000333": "SAI_QUEUE_TYPE_UNICAST", - "oid:0x15000000000334": "SAI_QUEUE_TYPE_UNICAST", - "oid:0x15000000000335": "SAI_QUEUE_TYPE_UNICAST", - "oid:0x15000000000336": "SAI_QUEUE_TYPE_UNICAST", - "oid:0x15000000000337": "SAI_QUEUE_TYPE_UNICAST" - }, - "COUNTERS:oid:0x15000000000330": { + "oid:0x15000000000230": "SAI_QUEUE_TYPE_UNICAST", + "oid:0x15000000000231": "SAI_QUEUE_TYPE_UNICAST", + "oid:0x15000000000232": "SAI_QUEUE_TYPE_UNICAST", + "oid:0x15000000000233": "SAI_QUEUE_TYPE_UNICAST", + "oid:0x15000000000234": "SAI_QUEUE_TYPE_UNICAST", + "oid:0x15000000000235": "SAI_QUEUE_TYPE_UNICAST", + "oid:0x15000000000236": "SAI_QUEUE_TYPE_UNICAST", + "oid:0x15000000000237": "SAI_QUEUE_TYPE_UNICAST", + "oid:0x15000000000240": "SAI_QUEUE_TYPE_UNICAST", + "oid:0x15000000000241": "SAI_QUEUE_TYPE_UNICAST", + "oid:0x15000000000242": "SAI_QUEUE_TYPE_UNICAST", + "oid:0x15000000000243": "SAI_QUEUE_TYPE_UNICAST", + "oid:0x15000000000244": "SAI_QUEUE_TYPE_UNICAST", + "oid:0x15000000000245": "SAI_QUEUE_TYPE_UNICAST", + "oid:0x15000000000246": "SAI_QUEUE_TYPE_UNICAST", + "oid:0x15000000000247": "SAI_QUEUE_TYPE_UNICAST", + "oid:0x15000000010230": "SAI_QUEUE_TYPE_MULTICAST", + "oid:0x15000000010231": "SAI_QUEUE_TYPE_MULTICAST", + "oid:0x15000000010232": "SAI_QUEUE_TYPE_MULTICAST", + "oid:0x15000000010233": "SAI_QUEUE_TYPE_MULTICAST", + "oid:0x15000000010234": "SAI_QUEUE_TYPE_MULTICAST", + "oid:0x15000000010235": "SAI_QUEUE_TYPE_MULTICAST", + "oid:0x15000000010236": "SAI_QUEUE_TYPE_MULTICAST", + "oid:0x15000000010237": "SAI_QUEUE_TYPE_MULTICAST", + "oid:0x15000000010240": "SAI_QUEUE_TYPE_MULTICAST", + "oid:0x15000000010241": "SAI_QUEUE_TYPE_MULTICAST", + "oid:0x15000000010242": "SAI_QUEUE_TYPE_MULTICAST", + "oid:0x15000000010243": "SAI_QUEUE_TYPE_MULTICAST", + "oid:0x15000000010244": "SAI_QUEUE_TYPE_MULTICAST", + "oid:0x15000000010245": "SAI_QUEUE_TYPE_MULTICAST", + "oid:0x15000000010246": "SAI_QUEUE_TYPE_MULTICAST", + "oid:0x15000000010247": "SAI_QUEUE_TYPE_MULTICAST" + }, + "COUNTERS:oid:0x15000000000230": { "SAI_QUEUE_STAT_PACKETS": "1", "SAI_QUEUE_STAT_BYTES": "24", "SAI_QUEUE_STAT_DROPPED_PACKETS": "3", @@ -657,7 +697,63 @@ "SAI_QUEUE_STAT_CURR_OCCUPANCY_BYTES": "5", "SAI_QUEUE_STAT_WATERMARK_BYTES": "6" }, - "COUNTERS:oid:0x15000000000331": { + "COUNTERS:oid:0x15000000000231": { + "SAI_QUEUE_STAT_PACKETS": "1", + "SAI_QUEUE_STAT_BYTES": "2", + "SAI_QUEUE_STAT_DROPPED_PACKETS": "3", + "SAI_QUEUE_STAT_DISCARD_DROPPED_PACKETS": "4", + "SAI_QUEUE_STAT_CURR_OCCUPANCY_BYTES": "5", + "SAI_QUEUE_STAT_WATERMARK_BYTES": "6" + }, + "COUNTERS:oid:0x15000000000232": { + "SAI_QUEUE_STAT_PACKETS": "1", + "SAI_QUEUE_STAT_BYTES": "2", + "SAI_QUEUE_STAT_DROPPED_PACKETS": "3", + "SAI_QUEUE_STAT_DISCARD_DROPPED_PACKETS": "4", + "SAI_QUEUE_STAT_CURR_OCCUPANCY_BYTES": "5", + "SAI_QUEUE_STAT_WATERMARK_BYTES": "6" + }, + "COUNTERS:oid:0x15000000000233": { + "SAI_QUEUE_STAT_PACKETS": "1", + "SAI_QUEUE_STAT_BYTES": "2", + "SAI_QUEUE_STAT_DROPPED_PACKETS": "3", + "SAI_QUEUE_STAT_DISCARD_DROPPED_PACKETS": "4", + "SAI_QUEUE_STAT_CURR_OCCUPANCY_BYTES": "5", + "SAI_QUEUE_STAT_WATERMARK_BYTES": "6" + }, + "COUNTERS:oid:0x15000000000234": { + "SAI_QUEUE_STAT_PACKETS": "1", + "SAI_QUEUE_STAT_BYTES": "2", + "SAI_QUEUE_STAT_DROPPED_PACKETS": "3", + "SAI_QUEUE_STAT_DISCARD_DROPPED_PACKETS": "4", + "SAI_QUEUE_STAT_CURR_OCCUPANCY_BYTES": "5", + "SAI_QUEUE_STAT_WATERMARK_BYTES": "6" + }, + "COUNTERS:oid:0x15000000000235": { + "SAI_QUEUE_STAT_PACKETS": "1", + "SAI_QUEUE_STAT_BYTES": "2", + "SAI_QUEUE_STAT_DROPPED_PACKETS": "3", + "SAI_QUEUE_STAT_DISCARD_DROPPED_PACKETS": "4", + "SAI_QUEUE_STAT_CURR_OCCUPANCY_BYTES": "5", + "SAI_QUEUE_STAT_WATERMARK_BYTES": "6" + }, + "COUNTERS:oid:0x15000000000236": { + "SAI_QUEUE_STAT_PACKETS": "1", + "SAI_QUEUE_STAT_BYTES": "2", + "SAI_QUEUE_STAT_DROPPED_PACKETS": "3", + "SAI_QUEUE_STAT_DISCARD_DROPPED_PACKETS": "4", + "SAI_QUEUE_STAT_CURR_OCCUPANCY_BYTES": "5", + "SAI_QUEUE_STAT_WATERMARK_BYTES": "6" + }, + "COUNTERS:oid:0x15000000000237": { + "SAI_QUEUE_STAT_PACKETS": "1", + "SAI_QUEUE_STAT_BYTES": "2", + "SAI_QUEUE_STAT_DROPPED_PACKETS": "3", + "SAI_QUEUE_STAT_DISCARD_DROPPED_PACKETS": "4", + "SAI_QUEUE_STAT_CURR_OCCUPANCY_BYTES": "5", + "SAI_QUEUE_STAT_WATERMARK_BYTES": "6" + }, + "COUNTERS:oid:0x15000000000240": { "SAI_QUEUE_STAT_PACKETS": "1", "SAI_QUEUE_STAT_BYTES": "2", "SAI_QUEUE_STAT_DROPPED_PACKETS": "3", @@ -665,7 +761,7 @@ "SAI_QUEUE_STAT_CURR_OCCUPANCY_BYTES": "5", "SAI_QUEUE_STAT_WATERMARK_BYTES": "6" }, - "COUNTERS:oid:0x15000000000332": { + "COUNTERS:oid:0x15000000000241": { "SAI_QUEUE_STAT_PACKETS": "1", "SAI_QUEUE_STAT_BYTES": "2", "SAI_QUEUE_STAT_DROPPED_PACKETS": "3", @@ -673,7 +769,7 @@ "SAI_QUEUE_STAT_CURR_OCCUPANCY_BYTES": "5", "SAI_QUEUE_STAT_WATERMARK_BYTES": "6" }, - "COUNTERS:oid:0x15000000000333": { + "COUNTERS:oid:0x15000000000242": { "SAI_QUEUE_STAT_PACKETS": "1", "SAI_QUEUE_STAT_BYTES": "2", "SAI_QUEUE_STAT_DROPPED_PACKETS": "3", @@ -681,7 +777,7 @@ "SAI_QUEUE_STAT_CURR_OCCUPANCY_BYTES": "5", "SAI_QUEUE_STAT_WATERMARK_BYTES": "6" }, - "COUNTERS:oid:0x15000000000334": { + "COUNTERS:oid:0x15000000000243": { "SAI_QUEUE_STAT_PACKETS": "1", "SAI_QUEUE_STAT_BYTES": "2", "SAI_QUEUE_STAT_DROPPED_PACKETS": "3", @@ -689,7 +785,7 @@ "SAI_QUEUE_STAT_CURR_OCCUPANCY_BYTES": "5", "SAI_QUEUE_STAT_WATERMARK_BYTES": "6" }, - "COUNTERS:oid:0x15000000000335": { + "COUNTERS:oid:0x15000000000244": { "SAI_QUEUE_STAT_PACKETS": "1", "SAI_QUEUE_STAT_BYTES": "2", "SAI_QUEUE_STAT_DROPPED_PACKETS": "3", @@ -697,7 +793,7 @@ "SAI_QUEUE_STAT_CURR_OCCUPANCY_BYTES": "5", "SAI_QUEUE_STAT_WATERMARK_BYTES": "6" }, - "COUNTERS:oid:0x15000000000336": { + "COUNTERS:oid:0x15000000000245": { "SAI_QUEUE_STAT_PACKETS": "1", "SAI_QUEUE_STAT_BYTES": "2", "SAI_QUEUE_STAT_DROPPED_PACKETS": "3", @@ -705,7 +801,7 @@ "SAI_QUEUE_STAT_CURR_OCCUPANCY_BYTES": "5", "SAI_QUEUE_STAT_WATERMARK_BYTES": "6" }, - "COUNTERS:oid:0x15000000000337": { + "COUNTERS:oid:0x15000000000246": { "SAI_QUEUE_STAT_PACKETS": "1", "SAI_QUEUE_STAT_BYTES": "2", "SAI_QUEUE_STAT_DROPPED_PACKETS": "3", @@ -713,7 +809,15 @@ "SAI_QUEUE_STAT_CURR_OCCUPANCY_BYTES": "5", "SAI_QUEUE_STAT_WATERMARK_BYTES": "6" }, - "COUNTERS:oid:0x15000000010330": { + "COUNTERS:oid:0x15000000000247": { + "SAI_QUEUE_STAT_PACKETS": "1", + "SAI_QUEUE_STAT_BYTES": "2", + "SAI_QUEUE_STAT_DROPPED_PACKETS": "3", + "SAI_QUEUE_STAT_DISCARD_DROPPED_PACKETS": "4", + "SAI_QUEUE_STAT_CURR_OCCUPANCY_BYTES": "5", + "SAI_QUEUE_STAT_WATERMARK_BYTES": "6" + }, + "COUNTERS:oid:0x15000000010230": { "SAI_QUEUE_STAT_PACKETS": "123459", "SAI_QUEUE_STAT_BYTES": "23492723984237432", "SAI_QUEUE_STAT_DROPPED_PACKETS": "3", @@ -721,7 +825,71 @@ "SAI_QUEUE_STAT_CURR_OCCUPANCY_BYTES": "5", "SAI_QUEUE_STAT_WATERMARK_BYTES": "6" }, - "COUNTERS:oid:0x15000000010331": { + "COUNTERS:oid:0x15000000010231": { + "SAI_QUEUE_STAT_PACKETS": "1", + "SAI_QUEUE_STAT_BYTES": "2", + "SAI_QUEUE_STAT_DROPPED_PACKETS": "3", + "SAI_QUEUE_STAT_DISCARD_DROPPED_PACKETS": "4", + "SAI_QUEUE_STAT_CURR_OCCUPANCY_BYTES": "5", + "SAI_QUEUE_STAT_WATERMARK_BYTES": "6" + }, + "COUNTERS:oid:0x15000000010232": { + "SAI_QUEUE_STAT_PACKETS": "1", + "SAI_QUEUE_STAT_BYTES": "2", + "SAI_QUEUE_STAT_DROPPED_PACKETS": "3", + "SAI_QUEUE_STAT_DISCARD_DROPPED_PACKETS": "4", + "SAI_QUEUE_STAT_CURR_OCCUPANCY_BYTES": "5", + "SAI_QUEUE_STAT_WATERMARK_BYTES": "6" + }, + "COUNTERS:oid:0x15000000010233": { + "SAI_QUEUE_STAT_PACKETS": "1", + "SAI_QUEUE_STAT_BYTES": "2", + "SAI_QUEUE_STAT_DROPPED_PACKETS": "3", + "SAI_QUEUE_STAT_DISCARD_DROPPED_PACKETS": "4", + "SAI_QUEUE_STAT_CURR_OCCUPANCY_BYTES": "5", + "SAI_QUEUE_STAT_WATERMARK_BYTES": "6" + }, + "COUNTERS:oid:0x15000000010234": { + "SAI_QUEUE_STAT_PACKETS": "1", + "SAI_QUEUE_STAT_BYTES": "2", + "SAI_QUEUE_STAT_DROPPED_PACKETS": "3", + "SAI_QUEUE_STAT_DISCARD_DROPPED_PACKETS": "4", + "SAI_QUEUE_STAT_CURR_OCCUPANCY_BYTES": "5", + "SAI_QUEUE_STAT_WATERMARK_BYTES": "6" + }, + "COUNTERS:oid:0x15000000010235": { + "SAI_QUEUE_STAT_PACKETS": "1", + "SAI_QUEUE_STAT_BYTES": "2", + "SAI_QUEUE_STAT_DROPPED_PACKETS": "3", + "SAI_QUEUE_STAT_DISCARD_DROPPED_PACKETS": "4", + "SAI_QUEUE_STAT_CURR_OCCUPANCY_BYTES": "5", + "SAI_QUEUE_STAT_WATERMARK_BYTES": "6" + }, + "COUNTERS:oid:0x15000000010236": { + "SAI_QUEUE_STAT_PACKETS": "1", + "SAI_QUEUE_STAT_BYTES": "2", + "SAI_QUEUE_STAT_DROPPED_PACKETS": "3", + "SAI_QUEUE_STAT_DISCARD_DROPPED_PACKETS": "4", + "SAI_QUEUE_STAT_CURR_OCCUPANCY_BYTES": "5", + "SAI_QUEUE_STAT_WATERMARK_BYTES": "6" + }, + "COUNTERS:oid:0x15000000010237": { + "SAI_QUEUE_STAT_PACKETS": "1", + "SAI_QUEUE_STAT_BYTES": "2", + "SAI_QUEUE_STAT_DROPPED_PACKETS": "3", + "SAI_QUEUE_STAT_DISCARD_DROPPED_PACKETS": "4", + "SAI_QUEUE_STAT_CURR_OCCUPANCY_BYTES": "5", + "SAI_QUEUE_STAT_WATERMARK_BYTES": "6" + }, + "COUNTERS:oid:0x15000000010240": { + "SAI_QUEUE_STAT_PACKETS": "1", + "SAI_QUEUE_STAT_BYTES": "2", + "SAI_QUEUE_STAT_DROPPED_PACKETS": "3", + "SAI_QUEUE_STAT_DISCARD_DROPPED_PACKETS": "4", + "SAI_QUEUE_STAT_CURR_OCCUPANCY_BYTES": "5", + "SAI_QUEUE_STAT_WATERMARK_BYTES": "6" + }, + "COUNTERS:oid:0x15000000010241": { "SAI_QUEUE_STAT_PACKETS": "1", "SAI_QUEUE_STAT_BYTES": "2", "SAI_QUEUE_STAT_DROPPED_PACKETS": "3", @@ -729,7 +897,7 @@ "SAI_QUEUE_STAT_CURR_OCCUPANCY_BYTES": "5", "SAI_QUEUE_STAT_WATERMARK_BYTES": "6" }, - "COUNTERS:oid:0x15000000010332": { + "COUNTERS:oid:0x15000000010242": { "SAI_QUEUE_STAT_PACKETS": "1", "SAI_QUEUE_STAT_BYTES": "2", "SAI_QUEUE_STAT_DROPPED_PACKETS": "3", @@ -737,7 +905,7 @@ "SAI_QUEUE_STAT_CURR_OCCUPANCY_BYTES": "5", "SAI_QUEUE_STAT_WATERMARK_BYTES": "6" }, - "COUNTERS:oid:0x15000000010333": { + "COUNTERS:oid:0x15000000010243": { "SAI_QUEUE_STAT_PACKETS": "1", "SAI_QUEUE_STAT_BYTES": "2", "SAI_QUEUE_STAT_DROPPED_PACKETS": "3", @@ -745,7 +913,7 @@ "SAI_QUEUE_STAT_CURR_OCCUPANCY_BYTES": "5", "SAI_QUEUE_STAT_WATERMARK_BYTES": "6" }, - "COUNTERS:oid:0x15000000010334": { + "COUNTERS:oid:0x15000000010244": { "SAI_QUEUE_STAT_PACKETS": "1", "SAI_QUEUE_STAT_BYTES": "2", "SAI_QUEUE_STAT_DROPPED_PACKETS": "3", @@ -753,7 +921,7 @@ "SAI_QUEUE_STAT_CURR_OCCUPANCY_BYTES": "5", "SAI_QUEUE_STAT_WATERMARK_BYTES": "6" }, - "COUNTERS:oid:0x15000000010335": { + "COUNTERS:oid:0x15000000010245": { "SAI_QUEUE_STAT_PACKETS": "1", "SAI_QUEUE_STAT_BYTES": "2", "SAI_QUEUE_STAT_DROPPED_PACKETS": "3", @@ -761,7 +929,7 @@ "SAI_QUEUE_STAT_CURR_OCCUPANCY_BYTES": "5", "SAI_QUEUE_STAT_WATERMARK_BYTES": "6" }, - "COUNTERS:oid:0x15000000010336": { + "COUNTERS:oid:0x15000000010246": { "SAI_QUEUE_STAT_PACKETS": "1", "SAI_QUEUE_STAT_BYTES": "2", "SAI_QUEUE_STAT_DROPPED_PACKETS": "3", @@ -769,7 +937,7 @@ "SAI_QUEUE_STAT_CURR_OCCUPANCY_BYTES": "5", "SAI_QUEUE_STAT_WATERMARK_BYTES": "6" }, - "COUNTERS:oid:0x15000000010337": { + "COUNTERS:oid:0x15000000010247": { "SAI_QUEUE_STAT_PACKETS": "1", "SAI_QUEUE_STAT_BYTES": "2", "SAI_QUEUE_STAT_DROPPED_PACKETS": "3", diff --git a/tests/namespace/test_fdb.py b/tests/namespace/test_fdb.py index f44ec83e6b49..f9440c467372 100644 --- a/tests/namespace/test_fdb.py +++ b/tests/namespace/test_fdb.py @@ -107,7 +107,7 @@ def test_getnextpdu_exactmatch_asic0(self): def test_getnextpdu_exactmatch_asic1(self): # oid.include = 1 - oid = ObjectIdentifier(20, 0, 1, 0, (1, 3, 6, 1, 2, 1, 17, 7, 1, 2, 2, 1, 2, 1000, 124, 254, 144, 128, 159, 8)) + oid = ObjectIdentifier(20, 0, 1, 0, (1, 3, 6, 1, 2, 1, 17, 7, 1, 2, 2, 1, 2, 1000, 124, 254, 144, 128, 159, 16)) get_pdu = GetNextPDU( header=PDUHeader(1, PduTypes.GET, 16, 0, 42, 0, 0, 0), oids=[oid] diff --git a/tests/namespace/test_pfc.py b/tests/namespace/test_pfc.py index 1ecc4a282211..7dd7eaf9e1e7 100644 --- a/tests/namespace/test_pfc.py +++ b/tests/namespace/test_pfc.py @@ -21,8 +21,6 @@ class TestPfcPortCounters(TestCase): @classmethod def setUpClass(cls): - cls.skipTest(cls, "TODO: Need to update corresponding MIB implementation \ - in the Snmp Agent for multiple namespaces/multi-asic") tests.mock_tables.dbconnector.load_namespace_config() importlib.reload(ciscoPfcExtMIB)