[Namespace]: In multi-asic platforms, SAI object ID is not

unique across the device. The SAI object ID is unique for asic
or within a namespace. Modify the existing code to make sure that
data structures using SAI OID, it is not used as a key directly.
Modify implementation for MIB tables using COUNTER_DB and ASIC_DB
so that SAI OID is used to retrieve data only from a single
namespace.
Signed-off-by: SuvarnaMeenakshi <sumeenak@microsoft.com>

src/sonic_ax_impl/mibs/__init__.py

@@ -304,7 +304,7 @@ def init_sync_d_queue_tables(db_conn):
 
     # 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}}
+    # queue_stat_map -> {"if_index : queue stat table name" : {counter name : value}} 
     # port_queue_list_map -> {if_index: [sorted queue list]}
     port_queues_map = {}
     queue_stat_map = {}
@@ -320,7 +320,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)]
@@ -519,6 +520,7 @@ def init_namespace_sync_d_interface_tables(dbs):
         global db. First db in the list is global db.
         Ignore first global db to get interface tables if there
         are multiple namespaces.
+        if_id_map = {db_index: {sai_oid : if_name}}
         """
         for db_conn in Namespace.get_non_host_dbs(dbs):
             if_name_map_ns, \
@@ -528,7 +530,7 @@ def init_namespace_sync_d_interface_tables(dbs):
             oid_name_map_ns = init_sync_d_interface_tables(db_conn)
             if_name_map.update(if_name_map_ns)
             if_alias_map.update(if_alias_map_ns)
-            if_id_map.update(if_id_map_ns)
+            if_id_map[inst] = if_id_map_ns
             oid_sai_map.update(oid_sai_map_ns)
             oid_name_map.update(oid_name_map_ns)
 
@@ -580,20 +582,13 @@ def init_namespace_sync_d_queue_tables(dbs):
         return port_queues_map, queue_stat_map, port_queue_list_map
 
     @staticmethod
-    def dbs_get_bridge_port_map(dbs, db_name):
+    def dbs_get_bridge_port_map(dbs):
         """
         get_bridge_port_map from all namespace DBs
         """
         if_br_oid_map = {}
-        for db_conn in Namespace.get_non_host_dbs(dbs):
-            if_br_oid_map_ns = port_util.get_bridge_port_map(db_conn)
-            if_br_oid_map.update(if_br_oid_map_ns)
+        for inst in range(Namespace.get_start_idx_of_non_host(dbs), len(dbs)):
+            if_br_oid_map_ns = port_util.get_bridge_port_map(dbs[inst])
+            if_br_oid_map[inst] = if_br_oid_map_ns
         return if_br_oid_map
 
-    @staticmethod
-    def dbs_get_vlan_id_from_bvid(dbs, bvid):
-        for db_conn in Namespace.get_non_host_dbs(dbs):
-            db_conn.connect('ASIC_DB')
-            vlan_obj = db_conn.keys('ASIC_DB', "ASIC_STATE:SAI_OBJECT_TYPE_VLAN:" + bvid)
-            if vlan_obj is not None:
-                return port_util.get_vlan_id_from_bvid(db_conn, bvid)

src/sonic_ax_impl/mibs/ietf/rfc1213.py

@@ -192,8 +192,8 @@ def update_data(self):
         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}
+            {if_idx: self.db_conn[self.if_oid_namespace[if_idx]].get_all(
+             mibs.COUNTERS_DB, mibs.counter_table(self.oid_sai_map[if_idx]), blocking=True)
 
         self.lag_name_if_name_map, \
         self.if_name_lag_name_map, \
@@ -254,12 +254,11 @@ def _get_counter(self, oid, table_name):
         :param table_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 table_name = 'name_of_the_table'
         _table_name = bytes(getattr(table_name, 'name', table_name), 'utf-8')
 
         try:
-            counter_value = self.if_counters[sai_id][_table_name]
+            counter_value = self.if_counters[oid][_table_name]
             # truncate to 32-bit counter (database implements 64-bit counters)
             counter_value = int(counter_value) & 0x00000000ffffffff
             # done!

src/sonic_ax_impl/mibs/ietf/rfc2863.py

@@ -98,10 +98,9 @@ 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}
-
+        self.if_counters = \
+            {if_idx: self.db_conn[self.if_oid_namespace[if_idx]].get_all(
+                mibs.COUNTERS_DB, mibs.counter_table(self.oid_sai_map[if_idx]), blocking=True)
 
     def get_next(self, sub_id):
         """
@@ -186,11 +185,10 @@ def _get_counter(self, oid, table_name, mask):
 
             return counter_value & mask
 
-        sai_id = self.oid_sai_map[oid]
         # Enum.name or table_name = 'name_of_the_table'
         _table_name = bytes(getattr(table_name, 'name', table_name), 'utf-8')
         try:
-            counter_value = self.if_counters[sai_id][_table_name]
+            counter_value = self.if_counters[oid][_table_name]
             # truncate to 32-bit counter (database implements 64-bit counters)
             counter_value = int(counter_value) & mask
             # done!

src/sonic_ax_impl/mibs/ietf/rfc4363.py

@@ -22,17 +22,17 @@ def __init__(self):
         self.if_bpid_map = {}
         self.bvid_vlan_map = {}
 
-    def fdb_vlanmac(self, fdb):
+    def fdb_vlanmac(self, fdb, db_index):
         if 'vlan' in fdb:
             vlan_id = fdb["vlan"]
         elif 'bvid' in fdb:
             if fdb["bvid"] in self.bvid_vlan_map:
                 vlan_id = self.bvid_vlan_map[fdb["bvid"]]
             else:
