Commit 1bc24ca
authored
[portstat pfcstat] Unify the packet number format in the output of portstat and pfcstat in all cases (sonic-net#1755)
#### What I did
Unify the packet number format in the output of "portstat" and "pfcstat" for all cases.
In some cases, the packet numbers in the output of these two commands are formatted with a comma, in some cases not.
This is because only when the numbers are treated by function `ns_diff`, it will format the numbers with commas: `return '{:,}'.format(max(0, new - old))` , but `ns_diff` is not called in all cases.
**for example, packet numbers in the output are NOT formatted with commas:**
```
pfcstat
root@r-qa-sw-eth-2133:/home/admin# pfcstat
Port Rx PFC0 PFC1 PFC2 PFC3 PFC4 PFC5 PFC6 PFC7
----------- ------ ------ ------ ------ ------ ------ ------ ------
Ethernet120 0 0 0 0 0 0 0 0
Ethernet124 137407 0 45659 45660 0 45662 0 0 <-----FORMAT OF DATA BEFORE clear counters
portstat
portstat
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
----------- ------- -------- -------- --------- -------- -------- -------- -------- -------- --------- -------- -------- --------
Ethernet0 X 0 N/A N/A 0 0 0 0 N/A N/A 0 0 0
Ethernet4 U 12804864 N/A N/A 0 0 0 9 N/A N/A 0 0 0
Ethernet8 X 0 N/A N/A 0 0 0 0 N/A N/A 0 0 0
Ethernet120 U 1 N/A N/A 0 0 0 11 N/A N/A 0 0 0
Ethernet124 U 1 N/A N/A 0 0 0 12363470 N/A N/A 0 429517 0
```
**packet numbers in the output are formatted with commas:**
```
pfcstat
Last cached time was 2021-08-02 10:35:32.725158
Port Rx PFC0 PFC1 PFC2 PFC3 PFC4 PFC5 PFC6 PFC7
----------- ------ ------ ------ ------ ------ ------ ------ ------
Ethernet120 0 0 0 0 0 0 0 0
Ethernet124 25,007 0 25,006 25,006 0 25,007 0 0 <-----DIFFERENT FORMAT AFTER COUNTER CLEAR COMMAND
portstat
Last cached time was 2021-08-02 10:35:47.829677
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
----------- ------- --------- ------------ --------- -------- -------- -------- --------- ----------- --------- -------- -------- --------
Ethernet0 X 0 0.00 B/s 0.00% 0 0 0 0 0.00 B/s 0.00% 0 0 0
Ethernet4 U 1,570,775 862.60 MB/s 69.01% 0 0 0 0 28.29 KB/s 0.00% 0 0 0
Ethernet120 U 0 0.00 B/s 0.00% 0 0 0 0 0.00 B/s 0.00% 0 0 0
Ethernet124 U 0 1406.45 KB/s 0.11% 0 0 0 1,488,765 817.56 MB/s 65.40% 0 83,040 0 <----DIFFERENT PRESENTATION FORMAT OF NUMBERS
```
#### How I did it
Add a new function `format_number_with_comma` to format the packet numbers with comma, this function will be called in case `ns_diff` is not applicable.
Update the unitest to cover this new change.
#### How to verify it
execute portstat and pfcstat to check the output whether the number format is expected.
#### Previous command output (if the output of a command-line utility has changed)
```
pfcstat
root@r-qa-sw-eth-2133:/home/admin# pfcstat
Port Rx PFC0 PFC1 PFC2 PFC3 PFC4 PFC5 PFC6 PFC7
----------- ------ ------ ------ ------ ------ ------ ------ ------
Ethernet116 0 0 0 0 0 0 0 0
Ethernet120 0 0 0 0 0 0 0 0
Ethernet124 137407 0 45659 45660 0 45662 0 0
portstat
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
----------- ------- -------- -------- --------- -------- -------- -------- -------- -------- --------- -------- -------- --------
Ethernet0 X 0 N/A N/A 0 0 0 0 N/A N/A 0 0 0
Ethernet4 U 804864 N/A N/A 0 0 0 9 N/A N/A 0 0 0
Ethernet120 U 1 N/A N/A 0 0 0 11 N/A N/A 0 0 0
Ethernet124 U 1 N/A N/A 0 0 0 363470 N/A N/A 0 429517 0
```
#### New command output (if the output of a command-line utility has changed)
```
pfcstat
root@r-qa-sw-eth-2133:/home/admin# pfcstat
Port Rx PFC0 PFC1 PFC2 PFC3 PFC4 PFC5 PFC6 PFC7
----------- ------ ------ ------ ------ ------ ------ ------ ------
Ethernet116 0 0 0 0 0 0 0 0
Ethernet120 0 0 0 0 0 0 0 0
Ethernet124 137,407 0 45,659 45,660 0 45,662 0 0
portstat
Last cached time was 2021-08-02 10:35:47.829677
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
----------- ------- -------- -------- --------- -------- -------- -------- -------- -------- --------- -------- -------- --------
Ethernet0 X 0 N/A N/A 0 0 0 0 N/A N/A 0 0 0
Ethernet4 U 804,864 N/A N/A 0 0 0 9 N/A N/A 0 0 0
Ethernet120 U 1 N/A N/A 0 0 0 11 N/A N/A 0 0 0
Ethernet124 U 1 N/A N/A 0 0 0 363,470 N/A N/A 0 429,517 0
```1 parent d7900dd commit 1bc24ca
File tree
9 files changed
+157
-121
lines changed- scripts
- tests
- mock_tables
- asic0
- asic1
- asic2
- utilities_common
9 files changed
+157
-121
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
18 | 18 | | |
19 | 19 | | |
20 | 20 | | |
21 | | - | |
| 21 | + | |
22 | 22 | | |
23 | 23 | | |
24 | 24 | | |
| |||
141 | 141 | | |
142 | 142 | | |
143 | 143 | | |
144 | | - | |
145 | | - | |
146 | | - | |
147 | | - | |
| 144 | + | |
| 145 | + | |
| 146 | + | |
| 147 | + | |
| 148 | + | |
| 149 | + | |
| 150 | + | |
| 151 | + | |
148 | 152 | | |
149 | 153 | | |
150 | 154 | | |
| |||
176 | 180 | | |
177 | 181 | | |
178 | 182 | | |
179 | | - | |
180 | | - | |
181 | | - | |
182 | | - | |
| 183 | + | |
| 184 | + | |
| 185 | + | |
| 186 | + | |
| 187 | + | |
| 188 | + | |
| 189 | + | |
| 190 | + | |
183 | 191 | | |
184 | 192 | | |
185 | 193 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
38 | 38 | | |
39 | 39 | | |
40 | 40 | | |
41 | | - | |
| 41 | + | |
42 | 42 | | |
43 | 43 | | |
44 | 44 | | |
| |||
238 | 238 | | |
239 | 239 | | |
240 | 240 | | |
241 | | - | |
242 | | - | |
243 | | - | |
244 | | - | |
| 241 | + | |
| 242 | + | |
| 243 | + | |
| 244 | + | |
| 245 | + | |
| 246 | + | |
| 247 | + | |
| 248 | + | |
| 249 | + | |
| 250 | + | |
245 | 251 | | |
246 | 252 | | |
247 | 253 | | |
248 | | - | |
249 | | - | |
| 254 | + | |
| 255 | + | |
| 256 | + | |
| 257 | + | |
| 258 | + | |
| 259 | + | |
250 | 260 | | |
251 | 261 | | |
252 | 262 | | |
253 | | - | |
254 | | - | |
| 263 | + | |
| 264 | + | |
| 265 | + | |
| 266 | + | |
255 | 267 | | |
256 | 268 | | |
257 | 269 | | |
258 | | - | |
259 | | - | |
260 | | - | |
261 | | - | |
| 270 | + | |
| 271 | + | |
| 272 | + | |
| 273 | + | |
| 274 | + | |
| 275 | + | |
| 276 | + | |
| 277 | + | |
| 278 | + | |
| 279 | + | |
262 | 280 | | |
263 | 281 | | |
264 | 282 | | |
| |||
371 | 389 | | |
372 | 390 | | |
373 | 391 | | |
374 | | - | |
| 392 | + | |
375 | 393 | | |
376 | 394 | | |
377 | 395 | | |
378 | | - | |
379 | | - | |
380 | | - | |
381 | | - | |
| 396 | + | |
| 397 | + | |
| 398 | + | |
| 399 | + | |
382 | 400 | | |
383 | 401 | | |
384 | 402 | | |
385 | | - | |
386 | | - | |
387 | | - | |
| 403 | + | |
| 404 | + | |
| 405 | + | |
388 | 406 | | |
389 | 407 | | |
390 | 408 | | |
| |||
423 | 441 | | |
424 | 442 | | |
425 | 443 | | |
426 | | - | |
| 444 | + | |
427 | 445 | | |
428 | 446 | | |
429 | | - | |
430 | | - | |
431 | | - | |
432 | | - | |
| 447 | + | |
| 448 | + | |
| 449 | + | |
| 450 | + | |
433 | 451 | | |
434 | 452 | | |
435 | | - | |
436 | | - | |
437 | | - | |
| 453 | + | |
| 454 | + | |
| 455 | + | |
438 | 456 | | |
439 | 457 | | |
440 | 458 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1474 | 1474 | | |
1475 | 1475 | | |
1476 | 1476 | | |
1477 | | - | |
| 1477 | + | |
1478 | 1478 | | |
1479 | 1479 | | |
1480 | 1480 | | |
1481 | 1481 | | |
1482 | 1482 | | |
1483 | 1483 | | |
1484 | 1484 | | |
1485 | | - | |
| 1485 | + | |
1486 | 1486 | | |
1487 | 1487 | | |
1488 | 1488 | | |
| |||
1502 | 1502 | | |
1503 | 1503 | | |
1504 | 1504 | | |
1505 | | - | |
| 1505 | + | |
1506 | 1506 | | |
1507 | 1507 | | |
1508 | 1508 | | |
1509 | 1509 | | |
1510 | 1510 | | |
1511 | 1511 | | |
1512 | 1512 | | |
1513 | | - | |
| 1513 | + | |
1514 | 1514 | | |
1515 | 1515 | | |
1516 | 1516 | | |
| |||
1530 | 1530 | | |
1531 | 1531 | | |
1532 | 1532 | | |
1533 | | - | |
| 1533 | + | |
1534 | 1534 | | |
1535 | 1535 | | |
1536 | 1536 | | |
1537 | 1537 | | |
1538 | 1538 | | |
1539 | 1539 | | |
1540 | 1540 | | |
1541 | | - | |
| 1541 | + | |
1542 | 1542 | | |
1543 | 1543 | | |
1544 | 1544 | | |
| |||
1558 | 1558 | | |
1559 | 1559 | | |
1560 | 1560 | | |
1561 | | - | |
| 1561 | + | |
1562 | 1562 | | |
1563 | 1563 | | |
1564 | 1564 | | |
1565 | 1565 | | |
1566 | 1566 | | |
1567 | 1567 | | |
1568 | 1568 | | |
1569 | | - | |
| 1569 | + | |
1570 | 1570 | | |
1571 | 1571 | | |
1572 | 1572 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
130 | 130 | | |
131 | 131 | | |
132 | 132 | | |
133 | | - | |
| 133 | + | |
134 | 134 | | |
135 | 135 | | |
136 | 136 | | |
137 | 137 | | |
138 | 138 | | |
139 | 139 | | |
140 | 140 | | |
141 | | - | |
| 141 | + | |
142 | 142 | | |
143 | 143 | | |
144 | 144 | | |
| |||
158 | 158 | | |
159 | 159 | | |
160 | 160 | | |
161 | | - | |
| 161 | + | |
162 | 162 | | |
163 | 163 | | |
164 | 164 | | |
165 | 165 | | |
166 | 166 | | |
167 | 167 | | |
168 | 168 | | |
169 | | - | |
| 169 | + | |
170 | 170 | | |
171 | 171 | | |
172 | 172 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1474 | 1474 | | |
1475 | 1475 | | |
1476 | 1476 | | |
1477 | | - | |
| 1477 | + | |
1478 | 1478 | | |
1479 | 1479 | | |
1480 | 1480 | | |
1481 | 1481 | | |
1482 | 1482 | | |
1483 | 1483 | | |
1484 | 1484 | | |
1485 | | - | |
| 1485 | + | |
1486 | 1486 | | |
1487 | 1487 | | |
1488 | 1488 | | |
| |||
1502 | 1502 | | |
1503 | 1503 | | |
1504 | 1504 | | |
1505 | | - | |
| 1505 | + | |
1506 | 1506 | | |
1507 | 1507 | | |
1508 | 1508 | | |
1509 | 1509 | | |
1510 | 1510 | | |
1511 | 1511 | | |
1512 | 1512 | | |
1513 | | - | |
| 1513 | + | |
1514 | 1514 | | |
1515 | 1515 | | |
1516 | 1516 | | |
| |||
1530 | 1530 | | |
1531 | 1531 | | |
1532 | 1532 | | |
1533 | | - | |
| 1533 | + | |
1534 | 1534 | | |
1535 | 1535 | | |
1536 | 1536 | | |
1537 | 1537 | | |
1538 | 1538 | | |
1539 | 1539 | | |
1540 | 1540 | | |
1541 | | - | |
| 1541 | + | |
1542 | 1542 | | |
1543 | 1543 | | |
1544 | 1544 | | |
| |||
1558 | 1558 | | |
1559 | 1559 | | |
1560 | 1560 | | |
1561 | | - | |
| 1561 | + | |
1562 | 1562 | | |
1563 | 1563 | | |
1564 | 1564 | | |
1565 | 1565 | | |
1566 | 1566 | | |
1567 | 1567 | | |
1568 | 1568 | | |
1569 | | - | |
| 1569 | + | |
1570 | 1570 | | |
1571 | 1571 | | |
1572 | 1572 | | |
| |||
0 commit comments