Skip to content

Commit 74d2a09

Browse files
ayurkiv-nvdaayurkiv-nvda
authored
[portstat] check TX/RX utilization calculation correctness (#1840)
#### What I did Update test for checking TX/RX utilization #### How I did it Add real values for TX/RX to mock table instead of zeroes #### How to verify it run **portstat_test.py** via `python3 setup.py test` in sonic-utilities tests
1 parent e44c3f6 commit 74d2a09

File tree

2 files changed

+24
-24
lines changed

2 files changed

+24
-24
lines changed

‎tests/mock_tables/counters_db.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -467,10 +467,10 @@
467467
"SAI_ROUTER_INTERFACE_STAT_OUT_PACKETS": "0"
468468
},
469469
"RATES:oid:0x1000000000012": {
470-
"RX_BPS": "0",
471-
"RX_PPS": "0",
472-
"TX_BPS": "0",
473-
"TX_PPS": "0"
470+
"RX_BPS": "2.e9",
471+
"RX_PPS": "247.e3",
472+
"TX_BPS": "1.5e9",
473+
"TX_PPS": "183.e3"
474474
},
475475
"RATES:oid:0x1000000000013": {
476476
"RX_BPS": "204800",

‎tests/portstat_test.py

+20-20
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@
1212
scripts_path = os.path.join(modules_path, "scripts")
1313

1414
intf_counters_before_clear = """\
15-
IFACE STATE RX_OK RX_BPS RX_UTIL RX_ERR RX_DRP RX_OVR TX_OK TX_BPS TX_UTIL TX_ERR TX_DRP TX_OVR
16-
--------- ------- ------- ------------ --------- -------- -------- -------- ------- ----------- --------- -------- -------- --------
17-
Ethernet0 D 8 0.00 B/s 0.00% 10 100 N/A 10 0.00 B/s 0.00% N/A N/A N/A
18-
Ethernet4 N/A 4 204.80 KB/s N/A 0 1,000 N/A 40 204.85 KB/s N/A N/A N/A N/A
19-
Ethernet8 N/A 6 1350.00 KB/s N/A 100 10 N/A 60 13.37 MB/s N/A N/A N/A N/A
15+
IFACE STATE RX_OK RX_BPS RX_UTIL RX_ERR RX_DRP RX_OVR TX_OK TX_BPS TX_UTIL TX_ERR TX_DRP TX_OVR
16+
--------- ------- ------- ------------ --------- -------- -------- -------- ------- ------------ --------- -------- -------- --------
17+
Ethernet0 D 8 2000.00 MB/s 64.00% 10 100 N/A 10 1500.00 MB/s 48.00% N/A N/A N/A
18+
Ethernet4 N/A 4 204.80 KB/s N/A 0 1,000 N/A 40 204.85 KB/s N/A N/A N/A N/A
19+
Ethernet8 N/A 6 1350.00 KB/s N/A 100 10 N/A 60 13.37 MB/s N/A N/A N/A N/A
2020
"""
2121

2222
intf_counters_ethernet4 = """\
@@ -26,28 +26,28 @@
2626
"""
2727

2828
intf_counters_all = """\
29-
IFACE STATE RX_OK RX_BPS RX_PPS RX_UTIL RX_ERR RX_DRP RX_OVR TX_OK TX_BPS TX_PPS TX_UTIL TX_ERR TX_DRP TX_OVR
30-
--------- ------- ------- ------------ --------- --------- -------- -------- -------- ------- ----------- --------- --------- -------- -------- --------
31-
Ethernet0 D 8 0.00 B/s 0.00/s 0.00% 10 100 N/A 10 0.00 B/s 0.00/s 0.00% N/A N/A N/A
32-
Ethernet4 N/A 4 204.80 KB/s 200.00/s N/A 0 1,000 N/A 40 204.85 KB/s 201.00/s N/A N/A N/A N/A
33-
Ethernet8 N/A 6 1350.00 KB/s 9000.00/s N/A 100 10 N/A 60 13.37 MB/s 9000.00/s N/A N/A N/A N/A
29+
IFACE STATE RX_OK RX_BPS RX_PPS RX_UTIL RX_ERR RX_DRP RX_OVR TX_OK TX_BPS TX_PPS TX_UTIL TX_ERR TX_DRP TX_OVR
30+
--------- ------- ------- ------------ ----------- --------- -------- -------- -------- ------- ------------ ----------- --------- -------- -------- --------
31+
Ethernet0 D 8 2000.00 MB/s 247000.00/s 64.00% 10 100 N/A 10 1500.00 MB/s 183000.00/s 48.00% N/A N/A N/A
32+
Ethernet4 N/A 4 204.80 KB/s 200.00/s N/A 0 1,000 N/A 40 204.85 KB/s 201.00/s N/A N/A N/A N/A
33+
Ethernet8 N/A 6 1350.00 KB/s 9000.00/s N/A 100 10 N/A 60 13.37 MB/s 9000.00/s N/A N/A N/A N/A
3434
"""
3535

3636
intf_counters_period = """\
3737
The rates are calculated within 3 seconds period
38-
IFACE STATE RX_OK RX_BPS RX_UTIL RX_ERR RX_DRP RX_OVR TX_OK TX_BPS TX_UTIL TX_ERR TX_DRP TX_OVR
39-
--------- ------- ------- ------------ --------- -------- -------- -------- ------- ----------- --------- -------- -------- --------
40-
Ethernet0 D 0 0.00 B/s 0.00% 0 0 N/A 0 0.00 B/s 0.00% N/A N/A N/A
41-
Ethernet4 N/A 0 204.80 KB/s N/A 0 0 N/A 0 204.85 KB/s N/A N/A N/A N/A
42-
Ethernet8 N/A 0 1350.00 KB/s N/A 0 0 N/A 0 13.37 MB/s N/A N/A N/A N/A
38+
IFACE STATE RX_OK RX_BPS RX_UTIL RX_ERR RX_DRP RX_OVR TX_OK TX_BPS TX_UTIL TX_ERR TX_DRP TX_OVR
39+
--------- ------- ------- ------------ --------- -------- -------- -------- ------- ------------ --------- -------- -------- --------
40+
Ethernet0 D 0 2000.00 MB/s 64.00% 0 0 N/A 0 1500.00 MB/s 48.00% N/A N/A N/A
41+
Ethernet4 N/A 0 204.80 KB/s N/A 0 0 N/A 0 204.85 KB/s N/A N/A N/A N/A
42+
Ethernet8 N/A 0 1350.00 KB/s N/A 0 0 N/A 0 13.37 MB/s N/A N/A N/A N/A
4343
"""
4444

4545
intf_counter_after_clear = """\
46-
IFACE STATE RX_OK RX_BPS RX_UTIL RX_ERR RX_DRP RX_OVR TX_OK TX_BPS TX_UTIL TX_ERR TX_DRP TX_OVR
47-
--------- ------- ------- ------------ --------- -------- -------- -------- ------- ----------- --------- -------- -------- --------
48-
Ethernet0 D 0 0.00 B/s 0.00% 0 0 N/A 0 0.00 B/s 0.00% N/A N/A N/A
49-
Ethernet4 N/A 0 204.80 KB/s N/A 0 0 N/A 0 204.85 KB/s N/A N/A N/A N/A
50-
Ethernet8 N/A 0 1350.00 KB/s N/A 0 0 N/A 0 13.37 MB/s N/A N/A N/A N/A"""
46+
IFACE STATE RX_OK RX_BPS RX_UTIL RX_ERR RX_DRP RX_OVR TX_OK TX_BPS TX_UTIL TX_ERR TX_DRP TX_OVR
47+
--------- ------- ------- ------------ --------- -------- -------- -------- ------- ------------ --------- -------- -------- --------
48+
Ethernet0 D 0 2000.00 MB/s 64.00% 0 0 N/A 0 1500.00 MB/s 48.00% N/A N/A N/A
49+
Ethernet4 N/A 0 204.80 KB/s N/A 0 0 N/A 0 204.85 KB/s N/A N/A N/A N/A
50+
Ethernet8 N/A 0 1350.00 KB/s N/A 0 0 N/A 0 13.37 MB/s N/A N/A N/A N/A"""
5151

5252
clear_counter = """\
5353
Cleared counters"""

0 commit comments

Comments
 (0)