Skip to content

Commit c5301b2

Browse files
justin-wong-cejustin-wong-ce
authored
Fix SNMP output having fewer unicast queues than expected (#330)
justin-wong-ce First-time contributor justin-wong-ce commented on Sep 6 • SNMP assumes the first half of the queues to be unicast and the second half to be multicast. This assumption was fine for most hwSkus but not new ones being added to support, i.e. x86_64-arista_7060x6. This change will allow configurations where there are more than half of maximum queues set as unicast. It however does not account for the case where there are more than half of the maximum queues set as multicast - that will cause problems for the sonic-mgmt snmp/test_snmp_queue.py test. If the SNMP is expected to only return unicast queues, then I will make further changes to the unit test and source code to reflect this expectation in functionality. If not, sonic-mgmt's snmp/test_snmp_queue.py should not expect only unicast queues to be returned, and SNMP should return all queues, not half (https://github.com/sonic-net/sonic-mgmt/blob/ac37f7f0fd7c7857559325a61d5ca6e6c4932194/tests/snmp/test_snmp_queue.py#L92) (grep UC) Note: Only tested on Arista hwSkus. - What I did Accommodate for the case where the number of Unicast queues exceed the number of Multicast queues. - How I did it Allow Unicast queues to be added to response when their queue number is greater than half of the total number of queues. - How to verify it Passing unit tests and SNMP tests in sonic-mgmt. Note: Only ran on Arista hwSkus - Description for the changelog
1 parent deb7b7c commit c5301b2

File tree

5 files changed

+308
-5
lines changed

5 files changed

+308
-5
lines changed

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

+11-2
Original file line numberDiff line numberDiff line change
@@ -134,11 +134,20 @@ def update_stats(self):
134134
if_queues = self.port_queue_list_map[if_index]
135135
namespace = self.port_index_namespace[if_index]
136136

137-
# The first half of queue id is for ucast, and second half is for mcast
137+
# Count number of unicast queues
138+
pq_count = 0
139+
for queue in if_queues:
140+
queue_sai_oid = self.port_queues_map[mibs.queue_key(if_index, queue)]
141+
if self.queue_type_map[namespace].get(queue_sai_oid) == 'SAI_QUEUE_TYPE_UNICAST':
142+
pq_count = pq_count + 1
143+
144+
# If there are fewer unicast queues than half of max queues, we use the old assumption of second half mcast
138145
# To simulate vendor OID, we wrap queues by max priority groups
139146
port_max_queues = Namespace.dbs_get_all(self.db_conn, mibs.STATE_DB,
140147
mibs.buffer_max_parm_table(self.oid_name_map[if_index]))['max_queues']
141-
pq_count = math.ceil(int(port_max_queues) / 2)
148+
max_queues_half = math.ceil(int(port_max_queues) / 2)
149+
if pq_count < max_queues_half:
150+
pq_count = max_queues_half
142151

143152
for queue in if_queues:
144153
# Get queue type and statistics

‎tests/mock_tables/appl_db.json

+20-1
Original file line numberDiff line numberDiff line change
@@ -447,6 +447,20 @@
447447
"lldp_rem_port_id": "Ethernet32",
448448
"lldp_rem_man_addr": "10.224.25.131"
449449
},
450+
"LLDP_ENTRY_TABLE:Ethernet78": {
451+
"lldp_rem_port_id_subtype": "5",
452+
"lldp_rem_sys_cap_supported": "28 00",
453+
"lldp_rem_index": "1",
454+
"lldp_rem_chassis_id": "00:11:22:33:44:55",
455+
"lldp_rem_sys_desc": "I'm a little teapot.",
456+
"lldp_rem_time_mark": "4844",
457+
"lldp_rem_sys_cap_enabled": "28 00",
458+
"lldp_rem_port_desc": " ",
459+
"lldp_rem_chassis_id_subtype": "4",
460+
"lldp_rem_sys_name": "switch13",
461+
"lldp_rem_port_id": "Ethernet33",
462+
"lldp_rem_man_addr": "10.224.25.132"
463+
},
450464
"LLDP_ENTRY_TABLE:eth1": {
451465
"lldp_rem_port_id_subtype": "5",
452466
"lldp_rem_sys_cap_supported": "28 00",
@@ -628,8 +642,13 @@
628642
"alias": "etp32",
629643
"speed": 100000
630644
},
645+
"PORT_TABLE:Ethernet78": {
646+
"description": "snowflake",
647+
"alias": "etp33",
648+
"speed": 100000
649+
},
631650
"ROUTE_TABLE:0.0.0.0/0": {
632-
"ifname": "Ethernet0,Ethernet4,Ethernet8,Ethernet12,Ethernet16,Ethernet20,Ethernet24,Ethernet28,Ethernet32,Ethernet36,Ethernet40,Ethernet44,Ethernet48,Ethernet52",
651+
"ifname": "Ethernet0,Ethernet4,Ethernet8,Ethernet12,Ethernet16,Ethernet20,Ethernet24,Ethernet28,Ethernet32,Ethernet36,Ethernet40,Ethernet44,Ethernet48,Ethernet52,Ethernet78",
633652
"nexthop": "10.0.0.1,10.0.0.3,10.0.0.5,10.0.0.7,10.0.0.9,10.0.0.11,10.0.0.13,10.0.0.15,10.0.0.17,10.0.0.19,10.0.0.21,10.0.0.23,10.0.0.25,10.0.0.27"
634653
},
635654
"ROUTE_TABLE:10.1.0.32": {

‎tests/mock_tables/counters_db.json

+263
Original file line numberDiff line numberDiff line change
@@ -2173,6 +2173,7 @@
21732173
"Ethernet64": "oid:0x100000000001f",
21742174
"Ethernet60": "oid:0x100000000001e",
21752175
"Ethernet20": "oid:0x1000000000015",
2176+
"Ethernet78": "oid:0x1000000000024",
21762177
"Ethernet68": "oid:0x1000000000020"
21772178
},
21782179
"COUNTERS_LAG_NAME_MAP": {
@@ -3507,6 +3508,108 @@
35073508
"SAI_PORT_STAT_PFC_7_RX_PKTS": "8",
35083509
"SAI_PORT_STAT_PFC_7_TX_PKTS": "8"
35093510
},
3511+
"COUNTERS:oid:0x1000000000024": {
3512+
"SAI_PORT_STAT_ETHER_STATS_TX_NO_ERRORS": "0",
3513+
"SAI_PORT_STAT_ETHER_STATS_OVERSIZE_PKTS": "0",
3514+
"SAI_PORT_STAT_IF_OUT_ERRORS": "0",
3515+
"SAI_PORT_STAT_ETHER_TX_OVERSIZE_PKTS": "0",
3516+
"SAI_PORT_STAT_ETHER_STATS_PKTS_1519_TO_2047_OCTETS": "0",
3517+
"SAI_PORT_STAT_IP_IN_RECEIVES": "0",
3518+
"SAI_PORT_STAT_ETHER_IN_PKTS_64_OCTETS": "0",
3519+
"SAI_PORT_STAT_IPV6_OUT_UCAST_PKTS": "0",
3520+
"SAI_PORT_STAT_ETHER_OUT_PKTS_4096_TO_9216_OCTETS": "0",
3521+
"SAI_PORT_STAT_IF_IN_ERRORS": "0",
3522+
"SAI_PORT_STAT_ETHER_STATS_PKTS": "0",
3523+
"SAI_PORT_STAT_ETHER_STATS_BROADCAST_PKTS": "0",
3524+
"SAI_PORT_STAT_IF_IN_DISCARDS": "0",
3525+
"SAI_PORT_STAT_IP_OUT_DISCARDS": "0",
3526+
"SAI_PORT_STAT_IF_IN_UNKNOWN_PROTOS": "0",
3527+
"SAI_PORT_STAT_IPV6_IN_DISCARDS": "0",
3528+
"SAI_PORT_STAT_IPV6_OUT_DISCARDS": "0",
3529+
"SAI_PORT_STAT_IPV6_IN_OCTETS": "0",
3530+
"SAI_PORT_STAT_ETHER_OUT_PKTS_65_TO_127_OCTETS": "0",
3531+
"SAI_PORT_STAT_IF_IN_BROADCAST_PKTS": "0",
3532+
"SAI_PORT_STAT_ETHER_IN_PKTS_1519_TO_2047_OCTETS": "0",
3533+
"SAI_PORT_STAT_IF_OUT_MULTICAST_PKTS": "0",
3534+
"SAI_PORT_STAT_ETHER_OUT_PKTS_512_TO_1023_OCTETS": "0",
3535+
"SAI_PORT_STAT_ETHER_STATS_PKTS_256_TO_511_OCTETS": "0",
3536+
"SAI_PORT_STAT_ETHER_STATS_PKTS_9217_TO_16383_OCTETS": "0",
3537+
"SAI_PORT_STAT_ETHER_IN_PKTS_512_TO_1023_OCTETS": "0",
3538+
"SAI_PORT_STAT_IPV6_IN_NON_UCAST_PKTS": "0",
3539+
"SAI_PORT_STAT_ETHER_IN_PKTS_4096_TO_9216_OCTETS": "0",
3540+
"SAI_PORT_STAT_IF_OUT_BROADCAST_PKTS": "0",
3541+
"SAI_PORT_STAT_IPV6_OUT_NON_UCAST_PKTS": "0",
3542+
"SAI_PORT_STAT_IF_IN_VLAN_DISCARDS": "0",
3543+
"SAI_PORT_STAT_ETHER_IN_PKTS_65_TO_127_OCTETS": "0",
3544+
"SAI_PORT_STAT_IP_IN_NON_UCAST_PKTS": "0",
3545+
"SAI_PORT_STAT_ETHER_STATS_FRAGMENTS": "0",
3546+
"SAI_PORT_STAT_IPV6_IN_UCAST_PKTS": "0",
3547+
"SAI_PORT_STAT_IPV6_IN_RECEIVES": "0",
3548+
"SAI_PORT_STAT_ETHER_STATS_PKTS_4096_TO_9216_OCTETS": "0",
3549+
"SAI_PORT_STAT_IF_OUT_DISCARDS": "0",
3550+
"SAI_PORT_STAT_ETHER_STATS_DROP_EVENTS": "0",
3551+
"SAI_PORT_STAT_IPV6_OUT_MCAST_PKTS": "0",
3552+
"SAI_PORT_STAT_ETHER_RX_OVERSIZE_PKTS": "0",
3553+
"SAI_PORT_STAT_IF_OUT_OCTETS": "0",
3554+
"SAI_PORT_STAT_IF_IN_NON_UCAST_PKTS": "0",
3555+
"SAI_PORT_STAT_ETHER_IN_PKTS_9217_TO_16383_OCTETS": "0",
3556+
"SAI_PORT_STAT_ETHER_OUT_PKTS_1024_TO_1518_OCTETS": "0",
3557+
"SAI_PORT_STAT_ETHER_STATS_PKTS_2048_TO_4095_OCTETS": "0",
3558+
"SAI_PORT_STAT_ETHER_STATS_PKTS_512_TO_1023_OCTETS": "0",
3559+
"SAI_PORT_STAT_ETHER_OUT_PKTS_1519_TO_2047_OCTETS": "0",
3560+
"SAI_PORT_STAT_ETHER_STATS_RX_NO_ERRORS": "0",
3561+
"SAI_PORT_STAT_ETHER_OUT_PKTS_64_OCTETS": "0",
3562+
"SAI_PORT_STAT_ETHER_STATS_COLLISIONS": "0",
3563+
"SAI_PORT_STAT_ETHER_IN_PKTS_1024_TO_1518_OCTETS": "0",
3564+
"SAI_PORT_STAT_ETHER_STATS_PKTS_1024_TO_1518_OCTETS": "0",
3565+
"SAI_PORT_STAT_ETHER_IN_PKTS_256_TO_511_OCTETS": "0",
3566+
"SAI_PORT_STAT_ETHER_OUT_PKTS_2048_TO_4095_OCTETS": "0",
3567+
"SAI_PORT_STAT_ETHER_STATS_OCTETS": "0",
3568+
"SAI_PORT_STAT_IF_OUT_UCAST_PKTS": "0",
3569+
"SAI_PORT_STAT_ETHER_STATS_UNDERSIZE_PKTS": "0",
3570+
"SAI_PORT_STAT_ETHER_OUT_PKTS_128_TO_255_OCTETS": "0",
3571+
"SAI_PORT_STAT_ETHER_STATS_PKTS_64_OCTETS": "0",
3572+
"SAI_PORT_STAT_IP_OUT_OCTETS": "0",
3573+
"SAI_PORT_STAT_IF_IN_UCAST_PKTS": "0",
3574+
"SAI_PORT_STAT_ETHER_OUT_PKTS_9217_TO_16383_OCTETS": "0",
3575+
"SAI_PORT_STAT_ETHER_IN_PKTS_2048_TO_4095_OCTETS": "0",
3576+
"SAI_PORT_STAT_IP_OUT_NON_UCAST_PKTS": "0",
3577+
"SAI_PORT_STAT_ETHER_STATS_JABBERS": "0",
3578+
"SAI_PORT_STAT_IF_IN_OCTETS": "0",
3579+
"SAI_PORT_STAT_IPV6_IN_MCAST_PKTS": "0",
3580+
"SAI_PORT_STAT_ETHER_STATS_PKTS_65_TO_127_OCTETS": "0",
3581+
"SAI_PORT_STAT_IF_OUT_QLEN": "0",
3582+
"SAI_PORT_STAT_ETHER_STATS_PKTS_128_TO_255_OCTETS": "0",
3583+
"SAI_PORT_STAT_IP_IN_DISCARDS": "0",
3584+
"SAI_PORT_STAT_IPV6_OUT_OCTETS": "0",
3585+
"SAI_PORT_STAT_IF_OUT_NON_UCAST_PKTS": "0",
3586+
"SAI_PORT_STAT_IP_IN_OCTETS": "0",
3587+
"SAI_PORT_STAT_ETHER_OUT_PKTS_256_TO_511_OCTETS": "0",
3588+
"SAI_PORT_STAT_ETHER_STATS_CRC_ALIGN_ERRORS": "0",
3589+
"SAI_PORT_STAT_IP_OUT_UCAST_PKTS": "0",
3590+
"SAI_PORT_STAT_IP_IN_UCAST_PKTS": "0",
3591+
"SAI_PORT_STAT_ETHER_STATS_MULTICAST_PKTS": "0",
3592+
"SAI_PORT_STAT_ETHER_IN_PKTS_128_TO_255_OCTETS": "0",
3593+
"SAI_PORT_STAT_IF_IN_MULTICAST_PKTS": "0",
3594+
"SAI_PORT_STAT_PAUSE_RX_PKTS": "0",
3595+
"SAI_PORT_STAT_PAUSE_TX_PKTS": "0",
3596+
"SAI_PORT_STAT_PFC_0_RX_PKTS": "1",
3597+
"SAI_PORT_STAT_PFC_0_TX_PKTS": "1",
3598+
"SAI_PORT_STAT_PFC_1_RX_PKTS": "2",
3599+
"SAI_PORT_STAT_PFC_1_TX_PKTS": "2",
3600+
"SAI_PORT_STAT_PFC_2_RX_PKTS": "3",
3601+
"SAI_PORT_STAT_PFC_2_TX_PKTS": "3",
3602+
"SAI_PORT_STAT_PFC_3_RX_PKTS": "4",
3603+
"SAI_PORT_STAT_PFC_3_TX_PKTS": "4",
3604+
"SAI_PORT_STAT_PFC_4_RX_PKTS": "5",
3605+
"SAI_PORT_STAT_PFC_4_TX_PKTS": "5",
3606+
"SAI_PORT_STAT_PFC_5_RX_PKTS": "6",
3607+
"SAI_PORT_STAT_PFC_5_TX_PKTS": "6",
3608+
"SAI_PORT_STAT_PFC_6_RX_PKTS": "7",
3609+
"SAI_PORT_STAT_PFC_6_TX_PKTS": "7",
3610+
"SAI_PORT_STAT_PFC_7_RX_PKTS": "8",
3611+
"SAI_PORT_STAT_PFC_7_TX_PKTS": "8"
3612+
},
35103613
"COUNTERS_QUEUE_NAME_MAP": {
35113614
"Ethernet0:0": "oid:0x15000000000230",
35123615
"Ethernet0:1": "oid:0x15000000000231",
@@ -3568,6 +3671,22 @@
35683671
"Ethernet24:13": "oid:0x15000000010275",
35693672
"Ethernet24:14": "oid:0x15000000010276",
35703673
"Ethernet24:15": "oid:0x15000000010277",
3674+
"Ethernet78:1": "oid:0x15000000000381",
3675+
"Ethernet78:2": "oid:0x15000000000382",
3676+
"Ethernet78:3": "oid:0x15000000000383",
3677+
"Ethernet78:4": "oid:0x15000000000384",
3678+
"Ethernet78:5": "oid:0x15000000000385",
3679+
"Ethernet78:6": "oid:0x15000000000386",
3680+
"Ethernet78:7": "oid:0x15000000000387",
3681+
"Ethernet78:8": "oid:0x15000000000388",
3682+
"Ethernet78:9": "oid:0x15000000000389",
3683+
"Ethernet78:10": "oid:0x1500000000038a",
3684+
"Ethernet78:11": "oid:0x15000000010381",
3685+
"Ethernet78:13": "oid:0x15000000010382",
3686+
"Ethernet78:12": "oid:0x15000000010383",
3687+
"Ethernet78:14": "oid:0x15000000010384",
3688+
"Ethernet78:15": "oid:0x15000000010385",
3689+
"Ethernet78:16": "oid:0x15000000010386",
35713690
"Ethernet32:1": "oid:0x15000000000281",
35723691
"Ethernet32:2": "oid:0x15000000000282",
35733692
"Ethernet32:4": "oid:0x15000000000284",
@@ -3640,6 +3759,22 @@
36403759
"oid:0x15000000010275": "SAI_QUEUE_TYPE_MULTICAST",
36413760
"oid:0x15000000010276": "SAI_QUEUE_TYPE_MULTICAST",
36423761
"oid:0x15000000010277": "SAI_QUEUE_TYPE_MULTICAST",
3762+
"oid:0x15000000000381": "SAI_QUEUE_TYPE_UNICAST",
3763+
"oid:0x15000000000382": "SAI_QUEUE_TYPE_UNICAST",
3764+
"oid:0x15000000000383": "SAI_QUEUE_TYPE_UNICAST",
3765+
"oid:0x15000000000384": "SAI_QUEUE_TYPE_UNICAST",
3766+
"oid:0x15000000000385": "SAI_QUEUE_TYPE_UNICAST",
3767+
"oid:0x15000000000386": "SAI_QUEUE_TYPE_UNICAST",
3768+
"oid:0x15000000000387": "SAI_QUEUE_TYPE_UNICAST",
3769+
"oid:0x15000000000388": "SAI_QUEUE_TYPE_UNICAST",
3770+
"oid:0x15000000000389": "SAI_QUEUE_TYPE_UNICAST",
3771+
"oid:0x1500000000038a": "SAI_QUEUE_TYPE_UNICAST",
3772+
"oid:0x15000000010381": "SAI_QUEUE_TYPE_MULTICAST",
3773+
"oid:0x15000000010382": "SAI_QUEUE_TYPE_MULTICAST",
3774+
"oid:0x15000000010383": "SAI_QUEUE_TYPE_MULTICAST",
3775+
"oid:0x15000000010384": "SAI_QUEUE_TYPE_MULTICAST",
3776+
"oid:0x15000000010385": "SAI_QUEUE_TYPE_MULTICAST",
3777+
"oid:0x15000000010386": "SAI_QUEUE_TYPE_MULTICAST",
36433778
"oid:0x15000000000281": "SAI_QUEUE_TYPE_UNICAST",
36443779
"oid:0x15000000000282": "SAI_QUEUE_TYPE_UNICAST",
36453780
"oid:0x15000000000284": "SAI_QUEUE_TYPE_UNICAST",
@@ -4131,6 +4266,134 @@
41314266
"SAI_QUEUE_STAT_CURR_OCCUPANCY_BYTES": "5",
41324267
"SAI_QUEUE_STAT_WATERMARK_BYTES": "6"
41334268
},
4269+
"COUNTERS:oid:0x15000000000381": {
4270+
"SAI_QUEUE_STAT_PACKETS": "1",
4271+
"SAI_QUEUE_STAT_BYTES": "2",
4272+
"SAI_QUEUE_STAT_DROPPED_PACKETS": "3",
4273+
"SAI_QUEUE_STAT_DISCARD_DROPPED_PACKETS": "4",
4274+
"SAI_QUEUE_STAT_CURR_OCCUPANCY_BYTES": "5",
4275+
"SAI_QUEUE_STAT_WATERMARK_BYTES": "6"
4276+
},
4277+
"COUNTERS:oid:0x15000000000382": {
4278+
"SAI_QUEUE_STAT_PACKETS": "1",
4279+
"SAI_QUEUE_STAT_BYTES": "2",
4280+
"SAI_QUEUE_STAT_DROPPED_PACKETS": "3",
4281+
"SAI_QUEUE_STAT_DISCARD_DROPPED_PACKETS": "4",
4282+
"SAI_QUEUE_STAT_CURR_OCCUPANCY_BYTES": "5",
4283+
"SAI_QUEUE_STAT_WATERMARK_BYTES": "6"
4284+
},
4285+
"COUNTERS:oid:0x15000000000383": {
4286+
"SAI_QUEUE_STAT_PACKETS": "1",
4287+
"SAI_QUEUE_STAT_BYTES": "2",
4288+
"SAI_QUEUE_STAT_DROPPED_PACKETS": "3",
4289+
"SAI_QUEUE_STAT_DISCARD_DROPPED_PACKETS": "4",
4290+
"SAI_QUEUE_STAT_CURR_OCCUPANCY_BYTES": "5",
4291+
"SAI_QUEUE_STAT_WATERMARK_BYTES": "6"
4292+
},
4293+
"COUNTERS:oid:0x15000000000384": {
4294+
"SAI_QUEUE_STAT_PACKETS": "1",
4295+
"SAI_QUEUE_STAT_BYTES": "2",
4296+
"SAI_QUEUE_STAT_DROPPED_PACKETS": "3",
4297+
"SAI_QUEUE_STAT_DISCARD_DROPPED_PACKETS": "4",
4298+
"SAI_QUEUE_STAT_CURR_OCCUPANCY_BYTES": "5",
4299+
"SAI_QUEUE_STAT_WATERMARK_BYTES": "6"
4300+
},
4301+
"COUNTERS:oid:0x15000000000385": {
4302+
"SAI_QUEUE_STAT_PACKETS": "1",
4303+
"SAI_QUEUE_STAT_BYTES": "2",
4304+
"SAI_QUEUE_STAT_DROPPED_PACKETS": "3",
4305+
"SAI_QUEUE_STAT_DISCARD_DROPPED_PACKETS": "4",
4306+
"SAI_QUEUE_STAT_CURR_OCCUPANCY_BYTES": "5",
4307+
"SAI_QUEUE_STAT_WATERMARK_BYTES": "6"
4308+
},
4309+
"COUNTERS:oid:0x15000000000386": {
4310+
"SAI_QUEUE_STAT_PACKETS": "1",
4311+
"SAI_QUEUE_STAT_BYTES": "2",
4312+
"SAI_QUEUE_STAT_DROPPED_PACKETS": "3",
4313+
"SAI_QUEUE_STAT_DISCARD_DROPPED_PACKETS": "4",
4314+
"SAI_QUEUE_STAT_CURR_OCCUPANCY_BYTES": "5",
4315+
"SAI_QUEUE_STAT_WATERMARK_BYTES": "6"
4316+
},
4317+
"COUNTERS:oid:0x15000000000387": {
4318+
"SAI_QUEUE_STAT_PACKETS": "1",
4319+
"SAI_QUEUE_STAT_BYTES": "2",
4320+
"SAI_QUEUE_STAT_DROPPED_PACKETS": "3",
4321+
"SAI_QUEUE_STAT_DISCARD_DROPPED_PACKETS": "4",
4322+
"SAI_QUEUE_STAT_CURR_OCCUPANCY_BYTES": "5",
4323+
"SAI_QUEUE_STAT_WATERMARK_BYTES": "6"
4324+
},
4325+
"COUNTERS:oid:0x15000000000388": {
4326+
"SAI_QUEUE_STAT_PACKETS": "1",
4327+
"SAI_QUEUE_STAT_BYTES": "2",
4328+
"SAI_QUEUE_STAT_DROPPED_PACKETS": "3",
4329+
"SAI_QUEUE_STAT_DISCARD_DROPPED_PACKETS": "4",
4330+
"SAI_QUEUE_STAT_CURR_OCCUPANCY_BYTES": "5",
4331+
"SAI_QUEUE_STAT_WATERMARK_BYTES": "6"
4332+
},
4333+
"COUNTERS:oid:0x15000000000389": {
4334+
"SAI_QUEUE_STAT_PACKETS": "1",
4335+
"SAI_QUEUE_STAT_BYTES": "2",
4336+
"SAI_QUEUE_STAT_DROPPED_PACKETS": "3",
4337+
"SAI_QUEUE_STAT_DISCARD_DROPPED_PACKETS": "4",
4338+
"SAI_QUEUE_STAT_CURR_OCCUPANCY_BYTES": "5",
4339+
"SAI_QUEUE_STAT_WATERMARK_BYTES": "6"
4340+
},
4341+
"COUNTERS:oid:0x1500000000038a": {
4342+
"SAI_QUEUE_STAT_PACKETS": "1",
4343+
"SAI_QUEUE_STAT_BYTES": "2",
4344+
"SAI_QUEUE_STAT_DROPPED_PACKETS": "3",
4345+
"SAI_QUEUE_STAT_DISCARD_DROPPED_PACKETS": "4",
4346+
"SAI_QUEUE_STAT_CURR_OCCUPANCY_BYTES": "5",
4347+
"SAI_QUEUE_STAT_WATERMARK_BYTES": "6"
4348+
},
4349+
"COUNTERS:oid:0x15000000010381": {
4350+
"SAI_QUEUE_STAT_PACKETS": "1",
4351+
"SAI_QUEUE_STAT_BYTES": "2",
4352+
"SAI_QUEUE_STAT_DROPPED_PACKETS": "3",
4353+
"SAI_QUEUE_STAT_DISCARD_DROPPED_PACKETS": "4",
4354+
"SAI_QUEUE_STAT_CURR_OCCUPANCY_BYTES": "5",
4355+
"SAI_QUEUE_STAT_WATERMARK_BYTES": "6"
4356+
},
4357+
"COUNTERS:oid:0x15000000010382": {
4358+
"SAI_QUEUE_STAT_PACKETS": "1",
4359+
"SAI_QUEUE_STAT_BYTES": "2",
4360+
"SAI_QUEUE_STAT_DROPPED_PACKETS": "3",
4361+
"SAI_QUEUE_STAT_DISCARD_DROPPED_PACKETS": "4",
4362+
"SAI_QUEUE_STAT_CURR_OCCUPANCY_BYTES": "5",
4363+
"SAI_QUEUE_STAT_WATERMARK_BYTES": "6"
4364+
},
4365+
"COUNTERS:oid:0x15000000010383": {
4366+
"SAI_QUEUE_STAT_PACKETS": "1",
4367+
"SAI_QUEUE_STAT_BYTES": "2",
4368+
"SAI_QUEUE_STAT_DROPPED_PACKETS": "3",
4369+
"SAI_QUEUE_STAT_DISCARD_DROPPED_PACKETS": "4",
4370+
"SAI_QUEUE_STAT_CURR_OCCUPANCY_BYTES": "5",
4371+
"SAI_QUEUE_STAT_WATERMARK_BYTES": "6"
4372+
},
4373+
"COUNTERS:oid:0x15000000010384": {
4374+
"SAI_QUEUE_STAT_PACKETS": "1",
4375+
"SAI_QUEUE_STAT_BYTES": "2",
4376+
"SAI_QUEUE_STAT_DROPPED_PACKETS": "3",
4377+
"SAI_QUEUE_STAT_DISCARD_DROPPED_PACKETS": "4",
4378+
"SAI_QUEUE_STAT_CURR_OCCUPANCY_BYTES": "5",
4379+
"SAI_QUEUE_STAT_WATERMARK_BYTES": "6"
4380+
},
4381+
"COUNTERS:oid:0x15000000010385": {
4382+
"SAI_QUEUE_STAT_PACKETS": "1",
4383+
"SAI_QUEUE_STAT_BYTES": "2",
4384+
"SAI_QUEUE_STAT_DROPPED_PACKETS": "3",
4385+
"SAI_QUEUE_STAT_DISCARD_DROPPED_PACKETS": "4",
4386+
"SAI_QUEUE_STAT_CURR_OCCUPANCY_BYTES": "5",
4387+
"SAI_QUEUE_STAT_WATERMARK_BYTES": "6"
4388+
},
4389+
"COUNTERS:oid:0x15000000010386": {
4390+
"SAI_QUEUE_STAT_PACKETS": "1",
4391+
"SAI_QUEUE_STAT_BYTES": "2",
4392+
"SAI_QUEUE_STAT_DROPPED_PACKETS": "3",
4393+
"SAI_QUEUE_STAT_DISCARD_DROPPED_PACKETS": "4",
4394+
"SAI_QUEUE_STAT_CURR_OCCUPANCY_BYTES": "5",
4395+
"SAI_QUEUE_STAT_WATERMARK_BYTES": "6"
4396+
},
41344397
"COUNTERS:oid:0x15000000000281": {
41354398
"SAI_QUEUE_STAT_PACKETS": "1",
41364399
"SAI_QUEUE_STAT_BYTES": "2",

‎tests/mock_tables/state_db.json

+3
Original file line numberDiff line numberDiff line change
@@ -213,5 +213,8 @@
213213
},
214214
"BUFFER_MAX_PARAM_TABLE|Ethernet32": {
215215
"max_queues": "16"
216+
},
217+
"BUFFER_MAX_PARAM_TABLE|Ethernet78": {
218+
"max_queues": "16"
216219
}
217220
}

0 commit comments

Comments
 (0)