Fix SNMP output having fewer unicast queues than expected #330
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -134,11 +134,20 @@ def update_stats(self): | |
| if_queues = self.port_queue_list_map[if_index] | ||
| namespace = self.port_index_namespace[if_index] | ||
|
|
||
| # Count number of unicast queues | ||
| pq_count = 0 | ||
| for queue in if_queues: | ||
| queue_sai_oid = self.port_queues_map[mibs.queue_key(if_index, queue)] | ||
| if self.queue_type_map[namespace].get(queue_sai_oid) == 'SAI_QUEUE_TYPE_UNICAST': | ||
| pq_count = pq_count + 1 | ||
|
|
||
| # If there are fewer unicast queues than half of max queues, we use the old assumption of second half mcast | ||
| # To simulate vendor OID, we wrap queues by max priority groups | ||
| port_max_queues = Namespace.dbs_get_all(self.db_conn, mibs.STATE_DB, | ||
| mibs.buffer_max_parm_table(self.oid_name_map[if_index]))['max_queues'] | ||
| max_queues_half = math.ceil(int(port_max_queues) / 2) | ||
|
There was a problem hiding this comment. Can achieve https://github.com/sonic-net/sonic-snmpagent/pull/330/files#r1786870229 by not doing this check and keeping |
||
| if pq_count < max_queues_half: | ||
| pq_count = max_queues_half | ||
|
There was a problem hiding this comment. Could you add a new testcase which could fail the code before your PR? There was a problem hiding this comment. Added a new sub-case to an existing test case to check. Note: If we will commit to returning all queues, or only returning unicast queues (no matter the number), then this test case, along with other test cases will need to be updated. |
||
|
|
||
| for queue in if_queues: | ||
| # Get queue type and statistics | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It is best that we don't do this - instead return only unicast queues at all times.