From 9e872c4d0f56bdf66090b6e7eaba82c8cfcb6632 Mon Sep 17 00:00:00 2001 From: Sebastien GODARD Date: Fri, 28 Jun 2019 09:23:51 +0200 Subject: [PATCH] simtest: Try to simulate the addition of a new FB host For this, we need to make sure that FB hosts will always be read in the same order (and especially on Travis CI VM) though this may depend on the underlying filesystem implementation. Signed-off-by: Sebastien GODARD --- tests/expected.sadf-d | 2 + tests/expected.sadf-g | 144 ++++++++++++++---- tests/expected.sadf-j | 6 +- tests/expected.sadf-p | 8 + tests/expected.sadf-r | 12 +- tests/expected.sadf-x | 12 +- tests/expected.sar-all | 3 + tests/expected.sar-dec | 3 + tests/expected.sar-human | 3 + tests/expected2.sadf-g | 134 +++++++++++++--- tests/expected2.sar-all | 3 + tests/expected3.sar-all | 3 + tests/root.README | 2 +- tests/root1/sys/class/fc_host/_list | 3 + tests/root2/sys/class/fc_host/_list | 3 + tests/root3/sys/class/fc_host/_list | 3 + tests/root4/sys/class/fc_host/_list | 4 + .../class/fc_host/host0/statistics/rx_frames | 2 +- .../class/fc_host/host0/statistics/rx_words | 2 +- .../class/fc_host/host0/statistics/tx_frames | 2 +- .../class/fc_host/host0/statistics/tx_words | 2 +- .../class/fc_host/host1/statistics/rx_frames | 1 + .../class/fc_host/host1/statistics/rx_words | 1 + .../class/fc_host/host1/statistics/tx_frames | 1 + .../class/fc_host/host1/statistics/tx_words | 1 + tests/root5/sys/class/fc_host/_list | 4 + .../class/fc_host/host1/statistics/rx_frames | 1 + .../class/fc_host/host1/statistics/rx_words | 1 + .../class/fc_host/host1/statistics/tx_frames | 1 + .../class/fc_host/host1/statistics/tx_words | 1 + tests/root6/sys/class/fc_host/_list | 3 + tests/root7/sys/class/fc_host/_list | 3 + 32 files changed, 308 insertions(+), 66 deletions(-) create mode 100644 tests/root1/sys/class/fc_host/_list create mode 100644 tests/root2/sys/class/fc_host/_list create mode 100644 tests/root3/sys/class/fc_host/_list create mode 100644 tests/root4/sys/class/fc_host/_list create mode 100644 tests/root4/sys/class/fc_host/host1/statistics/rx_frames create mode 100644 tests/root4/sys/class/fc_host/host1/statistics/rx_words create mode 100644 tests/root4/sys/class/fc_host/host1/statistics/tx_frames create mode 100644 tests/root4/sys/class/fc_host/host1/statistics/tx_words create mode 100644 tests/root5/sys/class/fc_host/_list create mode 100644 tests/root5/sys/class/fc_host/host1/statistics/rx_frames create mode 100644 tests/root5/sys/class/fc_host/host1/statistics/rx_words create mode 100644 tests/root5/sys/class/fc_host/host1/statistics/tx_frames create mode 100644 tests/root5/sys/class/fc_host/host1/statistics/tx_words create mode 100644 tests/root6/sys/class/fc_host/_list create mode 100644 tests/root7/sys/class/fc_host/_list diff --git a/tests/expected.sadf-d b/tests/expected.sadf-d index 609da41..a83fa52 100644 --- a/tests/expected.sadf-d +++ b/tests/expected.sadf-d @@ -2235,7 +2235,9 @@ SYSSTAT.TEST;22;2019-04-18 13:20:49 UTC;0.00;0.00;0.00;0.00 SYSSTAT.TEST;31;2019-04-18 13:20:19 UTC;host0;0.00;0.00;0.00;0.00 SYSSTAT.TEST;31;2019-04-18 13:20:29 UTC;host0;0.00;0.00;0.00;0.00 SYSSTAT.TEST;39;2019-04-18 13:20:39 UTC;host0;0.00;0.00;0.00;0.00 +SYSSTAT.TEST;39;2019-04-18 13:20:39 UTC;host1;0.42;0.13;0.10;0.05 SYSSTAT.TEST;22;2019-04-18 13:20:49 UTC;host0;0.00;0.00;0.00;0.00 +SYSSTAT.TEST;22;2019-04-18 13:20:49 UTC;host1;0.00;0.00;0.00;0.00 # hostname;interval;timestamp;CPU;total/s;dropd/s;squeezd/s;rx_rps/s;flw_lim/s SYSSTAT.TEST;31;2019-04-18 13:20:19 UTC;-1;0.00;0.00;0.00;0.00;0.00 SYSSTAT.TEST;31;2019-04-18 13:20:19 UTC;0;0.00;0.00;0.00;0.00;0.00 diff --git a/tests/expected.sadf-g b/tests/expected.sadf-g index 83d1da3..fff7b9c 100644 --- a/tests/expected.sadf-g +++ b/tests/expected.sadf-g @@ -1,6 +1,6 @@ - + Linux 1.2.3-TEST (SYSSTAT.TEST) 04/18/2019 _x86_64_ (8 CPU) @@ -10491,7 +10491,91 @@ - + + +Fibre Channel HBA statistics (1) [host1] +(Min, Max values) + + +fch_rxf/s (0.00, 0.42) +fch_txf/s (0.00, 0.13) + +0.00. + +0.14. + +0.28. + +0.42. + +13:20:09 + +13:23:35 + +13:27:01 + +13:30:27 + +13:33:53 + +13:37:19 + +13:40:45 + +13:44:11 + +13:47:37 + +13:51:03 + +13:54:29 +UTC + + + + +Fibre Channel HBA statistics (2) [host1] +(Min, Max values) + + +fch_rxw/s (0.00, 0.10) +fch_txw/s (0.00, 0.05) + +0.00. + +0.03. + +0.07. + +0.10. + +13:20:09 + +13:23:35 + +13:27:01 + +13:30:27 + +13:33:53 + +13:37:19 + +13:40:45 + +13:44:11 + +13:47:37 + +13:51:03 + +13:54:29 +UTC + + + + + Software-based network processing statistics (1) [all] (Min, Max values) @@ -10577,7 +10661,7 @@ - + Software-based network processing statistics (1) [0] (Min, Max values) @@ -10663,7 +10747,7 @@ - + Software-based network processing statistics (1) [1] (Min, Max values) @@ -10749,7 +10833,7 @@ - + Software-based network processing statistics (1) [2] (Min, Max values) @@ -10835,7 +10919,7 @@ - + Software-based network processing statistics (1) [3] (Min, Max values) @@ -10921,7 +11005,7 @@ - + Software-based network processing statistics (1) [4] (Min, Max values) @@ -11007,7 +11091,7 @@ - + Software-based network processing statistics (1) [5] (Min, Max values) @@ -11093,7 +11177,7 @@ - + Software-based network processing statistics (1) [6] (Min, Max values) @@ -11179,7 +11263,7 @@ - + Software-based network processing statistics (1) [7] (Min, Max values) @@ -11265,7 +11349,7 @@ - + Software-based network processing statistics (1) [8] (Min, Max values) @@ -11351,7 +11435,7 @@ - + Software-based network processing statistics (1) [9] (Min, Max values) @@ -11437,7 +11521,7 @@ - + CPU clock frequency [all] (Min, Max values) @@ -11478,7 +11562,7 @@ - + CPU clock frequency [0] (Min, Max values) @@ -11519,7 +11603,7 @@ - + CPU clock frequency [1] (Min, Max values) @@ -11560,7 +11644,7 @@ - + CPU clock frequency [2] (Min, Max values) @@ -11601,7 +11685,7 @@ - + CPU clock frequency [3] (Min, Max values) @@ -11642,7 +11726,7 @@ - + CPU clock frequency [4] (Min, Max values) @@ -11683,7 +11767,7 @@ - + CPU clock frequency [5] (Min, Max values) @@ -11724,7 +11808,7 @@ - + CPU clock frequency [6] (Min, Max values) @@ -11765,7 +11849,7 @@ - + CPU clock frequency [7] (Min, Max values) @@ -11806,7 +11890,7 @@ - + CPU clock frequency [8] (Min, Max values) @@ -11847,7 +11931,7 @@ - + CPU clock frequency [9] (Min, Max values) @@ -11888,7 +11972,7 @@ - + Filesystems statistics (1) [/dev/sda9] (Min, Max values) @@ -12062,7 +12146,7 @@ - + Filesystems statistics (1) [/dev/sda7] (Min, Max values) @@ -12236,7 +12320,7 @@ - + Filesystems statistics (1) [/dev/sda12] (Min, Max values) @@ -12410,7 +12494,7 @@ - + Filesystems statistics (1) [/dev/sda6] (Min, Max values) @@ -12584,7 +12668,7 @@ - + Filesystems statistics (1) [/dev/sdf] (Min, Max values) @@ -12758,7 +12842,7 @@ - + Filesystems statistics (1) [/dev/sdg] (Min, Max values) @@ -12934,5 +13018,5 @@ - + diff --git a/tests/expected.sadf-j b/tests/expected.sadf-j index 9a67bd0..81360b9 100644 --- a/tests/expected.sadf-j +++ b/tests/expected.sadf-j @@ -1771,7 +1771,8 @@ "net-eicmp6": {"ierr6": 0.00, "idtunr6": 0.00, "odtunr6": 0.00, "itmex6": 0.00, "otmex6": 0.00, "iprmpb6": 0.00, "oprmpb6": 0.00, "iredir6": 0.00, "oredir6": 0.00, "ipck2b6": 0.00, "opck2b6": 0.00}, "net-udp6": {"idgm6": 0.00, "odgm6": 0.00, "noport6": 0.00, "idgmer6": 0.00}, "fchosts": [ - {"fchost": "host0", "fch_rxf": 0.00, "fch_txf": 0.00, "fch_rxw": 0.00, "fch_txw": 0.00} + {"fchost": "host0", "fch_rxf": 0.00, "fch_txf": 0.00, "fch_rxw": 0.00, "fch_txw": 0.00}, + {"fchost": "host1", "fch_rxf": 0.42, "fch_txf": 0.13, "fch_rxw": 0.10, "fch_txw": 0.05} ], "softnet": [ {"cpu": "all", "total": 0.00, "dropd": 0.00, "squeezd": 0.00, "rx_rps": 0.00, "flw_lim": 0.00}, @@ -2375,7 +2376,8 @@ "net-eicmp6": {"ierr6": 0.00, "idtunr6": 0.00, "odtunr6": 0.00, "itmex6": 0.00, "otmex6": 0.00, "iprmpb6": 0.00, "oprmpb6": 0.00, "iredir6": 0.00, "oredir6": 0.00, "ipck2b6": 0.00, "opck2b6": 0.00}, "net-udp6": {"idgm6": 0.00, "odgm6": 0.00, "noport6": 0.00, "idgmer6": 0.00}, "fchosts": [ - {"fchost": "host0", "fch_rxf": 0.00, "fch_txf": 0.00, "fch_rxw": 0.00, "fch_txw": 0.00} + {"fchost": "host0", "fch_rxf": 0.00, "fch_txf": 0.00, "fch_rxw": 0.00, "fch_txw": 0.00}, + {"fchost": "host1", "fch_rxf": 0.00, "fch_txf": 0.00, "fch_rxw": 0.00, "fch_txw": 0.00} ], "softnet": [ {"cpu": "all", "total": 0.00, "dropd": 0.00, "squeezd": 0.00, "rx_rps": 0.00, "flw_lim": 0.00}, diff --git a/tests/expected.sadf-p b/tests/expected.sadf-p index de3aacb..e9103a7 100644 --- a/tests/expected.sadf-p +++ b/tests/expected.sadf-p @@ -3973,10 +3973,18 @@ SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC host0 fch_rxf/s 0.00 SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC host0 fch_txf/s 0.00 SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC host0 fch_rxw/s 0.00 SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC host0 fch_txw/s 0.00 +SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC host1 fch_rxf/s 0.42 +SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC host1 fch_txf/s 0.13 +SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC host1 fch_rxw/s 0.10 +SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC host1 fch_txw/s 0.05 SYSSTAT.TEST 22 2019-04-18 13:20:49 UTC host0 fch_rxf/s 0.00 SYSSTAT.TEST 22 2019-04-18 13:20:49 UTC host0 fch_txf/s 0.00 SYSSTAT.TEST 22 2019-04-18 13:20:49 UTC host0 fch_rxw/s 0.00 SYSSTAT.TEST 22 2019-04-18 13:20:49 UTC host0 fch_txw/s 0.00 +SYSSTAT.TEST 22 2019-04-18 13:20:49 UTC host1 fch_rxf/s 0.00 +SYSSTAT.TEST 22 2019-04-18 13:20:49 UTC host1 fch_txf/s 0.00 +SYSSTAT.TEST 22 2019-04-18 13:20:49 UTC host1 fch_rxw/s 0.00 +SYSSTAT.TEST 22 2019-04-18 13:20:49 UTC host1 fch_txw/s 0.00 SYSSTAT.TEST 31 2019-04-18 13:20:19 UTC all total/s 0.00 SYSSTAT.TEST 31 2019-04-18 13:20:19 UTC all dropd/s 0.00 SYSSTAT.TEST 31 2019-04-18 13:20:19 UTC all squeezd/s 0.00 diff --git a/tests/expected.sadf-r b/tests/expected.sadf-r index 4cb8cba..87d4b12 100644 --- a/tests/expected.sadf-r +++ b/tests/expected.sadf-r @@ -2326,14 +2326,16 @@ 13:20:39 UTC; idgm6/s; 671; 671; odgm6/s; 36; 36; noport6/s; 0; 0; idgmer6/s; 0; 0; # A_NET_UDP6: 1/1 (1) 13:20:49 UTC; idgm6/s; 671; 671; odgm6/s; 36; 36; noport6/s; 0; 0; idgmer6/s; 0; 0; -# A_NET_FC: 1/1 (1) +# A_NET_FC: 1/2 (1) 13:20:19 UTC; FCHOST; host0; fch_rxf/s; 16; 16; fch_txf/s; 5; 5; fch_rxw/s; 4; 4; fch_txw/s; 2; 2; -# A_NET_FC: 1/1 (1) +# A_NET_FC: 1/2 (1) 13:20:29 UTC; FCHOST; host0; fch_rxf/s; 16; 16; fch_txf/s; 5; 5; fch_rxw/s; 4; 4; fch_txw/s; 2; 2; -# A_NET_FC: 1/1 (1) +# A_NET_FC: 2/2 (1) 13:20:39 UTC; FCHOST; host0; fch_rxf/s; 16; 16; fch_txf/s; 5; 5; fch_rxw/s; 4; 4; fch_txw/s; 2; 2; -# A_NET_FC: 1/1 (1) +13:20:39 UTC; FCHOST [NEW]; host1; fch_rxf/s; 0; 16; fch_txf/s; 0; 5; fch_rxw/s; 0; 4; fch_txw/s; 0; 2; +# A_NET_FC: 2/2 (1) 13:20:49 UTC; FCHOST; host0; fch_rxf/s; 16; 16; fch_txf/s; 5; 5; fch_rxw/s; 4; 4; fch_txw/s; 2; 2; +13:20:49 UTC; FCHOST; host1; fch_rxf/s; 16; 16; fch_txf/s; 5; 5; fch_rxw/s; 4; 4; fch_txw/s; 2; 2; # A_NET_SOFT: 9/9 (9) 13:20:19 UTC; CPU; 0; total/s; 11976; 11976; dropd/s; 0; 0; squeezd/s; 0; 0; rx_rps/s; 0; 0; flw_lim/s; 0; 0; 13:20:19 UTC; CPU; 1; total/s; 10608; 10608; dropd/s; 0; 0; squeezd/s; 0; 0; rx_rps/s; 0; 0; flw_lim/s; 0; 0; @@ -3023,7 +3025,7 @@ 13:54:35 UTC; ierr6/s; 0; 0; idtunr6/s; 0; 0; odtunr6/s; 0; 0; itmex6/s; 0; 0; otmex6/s; 0; 0; iprmpb6/s; 0; 0; oprmpb6/s; 0; 0; iredir6/s; 0; 0; oredir6/s; 0; 0; ipck2b6/s; 0; 0; opck2b6/s; 0; 0; # A_NET_UDP6: 1/1 (1) 13:54:35 UTC; idgm6/s; 671; 671; odgm6/s; 36; 36; noport6/s; 0; 0; idgmer6/s; 0; 0; -# A_NET_FC: 1/1 (1) +# A_NET_FC: 1/2 (1) 13:54:35 UTC; FCHOST; host0; fch_rxf/s; 16; 16; fch_txf/s; 5; 5; fch_rxw/s; 4; 4; fch_txw/s; 2; 2; # A_NET_SOFT: 11/18 (11) 13:54:35 UTC; CPU; 0; total/s; 11976; 11976; dropd/s; 0; 0; squeezd/s; 0; 0; rx_rps/s; 0; 0; flw_lim/s; 0; 0; diff --git a/tests/expected.sadf-x b/tests/expected.sadf-x index c778ff7..1912647 100644 --- a/tests/expected.sadf-x +++ b/tests/expected.sadf-x @@ -607,7 +607,7 @@ xsi:schemaLocation="http://pagesperso-orange.fr/sebastien.godard sysstat.xsd"> - + @@ -1230,7 +1230,7 @@ xsi:schemaLocation="http://pagesperso-orange.fr/sebastien.godard sysstat.xsd"> - + @@ -1857,7 +1857,8 @@ xsi:schemaLocation="http://pagesperso-orange.fr/sebastien.godard sysstat.xsd"> - + + @@ -2487,7 +2488,8 @@ xsi:schemaLocation="http://pagesperso-orange.fr/sebastien.godard sysstat.xsd"> - + + @@ -3117,7 +3119,7 @@ xsi:schemaLocation="http://pagesperso-orange.fr/sebastien.godard sysstat.xsd"> - + diff --git a/tests/expected.sar-all b/tests/expected.sar-all index 2cefe3a..91397ce 100644 --- a/tests/expected.sar-all +++ b/tests/expected.sar-all @@ -2822,8 +2822,11 @@ Average: 0.00 0.00 0.00 0.00 13:20:19 0.00 0.00 0.00 0.00 host0 13:20:29 0.00 0.00 0.00 0.00 host0 13:20:39 0.00 0.00 0.00 0.00 host0 +13:20:39 0.42 0.13 0.10 0.05 host1 13:20:49 0.00 0.00 0.00 0.00 host0 +13:20:49 0.00 0.00 0.00 0.00 host1 Average: 0.00 0.00 0.00 0.00 host0 +Average: 0.13 0.04 0.03 0.02 host1 13:20:09 CPU total/s dropd/s squeezd/s rx_rps/s flw_lim/s 13:20:19 all 0.00 0.00 0.00 0.00 0.00 diff --git a/tests/expected.sar-dec b/tests/expected.sar-dec index 488cb02..107613e 100644 --- a/tests/expected.sar-dec +++ b/tests/expected.sar-dec @@ -2822,8 +2822,11 @@ Average: 0 0 0 0 13:20:19 0 0 0 0 host0 13:20:29 0 0 0 0 host0 13:20:39 0 0 0 0 host0 +13:20:39 0 0 0 0 host1 13:20:49 0 0 0 0 host0 +13:20:49 0 0 0 0 host1 Average: 0 0 0 0 host0 +Average: 0 0 0 0 host1 13:20:09 CPU total/s dropd/s squeezd/s rx_rps/s flw_lim/s 13:20:19 all 0 0 0 0 0 diff --git a/tests/expected.sar-human b/tests/expected.sar-human index 88d6465..64574e6 100644 --- a/tests/expected.sar-human +++ b/tests/expected.sar-human @@ -2822,8 +2822,11 @@ Average: 0.00 0.00 0.00 0.00 13:20:19 0.00 0.00 0.00 0.00 host0 13:20:29 0.00 0.00 0.00 0.00 host0 13:20:39 0.00 0.00 0.00 0.00 host0 +13:20:39 0.42 0.13 0.10 0.05 host1 13:20:49 0.00 0.00 0.00 0.00 host0 +13:20:49 0.00 0.00 0.00 0.00 host1 Average: 0.00 0.00 0.00 0.00 host0 +Average: 0.13 0.04 0.03 0.02 host1 13:20:09 CPU total/s dropd/s squeezd/s rx_rps/s flw_lim/s 13:20:19 all 0.00 0.00 0.00 0.00 0.00 diff --git a/tests/expected2.sadf-g b/tests/expected2.sadf-g index d5e1544..551d01c 100644 --- a/tests/expected2.sadf-g +++ b/tests/expected2.sadf-g @@ -1,6 +1,6 @@ - + Linux 1.2.3-TEST (SYSSTAT.TEST) 04/18/2019 _x86_64_ (8 CPU) @@ -3803,7 +3803,103 @@ - + + +Fibre Channel HBA statistics (1) [host1] +(Min, Max values) + + +fch_rxf/s (0.00, 0.42) +fch_txf/s (0.00, 0.13) +SYSSTAT.TEST +04/18/2019 + + +0.00. + +0.14. + +0.28. + +0.42. + + 0:00 + + 2:00 + + 4:00 + + 6:00 + + 8:00 + +10:00 + +12:00 + +14:00 + +16:00 + +18:00 + +20:00 + +22:00 + + 0:00 + + + + +Fibre Channel HBA statistics (2) [host1] +(Min, Max values) + + +fch_rxw/s (0.00, 0.10) +fch_txw/s (0.00, 0.05) +SYSSTAT.TEST +04/18/2019 + + +0.00. + +0.03. + +0.07. + +0.10. + + 0:00 + + 2:00 + + 4:00 + + 6:00 + + 8:00 + +10:00 + +12:00 + +14:00 + +16:00 + +18:00 + +20:00 + +22:00 + + 0:00 + + + + + CPU clock frequency [all] (Min, Max values) @@ -3850,7 +3946,7 @@ - + CPU clock frequency [0] (Min, Max values) @@ -3897,7 +3993,7 @@ - + CPU clock frequency [1] (Min, Max values) @@ -3944,7 +4040,7 @@ - + CPU clock frequency [2] (Min, Max values) @@ -3991,7 +4087,7 @@ - + CPU clock frequency [3] (Min, Max values) @@ -4038,7 +4134,7 @@ - + CPU clock frequency [4] (Min, Max values) @@ -4085,7 +4181,7 @@ - + CPU clock frequency [5] (Min, Max values) @@ -4132,7 +4228,7 @@ - + CPU clock frequency [6] (Min, Max values) @@ -4179,7 +4275,7 @@ - + CPU clock frequency [7] (Min, Max values) @@ -4226,7 +4322,7 @@ - + CPU clock frequency [8] (Min, Max values) @@ -4273,7 +4369,7 @@ - + CPU clock frequency [9] (Min, Max values) @@ -4320,7 +4416,7 @@ - + Filesystems statistics (1) [/dev/sda9] (Min, Max values) @@ -4518,7 +4614,7 @@ - + Filesystems statistics (1) [/dev/sda7] (Min, Max values) @@ -4716,7 +4812,7 @@ - + Filesystems statistics (1) [/dev/sda12] (Min, Max values) @@ -4914,7 +5010,7 @@ - + Filesystems statistics (1) [/dev/sda6] (Min, Max values) @@ -5112,7 +5208,7 @@ - + Filesystems statistics (1) [/dev/sdf] (Min, Max values) @@ -5261,7 +5357,7 @@ - + Filesystems statistics (1) [/dev/sdg] (Min, Max values) @@ -5461,5 +5557,5 @@ - + diff --git a/tests/expected2.sar-all b/tests/expected2.sar-all index dabf8c4..0ecd7bb 100644 --- a/tests/expected2.sar-all +++ b/tests/expected2.sar-all @@ -2822,8 +2822,11 @@ Average: 0.00 0.00 0.00 0.00 13:20:19 0.00 0.00 0.00 0.00 host0 13:20:29 0.00 0.00 0.00 0.00 host0 13:20:39 0.00 0.00 0.00 0.00 host0 +13:20:39 0.42 0.13 0.10 0.05 host1 13:20:49 0.00 0.00 0.00 0.00 host0 +13:20:49 0.00 0.00 0.00 0.00 host1 Average: 0.00 0.00 0.00 0.00 host0 +Average: 0.13 0.04 0.03 0.02 host1 13:20:09 CPU total/s dropd/s squeezd/s rx_rps/s flw_lim/s 13:20:19 all 0.00 0.00 0.00 0.00 0.00 diff --git a/tests/expected3.sar-all b/tests/expected3.sar-all index a5b1166..3750a72 100644 --- a/tests/expected3.sar-all +++ b/tests/expected3.sar-all @@ -359,8 +359,11 @@ Average: 0.00 0.00 0.00 0.00 13:20:19 0.00 0.00 0.00 0.00 host0 13:20:29 0.00 0.00 0.00 0.00 host0 13:20:39 0.00 0.00 0.00 0.00 host0 +13:20:39 0.42 0.13 0.10 0.05 host1 13:20:49 0.00 0.00 0.00 0.00 host0 +13:20:49 0.00 0.00 0.00 0.00 host1 Average: 0.00 0.00 0.00 0.00 host0 +Average: 0.13 0.04 0.03 0.02 host1 13:20:09 CPU total/s dropd/s squeezd/s rx_rps/s flw_lim/s 13:20:19 3 0.00 0.00 0.00 0.00 0.00 diff --git a/tests/root.README b/tests/root.README index 28abee5..9107bfa 100644 --- a/tests/root.README +++ b/tests/root.README @@ -34,7 +34,7 @@ virbr0-nic: unregistered enp6s1, wlp5s1: registered /sys/class/fc_host -[Don't register any new hosts as the order in which filenames will be read depends on the filesystem implementation: See readdir(3). +host2: registered ==========root5: /proc/stat diff --git a/tests/root1/sys/class/fc_host/_list b/tests/root1/sys/class/fc_host/_list new file mode 100644 index 0000000..f3aba5c --- /dev/null +++ b/tests/root1/sys/class/fc_host/_list @@ -0,0 +1,3 @@ +. +.. +host0 diff --git a/tests/root2/sys/class/fc_host/_list b/tests/root2/sys/class/fc_host/_list new file mode 100644 index 0000000..f3aba5c --- /dev/null +++ b/tests/root2/sys/class/fc_host/_list @@ -0,0 +1,3 @@ +. +.. +host0 diff --git a/tests/root3/sys/class/fc_host/_list b/tests/root3/sys/class/fc_host/_list new file mode 100644 index 0000000..f3aba5c --- /dev/null +++ b/tests/root3/sys/class/fc_host/_list @@ -0,0 +1,3 @@ +. +.. +host0 diff --git a/tests/root4/sys/class/fc_host/_list b/tests/root4/sys/class/fc_host/_list new file mode 100644 index 0000000..a2439b6 --- /dev/null +++ b/tests/root4/sys/class/fc_host/_list @@ -0,0 +1,4 @@ +. +.. +host0 +host1 diff --git a/tests/root4/sys/class/fc_host/host0/statistics/rx_frames b/tests/root4/sys/class/fc_host/host0/statistics/rx_frames index f599e28..74c3ca0 100644 --- a/tests/root4/sys/class/fc_host/host0/statistics/rx_frames +++ b/tests/root4/sys/class/fc_host/host0/statistics/rx_frames @@ -1 +1 @@ -10 +0x10 diff --git a/tests/root4/sys/class/fc_host/host0/statistics/rx_words b/tests/root4/sys/class/fc_host/host0/statistics/rx_words index b8626c4..a249cdf 100644 --- a/tests/root4/sys/class/fc_host/host0/statistics/rx_words +++ b/tests/root4/sys/class/fc_host/host0/statistics/rx_words @@ -1 +1 @@ -4 +0x4 diff --git a/tests/root4/sys/class/fc_host/host0/statistics/tx_frames b/tests/root4/sys/class/fc_host/host0/statistics/tx_frames index 7ed6ff8..4403a03 100644 --- a/tests/root4/sys/class/fc_host/host0/statistics/tx_frames +++ b/tests/root4/sys/class/fc_host/host0/statistics/tx_frames @@ -1 +1 @@ -5 +0x5 diff --git a/tests/root4/sys/class/fc_host/host0/statistics/tx_words b/tests/root4/sys/class/fc_host/host0/statistics/tx_words index 0cfbf08..87c20ee 100644 --- a/tests/root4/sys/class/fc_host/host0/statistics/tx_words +++ b/tests/root4/sys/class/fc_host/host0/statistics/tx_words @@ -1 +1 @@ -2 +0x2 diff --git a/tests/root4/sys/class/fc_host/host1/statistics/rx_frames b/tests/root4/sys/class/fc_host/host1/statistics/rx_frames new file mode 100644 index 0000000..f599e28 --- /dev/null +++ b/tests/root4/sys/class/fc_host/host1/statistics/rx_frames @@ -0,0 +1 @@ +10 diff --git a/tests/root4/sys/class/fc_host/host1/statistics/rx_words b/tests/root4/sys/class/fc_host/host1/statistics/rx_words new file mode 100644 index 0000000..b8626c4 --- /dev/null +++ b/tests/root4/sys/class/fc_host/host1/statistics/rx_words @@ -0,0 +1 @@ +4 diff --git a/tests/root4/sys/class/fc_host/host1/statistics/tx_frames b/tests/root4/sys/class/fc_host/host1/statistics/tx_frames new file mode 100644 index 0000000..7ed6ff8 --- /dev/null +++ b/tests/root4/sys/class/fc_host/host1/statistics/tx_frames @@ -0,0 +1 @@ +5 diff --git a/tests/root4/sys/class/fc_host/host1/statistics/tx_words b/tests/root4/sys/class/fc_host/host1/statistics/tx_words new file mode 100644 index 0000000..0cfbf08 --- /dev/null +++ b/tests/root4/sys/class/fc_host/host1/statistics/tx_words @@ -0,0 +1 @@ +2 diff --git a/tests/root5/sys/class/fc_host/_list b/tests/root5/sys/class/fc_host/_list new file mode 100644 index 0000000..a2439b6 --- /dev/null +++ b/tests/root5/sys/class/fc_host/_list @@ -0,0 +1,4 @@ +. +.. +host0 +host1 diff --git a/tests/root5/sys/class/fc_host/host1/statistics/rx_frames b/tests/root5/sys/class/fc_host/host1/statistics/rx_frames new file mode 100644 index 0000000..f599e28 --- /dev/null +++ b/tests/root5/sys/class/fc_host/host1/statistics/rx_frames @@ -0,0 +1 @@ +10 diff --git a/tests/root5/sys/class/fc_host/host1/statistics/rx_words b/tests/root5/sys/class/fc_host/host1/statistics/rx_words new file mode 100644 index 0000000..b8626c4 --- /dev/null +++ b/tests/root5/sys/class/fc_host/host1/statistics/rx_words @@ -0,0 +1 @@ +4 diff --git a/tests/root5/sys/class/fc_host/host1/statistics/tx_frames b/tests/root5/sys/class/fc_host/host1/statistics/tx_frames new file mode 100644 index 0000000..7ed6ff8 --- /dev/null +++ b/tests/root5/sys/class/fc_host/host1/statistics/tx_frames @@ -0,0 +1 @@ +5 diff --git a/tests/root5/sys/class/fc_host/host1/statistics/tx_words b/tests/root5/sys/class/fc_host/host1/statistics/tx_words new file mode 100644 index 0000000..0cfbf08 --- /dev/null +++ b/tests/root5/sys/class/fc_host/host1/statistics/tx_words @@ -0,0 +1 @@ +2 diff --git a/tests/root6/sys/class/fc_host/_list b/tests/root6/sys/class/fc_host/_list new file mode 100644 index 0000000..f3aba5c --- /dev/null +++ b/tests/root6/sys/class/fc_host/_list @@ -0,0 +1,3 @@ +. +.. +host0 diff --git a/tests/root7/sys/class/fc_host/_list b/tests/root7/sys/class/fc_host/_list new file mode 100644 index 0000000..f3aba5c --- /dev/null +++ b/tests/root7/sys/class/fc_host/_list @@ -0,0 +1,3 @@ +. +.. +host0 -- 2.40.0