-                vlan_id = Namespace.dbs_get_vlan_id_from_bvid(self.db_conn, fdb["bvid"])
+                vlan_id = port_util.get_vlan_id_from_bvid(self.db_conn[db_index], fdb["bvid"])
                 self.bvid_vlan_map[fdb["bvid"]] = vlan_id
         return (int(vlan_id),) + mac_decimals(fdb["mac"])
-          
+
     def reinit_data(self):
         """
         Subclass update interface information
@@ -41,7 +41,7 @@ def reinit_data(self):
         self.if_alias_map, \
         self.if_id_map, \
         self.oid_sai_map, \
-        self.oid_name_map = Namespace.init_namespace_sync_d_interface_tables(self.db_conn)
+        self.oid_name_map, _ = Namespace.init_namespace_sync_d_interface_tables(self.db_conn)
 
         self.if_bpid_map = Namespace.dbs_get_bridge_port_map(self.db_conn, mibs.ASIC_DB)
         self.bvid_vlan_map.clear()
@@ -54,28 +54,33 @@ def update_data(self):
         self.vlanmac_ifindex_map = {}
         self.vlanmac_ifindex_list = []
 
-        fdb_strings = Namespace.dbs_keys(self.db_conn, mibs.ASIC_DB, "ASIC_STATE:SAI_OBJECT_TYPE_FDB_ENTRY:*")
-        if not fdb_strings:
-            return
-
-        for s in fdb_strings:
-            fdb_str = s.decode()
-            try:
-                fdb = json.loads(fdb_str.split(":", maxsplit=2)[-1])
-            except ValueError as e:  # includes simplejson.decoder.JSONDecodeError
-                mibs.logger.error("SyncD 'ASIC_DB' includes invalid FDB_ENTRY '{}': {}.".format(fdb_str, e))
-                break
-
-            ent = Namespace.dbs_get_all(self.db_conn, mibs.ASIC_DB, s, blocking=True)
-            # Example output: oid:0x3a000000000608
-            bridge_port_id = ent[b"SAI_FDB_ENTRY_ATTR_BRIDGE_PORT_ID"][6:]
-            if bridge_port_id not in self.if_bpid_map:
-                continue
-            port_id = self.if_bpid_map[bridge_port_id]
-
-            vlanmac = self.fdb_vlanmac(fdb)
-            self.vlanmac_ifindex_map[vlanmac] = mibs.get_index(self.if_id_map[port_id])
-            self.vlanmac_ifindex_list.append(vlanmac)
+        Namespace.connect_all_dbs(self.db_conn, mibs.ASIC_DB)
+
+        for db_index in range(Namespace.get_start_idx_of_non_host(self.db_conn), len(self.db_conn)):
+            fdb_strings = self.db_conn[db_index].keys(mibs.ASIC_DB, "ASIC_STATE:SAI_OBJECT_TYPE_FDB_ENTRY:*")
+            if not fdb_strings:
+                 continue
+            for s in fdb_strings:
+                fdb_str = s.decode()
+                try:
+                    fdb = json.loads(fdb_str.split(":", maxsplit=2)[-1])
+                except ValueError as e:  # includes simplejson.decoder.JSONDecodeError
+                    mibs.logger.error("SyncD 'ASIC_DB' includes invalid FDB_ENTRY '{}': {}.".format(fdb_str, e))
+                    break
+
+                ent = self.db_conn[db_index].get_all(mibs.ASIC_DB, s, blocking=True)
+                # Example output: oid:0x3a000000000608
+                bridge_port_id = ent[b"SAI_FDB_ENTRY_ATTR_BRIDGE_PORT_ID"][6:]
+                #if_bpid_map = self.if_bpid_map[db_index]
+                if db_index not in self.if_bpid_map or db_index not in self.if_id_map:
+                    continue
+                if bridge_port_id not in self.if_bpid_map[db_index]:
+                    continue
+                port_id = self.if_bpid_map[db_index][bridge_port_id]
+
+                vlanmac = self.fdb_vlanmac(fdb, db_index)
+                self.vlanmac_ifindex_map[vlanmac] = mibs.get_index(self.if_id_map[db_index][port_id])
+                self.vlanmac_ifindex_list.append(vlanmac)
         self.vlanmac_ifindex_list.sort()
 
     def fdb_ifindex(self, sub_id):

src/sonic_ax_impl/mibs/vendor/cisco/ciscoPfcExtMIB.py

@@ -46,8 +46,8 @@ def update_data(self):
         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}
+            {if_idx: self.db_conn[self.if_oid_namespace[if_idx]].get_all(
+                 mibs.COUNTERS_DB, mibs.counter_table(self.oid_sai_map[if_idx]), blocking=True)
 
         self.lag_name_if_name_map, \
         self.if_name_lag_name_map, \
@@ -88,13 +88,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

src/sonic_ax_impl/mibs/vendor/cisco/ciscoSwitchQosMIB.py

@@ -79,8 +79,13 @@ def reinit_data(self):
         self.port_queues_map, self.queue_stat_map, self.port_queue_list_map = \
             Namespace.init_namespace_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)
-
+        """
+        COUNTERS_QUEUE_TYPE_MAP OID will be the same for all namespaces.
+        Get OID list from first namespace.
+        """
+        db_start_idx = Namespace.get_start_idx_of_non_host(self.db_conn)
+        self.queue_type_map = self.db_conn[db_start_idx].get_all(mibs.COUNTERS_DB, "COUNTERS_QUEUE_TYPE_MAP", blocking=False)
+
         self.update_data()
 
     def update_data(self):
@@ -90,7 +95,8 @@ 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)
+            queue_stat_idx = mibs.queue_key(if_index, queue_stat_table_name)
+            queue_stat = self.queue_stat_map.get(queue_stat_idx, {})
             if queue_stat is not None:
                 self.queue_stat_map[queue_stat_name] = queue_stat
 

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