Fix SNMP QoS MIB only shows queues 1-6 on platform with 8 ucast/4 mca…

…st queues (Fix for sonic-net/sonic-buildimage#20033) Signed-off-by: Dylan Godwin <[email protected]>
sonic-net · Nov 12, 2024 · 73aef4d · 73aef4d
1 parent c5301b2
commit 73aef4d
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 14 deletions.
diff --git a/src/sonic_ax_impl/mibs/vendor/cisco/ciscoSwitchQosMIB.py b/src/sonic_ax_impl/mibs/vendor/cisco/ciscoSwitchQosMIB.py
@@ -149,6 +149,13 @@ def update_stats(self):
             if pq_count < max_queues_half:
                 pq_count = max_queues_half
 
+            # If there is a max_priority_group param in statedb, use that if it is greater    
+            priority_group_count = int(Namespace.dbs_get_all(self.db_conn, mibs.STATE_DB,
+                                                    mibs.buffer_max_parm_table(self.oid_name_map[if_index]))['max_priority_groups'])
+
+            if(pq_count < priority_group_count):
+                pq_count = priority_group_count
+
             for queue in if_queues:
                 # Get queue type and statistics
                 queue_sai_oid = self.port_queues_map[mibs.queue_key(if_index, queue)]

diff --git a/tests/mock_tables/asic0/state_db.json b/tests/mock_tables/asic0/state_db.json
@@ -35,12 +35,12 @@
     "state": "Active"
   },
   "BUFFER_MAX_PARAM_TABLE|Ethernet0": {
-    "max_queues": "16"
+    "max_priority_groups": "8"
   },
   "BUFFER_MAX_PARAM_TABLE|Ethernet4": {
-    "max_queues": "16"
+    "max_priority_groups": "8"
   },
   "BUFFER_MAX_PARAM_TABLE|Ethernet24": {
-    "max_queues": "16"
+    "max_priority_groups": "8"
   }
 }
diff --git a/tests/mock_tables/asic1/state_db.json b/tests/mock_tables/asic1/state_db.json
@@ -32,12 +32,12 @@
     "state": "Established"
   },
   "BUFFER_MAX_PARAM_TABLE|Ethernet8": {
-    "max_queues": "16"
+    "max_priority_groups": "8"
   },
   "BUFFER_MAX_PARAM_TABLE|Ethernet12": {
-    "max_queues": "16"
+    "max_priority_groups": "8"
   },
   "BUFFER_MAX_PARAM_TABLE|Ethernet32": {
-    "max_queues": "16"
+    "max_priority_groups": "8"
   }
 }
diff --git a/tests/mock_tables/asic2/state_db.json b/tests/mock_tables/asic2/state_db.json
@@ -6,12 +6,12 @@
     "state": "Established"
   },
   "BUFFER_MAX_PARAM_TABLE|Ethernet-BP16": {
-    "max_queues": "16"
+    "max_priority_groups": "8"
   },
   "BUFFER_MAX_PARAM_TABLE|Ethernet-BP20": {
-    "max_queues": "16"
+    "max_priority_groups": "8"
   },
   "BUFFER_MAX_PARAM_TABLE|Ethernet40": {
-    "max_queues": "16"
+    "max_priority_groups": "8"
   }
 }
diff --git a/tests/mock_tables/state_db.json b/tests/mock_tables/state_db.json
@@ -197,24 +197,31 @@
     "state" : "Deleted"
     },
   "BUFFER_MAX_PARAM_TABLE|Ethernet0": {
-    "max_queues": "16"
+    "max_queues": "16",
+    "max_priority_groups": "8"
     },
   "BUFFER_MAX_PARAM_TABLE|Ethernet4": {
-    "max_queues": "16"
+    "max_queues": "16",
+    "max_priority_groups": "8"
     },
   "BUFFER_MAX_PARAM_TABLE|Ethernet8": {
-    "max_queues": "16"
+    "max_queues": "16",
+    "max_priority_groups": "8"
   },
   "BUFFER_MAX_PARAM_TABLE|Ethernet16": {
-    "max_queues": "16"
+    "max_queues": "16",
+    "max_priority_groups": "8"
   },
   "BUFFER_MAX_PARAM_TABLE|Ethernet24": {
-    "max_queues": "16"
+    "max_queues": "16",
+    "max_priority_groups": "8"
   },
   "BUFFER_MAX_PARAM_TABLE|Ethernet32": {
+    "max_priority_groups": "8",
     "max_queues": "16"
   },
   "BUFFER_MAX_PARAM_TABLE|Ethernet78": {
+    "max_priority_groups": "8",
     "max_queues": "16"
   }
 }