Update non regression tests

Signed-off-by: Sebastien GODARD <sysstat@users.noreply.github.com>

diff --git a/tests/expected.iostat+f-alt-ALL-ms b/tests/expected.iostat+f-alt-ALL-ms
index 128e5d6b64280f26c620f8afe3b800fbe1d7b93b..c0b658798ba07a0d8884f5f92d1de2b2927e9b03 100644 (file)
--- a/tests/expected.iostat+f-alt-ALL-ms
+++ b/tests/expected.iostat+f-alt-ALL-ms
@@ -12,7 +12,7 @@ sdd               0.01         0.29         0.00         0.00       2108
 sde               0.00         0.00         0.00         0.00          0          0          0
 sdf               0.01         0.29         0.00         0.00       2092          0          0
 sdg               0.02         0.62         0.00         0.00       4424         12          0
-scd0              0.00         0.00         0.00         0.00          0          0          0
+sr0               0.00         0.00         0.00         0.00          0          0          0
 
 
 avg-cpu:  %user   %nice %system %iowait  %steal   %idle
@@ -24,6 +24,6 @@ sdb               0.00         0.00         0.00         0.00          0
 sdc               0.00         0.00         0.00         0.00          0          0          0
 sdd               0.00         0.00         0.00         0.00          0          0          0
 sde               0.00         0.00         0.00         0.00          0          0          0
-scd0              0.00         0.00         0.00         0.00          0          0          0
+sr0               0.00         0.00         0.00         0.00          0          0          0
 
 

diff --git a/tests/expected.iostat+f-alt-pALL b/tests/expected.iostat+f-alt-pALL
index c7ed698a99d9c0b9ade9106999c6f3c057b9a421..10765ac64829bf93076d93a3f7857e5f23980bfb 100644 (file)
--- a/tests/expected.iostat+f-alt-pALL
+++ b/tests/expected.iostat+f-alt-pALL
@@ -17,7 +17,7 @@ sda9              6.60       193.17        19.89         0.00    1389369     143
 sda10             0.01         0.31         0.00         0.00       2220          0          0
 sda11             0.01         0.31         0.00         0.00       2252          0          0
 sda12             1.88        25.28        37.19         0.00     181825     267480          0
-scd0              0.00         0.00         0.00         0.00          0          0          0
+sr0               0.00         0.00         0.00         0.00          0          0          0
 sdb               0.01         0.29         0.00         0.00       2108          0          0
 sde               0.00         0.00         0.00         0.00          0          0          0
 sdc               0.00         0.00         0.00         0.00          0          0          0
@@ -42,7 +42,7 @@ sda9              0.00         0.00         0.00         0.00          0
 sda10             0.00         0.00         0.00         0.00          0          0          0
 sda11             0.00         0.00         0.00         0.00          0          0          0
 sda12             0.00         0.00         0.00         0.00          0          0          0
-scd0              0.00         0.00         0.00         0.00          0          0          0
+sr0               0.00         0.00         0.00         0.00          0          0          0
 sdb               0.00         0.00         0.00         0.00          0          0          0
 sde               0.00         0.00         0.00         0.00          0          0          0
 sdc               0.00         0.00         0.00         0.00          0          0          0

diff --git a/tests/expected.iostat-ALL b/tests/expected.iostat-ALL
index 142badb161c2318d031745e056fabf8798dbeeb8..0ad107b9975ef42e1cd87d03de8c4bec059aa9ea 100644 (file)
--- a/tests/expected.iostat-ALL
+++ b/tests/expected.iostat-ALL
@@ -10,7 +10,7 @@ sdb               0.01         0.29         0.00         0.00       2108
 sdc               0.00         0.00         0.00         0.00          0          0          0
 sdd               0.00         0.00         0.00         0.00          0          0          0
 sde               0.00         0.00         0.00         0.00          0          0          0
-scd0              0.00         0.00         0.00         0.00          0          0          0
+sr0               0.00         0.00         0.00         0.00          0          0          0
 
 
 avg-cpu:  %user   %nice %system %iowait  %steal   %idle
@@ -22,7 +22,7 @@ sdb               0.00         0.00         0.00         0.00          0
 sdc               0.00         0.00         0.00         0.00          0          0          0
 sdd               0.00         0.00         0.00         0.00          0          0          0
 sde               0.00         0.00         0.00         0.00          0          0          0
-scd0              0.00         0.00         0.00         0.00          0          0          0
+sr0               0.00         0.00         0.00         0.00          0          0          0
 
 
 avg-cpu:  %user   %nice %system %iowait  %steal   %idle
@@ -34,6 +34,6 @@ sdb               0.67        22.60         0.00         0.00        706
 sdc               0.00         0.00         0.00         0.00          0          0          0
 sdd               1.63        67.48         0.00         0.00       2108          0          0
 sde               0.00         0.00         0.00         0.00          0          0          0
-scd0              0.00         0.00         0.00         0.00          0          0          0
+sr0               0.00         0.00         0.00         0.00          0          0          0
 
 

diff --git a/tests/expected.iostat-ALL-p-ALL b/tests/expected.iostat-ALL-p-ALL
index 72c40a9acec8a5e66733100ee943038b45ea4196..0d5dbe6fe86321d5fa891e07953282eac877bda1 100644 (file)
--- a/tests/expected.iostat-ALL-p-ALL
+++ b/tests/expected.iostat-ALL-p-ALL
@@ -14,7 +14,7 @@ sda9              6.60       193.17        19.89         0.00    1389369     143
 sda10             0.01         0.31         0.00         0.00       2220          0          0
 sda11             0.01         0.31         0.00         0.00       2252          0          0
 sda12             1.88        25.28        37.19         0.00     181825     267480          0
-scd0              0.00         0.00         0.00         0.00          0          0          0
+sr0               0.00         0.00         0.00         0.00          0          0          0
 sdb               0.01         0.29         0.00         0.00       2108          0          0
 sde               0.00         0.00         0.00         0.00          0          0          0
 sdc               0.00         0.00         0.00         0.00          0          0          0
@@ -36,7 +36,7 @@ sda9              0.00         0.00         0.00         0.00          0
 sda10             0.00         0.00         0.00         0.00          0          0          0
 sda11             0.00         0.00         0.00         0.00          0          0          0
 sda12             0.00         0.00         0.00         0.00          0          0          0
-scd0              0.00         0.00         0.00         0.00          0          0          0
+sr0               0.00         0.00         0.00         0.00          0          0          0
 sdb               0.00         0.00         0.00         0.00          0          0          0
 sde               0.00         0.00         0.00         0.00          0          0          0
 sdc               0.00         0.00         0.00         0.00          0          0          0
@@ -57,7 +57,7 @@ sda9              0.00         0.00         0.00         0.00          0
 sda10             0.00         0.00         0.00         0.00          0          0          0
 sda11             0.00         0.00         0.00         0.00          0          0          0
 sda12             0.00         0.00         0.00         0.00          0          0          0
-scd0              0.00         0.00         0.00         0.00          0          0          0
+sr0               0.00         0.00         0.00         0.00          0          0          0
 sdb               0.67        22.60         0.00         0.00        706          0          0
 sde               0.00         0.00         0.00         0.00          0          0          0
 sdc               0.00         0.00         0.00         0.00          0          0          0

diff --git a/tests/expected.iostat-N b/tests/expected.iostat-N
index ebf5c49a4dc767ff2c5244ae784b6e93555f0932..84aa50471cefaeccc7de129a0fea26fb78cfbddb 100644 (file)
--- a/tests/expected.iostat-N
+++ b/tests/expected.iostat-N
@@ -14,7 +14,7 @@ sda9              6.60       193.17        19.89         0.00    1389369     143
 sda10             0.01         0.31         0.00         0.00       2220          0          0
 sda11             0.01         0.31         0.00         0.00       2252          0          0
 sda12             1.88        25.28        37.19         0.00     181825     267480          0
-scd0              0.00         0.00         0.00         0.00          0          0          0
+sr0               0.00         0.00         0.00         0.00          0          0          0
 sdb               0.01         0.29         0.00         0.00       2108          0          0
 sde               0.00         0.00         0.00         0.00          0          0          0
 sdc               0.00         0.00         0.00         0.00          0          0          0

diff --git a/tests/expected.iostat-alt-pALL b/tests/expected.iostat-alt-pALL
index c7ed698a99d9c0b9ade9106999c6f3c057b9a421..10765ac64829bf93076d93a3f7857e5f23980bfb 100644 (file)
--- a/tests/expected.iostat-alt-pALL
+++ b/tests/expected.iostat-alt-pALL
@@ -17,7 +17,7 @@ sda9              6.60       193.17        19.89         0.00    1389369     143
 sda10             0.01         0.31         0.00         0.00       2220          0          0
 sda11             0.01         0.31         0.00         0.00       2252          0          0
 sda12             1.88        25.28        37.19         0.00     181825     267480          0
-scd0              0.00         0.00         0.00         0.00          0          0          0
+sr0               0.00         0.00         0.00         0.00          0          0          0
 sdb               0.01         0.29         0.00         0.00       2108          0          0
 sde               0.00         0.00         0.00         0.00          0          0          0
 sdc               0.00         0.00         0.00         0.00          0          0          0
@@ -42,7 +42,7 @@ sda9              0.00         0.00         0.00         0.00          0
 sda10             0.00         0.00         0.00         0.00          0          0          0
 sda11             0.00         0.00         0.00         0.00          0          0          0
 sda12             0.00         0.00         0.00         0.00          0          0          0
-scd0              0.00         0.00         0.00         0.00          0          0          0
+sr0               0.00         0.00         0.00         0.00          0          0          0
 sdb               0.00         0.00         0.00         0.00          0          0          0
 sde               0.00         0.00         0.00         0.00          0          0          0
 sdc               0.00         0.00         0.00         0.00          0          0          0

diff --git a/tests/expected.iostat-f-alt-pALL b/tests/expected.iostat-f-alt-pALL
index c7ed698a99d9c0b9ade9106999c6f3c057b9a421..10765ac64829bf93076d93a3f7857e5f23980bfb 100644 (file)
--- a/tests/expected.iostat-f-alt-pALL
+++ b/tests/expected.iostat-f-alt-pALL
@@ -17,7 +17,7 @@ sda9              6.60       193.17        19.89         0.00    1389369     143
 sda10             0.01         0.31         0.00         0.00       2220          0          0
 sda11             0.01         0.31         0.00         0.00       2252          0          0
 sda12             1.88        25.28        37.19         0.00     181825     267480          0
-scd0              0.00         0.00         0.00         0.00          0          0          0
+sr0               0.00         0.00         0.00         0.00          0          0          0
 sdb               0.01         0.29         0.00         0.00       2108          0          0
 sde               0.00         0.00         0.00         0.00          0          0          0
 sdc               0.00         0.00         0.00         0.00          0          0          0
@@ -42,7 +42,7 @@ sda9              0.00         0.00         0.00         0.00          0
 sda10             0.00         0.00         0.00         0.00          0          0          0
 sda11             0.00         0.00         0.00         0.00          0          0          0
 sda12             0.00         0.00         0.00         0.00          0          0          0
-scd0              0.00         0.00         0.00         0.00          0          0          0
+sr0               0.00         0.00         0.00         0.00          0          0          0
 sdb               0.00         0.00         0.00         0.00          0          0          0
 sde               0.00         0.00         0.00         0.00          0          0          0
 sdc               0.00         0.00         0.00         0.00          0          0          0

diff --git a/tests/expected.iostat-f-alt-pALL-ms b/tests/expected.iostat-f-alt-pALL-ms
index 98263e1e5251d39415471dbbc097f9ae418f04a7..105aa36e094459d39c20f7405dc4c6580ed87329 100644 (file)
--- a/tests/expected.iostat-f-alt-pALL-ms
+++ b/tests/expected.iostat-f-alt-pALL-ms
@@ -17,7 +17,7 @@ sda9              6.60       193.17        19.89         0.00    1389369     143
 sda10             0.01         0.31         0.00         0.00       2220          0          0
 sda11             0.01         0.31         0.00         0.00       2252          0          0
 sda12             1.88        25.28        37.19         0.00     181825     267480          0
-scd0              0.00         0.00         0.00         0.00          0          0          0
+sr0               0.00         0.00         0.00         0.00          0          0          0
 sde               0.00         0.00         0.00         0.00          0          0          0
 sdc               0.00         0.00         0.00         0.00          0          0          0
 sdd               0.00         0.00         0.00         0.00          0          0          0
@@ -42,7 +42,7 @@ sda9              0.00         0.00         0.00         0.00          0
 sda10             0.00         0.00         0.00         0.00          0          0          0
 sda11             0.00         0.00         0.00         0.00          0          0          0
 sda12             0.00         0.00         0.00         0.00          0          0          0
-scd0              0.00         0.00         0.00         0.00          0          0          0
+sr0               0.00         0.00         0.00         0.00          0          0          0
 sde               0.00         0.00         0.00         0.00          0          0          0
 sdc               0.00         0.00         0.00         0.00          0          0          0
 sdd               0.00         0.00         0.00         0.00          0          0          0

diff --git a/tests/expected.iostat-gALL b/tests/expected.iostat-gALL
index eed5cd8007e76ea38a5c3bbb3a804e2c52cde19a..b53e7fc5ccb7d8e75eb18be0215e3a1d0464fc45 100644 (file)
--- a/tests/expected.iostat-gALL
+++ b/tests/expected.iostat-gALL
@@ -10,7 +10,7 @@ sdb               0.01         0.29         0.00         0.00       2108
 sdc               0.00         0.00         0.00         0.00          0          0          0
 sdd               0.00         0.00         0.00         0.00          0          0          0
 sde               0.00         0.00         0.00         0.00          0          0          0
-scd0              0.00         0.00         0.00         0.00          0          0          0
+sr0               0.00         0.00         0.00         0.00          0          0          0
  total            8.60       222.43        57.08         0.00    1599857     410544          0
 
 
@@ -23,7 +23,7 @@ sdb               0.00         0.00         0.00         0.00          0
 sdc               0.00         0.00         0.00         0.00          0          0          0
 sdd               0.00         0.00         0.00         0.00          0          0          0
 sde               0.00         0.00         0.00         0.00          0          0          0
-scd0              0.00         0.00         0.00         0.00          0          0          0
+sr0               0.00         0.00         0.00         0.00          0          0          0
  total            0.00         0.00         0.00         0.00          0          0          0
 
 

diff --git a/tests/expected.iostat-gpALL b/tests/expected.iostat-gpALL
index 49dabc3b3cc5bd5dddb7d2adccfaba06ab4ec134..94e0960fc56bb65df5be1971b0eb3744971367be 100644 (file)
--- a/tests/expected.iostat-gpALL
+++ b/tests/expected.iostat-gpALL
@@ -17,7 +17,7 @@ sda9              6.60       193.17        19.89         0.00    1389369     143
 sda10             0.01         0.31         0.00         0.00       2220          0          0
 sda11             0.01         0.31         0.00         0.00       2252          0          0
 sda12             1.88        25.28        37.19         0.00     181825     267480          0
-scd0              0.00         0.00         0.00         0.00          0          0          0
+sr0               0.00         0.00         0.00         0.00          0          0          0
 sdb               0.01         0.29         0.00         0.00       2108          0          0
 sde               0.00         0.00         0.00         0.00          0          0          0
 sdc               0.00         0.00         0.00         0.00          0          0          0
@@ -43,7 +43,7 @@ sda9              0.00         0.00         0.00         0.00          0
 sda10             0.00         0.00         0.00         0.00          0          0          0
 sda11             0.00         0.00         0.00         0.00          0          0          0
 sda12             0.00         0.00         0.00         0.00          0          0          0
-scd0              0.00         0.00         0.00         0.00          0          0          0
+sr0               0.00         0.00         0.00         0.00          0          0          0
 sdb               0.00         0.00         0.00         0.00          0          0          0
 sde               0.00         0.00         0.00         0.00          0          0          0
 sdc               0.00         0.00         0.00         0.00          0          0          0

diff --git a/tests/expected.iostat-h b/tests/expected.iostat-h
index ddcc07bc4677c3cd0c110edef4f0214418b7c083..5c678926062a20e651babd58d616f48d62ef0e0c 100644 (file)
--- a/tests/expected.iostat-h
+++ b/tests/expected.iostat-h
@@ -14,7 +14,7 @@ Linux 1.2.3-TEST (SYSSTAT.TEST)       01/01/70        _x86_64_        (8 CPU)
      0.01         0.3k         0.0k         0.0k       2.2M       0.0k       0.0k sda10
      0.01         0.3k         0.0k         0.0k       2.2M       0.0k       0.0k sda11
      1.88        25.3k        37.2k         0.0k     177.6M     261.2M       0.0k sda12
-     0.00         0.0k         0.0k         0.0k       0.0k       0.0k       0.0k scd0
+     0.00         0.0k         0.0k         0.0k       0.0k       0.0k       0.0k sr0
      0.01         0.3k         0.0k         0.0k       2.1M       0.0k       0.0k sdb
      0.00         0.0k         0.0k         0.0k       0.0k       0.0k       0.0k sde
      0.00         0.0k         0.0k         0.0k       0.0k       0.0k       0.0k sdc

diff --git a/tests/expected.iostat-jID b/tests/expected.iostat-jID
index 618c7fd42f4bead8c3b1608c8a02480425394a95..88b76bfabd30fb53951fce748fdb9174918c2649 100644 (file)
--- a/tests/expected.iostat-jID
+++ b/tests/expected.iostat-jID
@@ -14,7 +14,7 @@ Linux 1.2.3-TEST (SYSSTAT.TEST)       01/01/70        _x86_64_        (8 CPU)
      0.01         0.31         0.00         0.00       2220          0          0 ata-Hitachi_HDS723020BLA642_MN1240F33J1XND-part10
      0.01         0.31         0.00         0.00       2252          0          0 ata-Hitachi_HDS723020BLA642_MN1240F33J1XND-part11
      1.88        25.28        37.19         0.00     181825     267480          0 ata-Hitachi_HDS723020BLA642_MN1240F33J1XND-part12
-     0.00         0.00         0.00         0.00          0          0          0 scd0
+     0.00         0.00         0.00         0.00          0          0          0 ata-hp_DVD-RAM_GH80N_B1LCEP1D03707
      0.01         0.29         0.00         0.00       2108          0          0 usb-Generic-_SD_MMC_058F63626476-0:0
      0.00         0.00         0.00         0.00          0          0          0 usb-Generic-_MS_MS-Pro_058F63626476-0:3
      0.00         0.00         0.00         0.00          0          0          0 usb-Generic-_Compact_Flash_058F63626476-0:1

diff --git a/tests/expected.iostat-jLABEL b/tests/expected.iostat-jLABEL
index 5988b8c489947efdff1c045283960018888a416c..5a09357085e54e59e21b0a3008f371ee073ca4bc 100644 (file)
--- a/tests/expected.iostat-jLABEL
+++ b/tests/expected.iostat-jLABEL
@@ -14,7 +14,7 @@ Linux 1.2.3-TEST (SYSSTAT.TEST)       01/01/70        _x86_64_        (8 CPU)
      0.01         0.31         0.00         0.00       2220          0          0 sda10
      0.01         0.31         0.00         0.00       2252          0          0 sda11
      1.88        25.28        37.19         0.00     181825     267480          0 sda12
-     0.00         0.00         0.00         0.00          0          0          0 scd0
+     0.00         0.00         0.00         0.00          0          0          0 sr0
      0.01         0.29         0.00         0.00       2108          0          0 sdb
      0.00         0.00         0.00         0.00          0          0          0 sde
      0.00         0.00         0.00         0.00          0          0          0 sdc

diff --git a/tests/expected.iostat-jPARTUUID b/tests/expected.iostat-jPARTUUID
index 81d961539b1870462a1eaec02a24fbeb0eca5b51..02e159bbeb152fdeb2e593effa18043bb00fcdbd 100644 (file)
--- a/tests/expected.iostat-jPARTUUID
+++ b/tests/expected.iostat-jPARTUUID
@@ -14,7 +14,7 @@ Linux 1.2.3-TEST (SYSSTAT.TEST)       01/01/70        _x86_64_        (8 CPU)
      0.01         0.31         0.00         0.00       2220          0          0 aa73dc58-0a
      0.01         0.31         0.00         0.00       2252          0          0 aa73dc58-0b
      1.88        25.28        37.19         0.00     181825     267480          0 aa73dc58-0c
-     0.00         0.00         0.00         0.00          0          0          0 scd0
+     0.00         0.00         0.00         0.00          0          0          0 sr0
      0.01         0.29         0.00         0.00       2108          0          0 sdb
      0.00         0.00         0.00         0.00          0          0          0 sde
      0.00         0.00         0.00         0.00          0          0          0 sdc

diff --git a/tests/expected.iostat-jPATH b/tests/expected.iostat-jPATH
index 53ac74b67cbdbf6fc11bc25ba8aebf40b6ba95c7..26d76809221c7d3852734bcc10758af86a18c9e1 100644 (file)
--- a/tests/expected.iostat-jPATH
+++ b/tests/expected.iostat-jPATH
@@ -14,7 +14,7 @@ Linux 1.2.3-TEST (SYSSTAT.TEST)       01/01/70        _x86_64_        (8 CPU)
      0.01         0.31         0.00         0.00       2220          0          0 pci-0000:00:1f.2-ata-1-part10
      0.01         0.31         0.00         0.00       2252          0          0 pci-0000:00:1f.2-ata-1-part11
      1.88        25.28        37.19         0.00     181825     267480          0 pci-0000:00:1f.2-ata-1-part12
-     0.00         0.00         0.00         0.00          0          0          0 scd0
+     0.00         0.00         0.00         0.00          0          0          0 pci-0000:00:1f.2-ata-5
      0.01         0.29         0.00         0.00       2108          0          0 pci-0000:00:1d.0-usb-0:1.7:1.0-scsi-0:0:0:0
      0.00         0.00         0.00         0.00          0          0          0 pci-0000:00:1d.0-usb-0:1.7:1.0-scsi-0:0:0:3
      0.00         0.00         0.00         0.00          0          0          0 pci-0000:00:1d.0-usb-0:1.7:1.0-scsi-0:0:0:1

diff --git a/tests/expected.iostat-p-ALL b/tests/expected.iostat-p-ALL
index 72c40a9acec8a5e66733100ee943038b45ea4196..0d5dbe6fe86321d5fa891e07953282eac877bda1 100644 (file)
--- a/tests/expected.iostat-p-ALL
+++ b/tests/expected.iostat-p-ALL
@@ -14,7 +14,7 @@ sda9              6.60       193.17        19.89         0.00    1389369     143
 sda10             0.01         0.31         0.00         0.00       2220          0          0
 sda11             0.01         0.31         0.00         0.00       2252          0          0
 sda12             1.88        25.28        37.19         0.00     181825     267480          0
-scd0              0.00         0.00         0.00         0.00          0          0          0
+sr0               0.00         0.00         0.00         0.00          0          0          0
 sdb               0.01         0.29         0.00         0.00       2108          0          0
 sde               0.00         0.00         0.00         0.00          0          0          0
 sdc               0.00         0.00         0.00         0.00          0          0          0
@@ -36,7 +36,7 @@ sda9              0.00         0.00         0.00         0.00          0
 sda10             0.00         0.00         0.00         0.00          0          0          0
 sda11             0.00         0.00         0.00         0.00          0          0          0
 sda12             0.00         0.00         0.00         0.00          0          0          0
-scd0              0.00         0.00         0.00         0.00          0          0          0
+sr0               0.00         0.00         0.00         0.00          0          0          0
 sdb               0.00         0.00         0.00         0.00          0          0          0
 sde               0.00         0.00         0.00         0.00          0          0          0
 sdc               0.00         0.00         0.00         0.00          0          0          0
@@ -57,7 +57,7 @@ sda9              0.00         0.00         0.00         0.00          0
 sda10             0.00         0.00         0.00         0.00          0          0          0
 sda11             0.00         0.00         0.00         0.00          0          0          0
 sda12             0.00         0.00         0.00         0.00          0          0          0
-scd0              0.00         0.00         0.00         0.00          0          0          0
+sr0               0.00         0.00         0.00         0.00          0          0          0
 sdb               0.67        22.60         0.00         0.00        706          0          0
 sde               0.00         0.00         0.00         0.00          0          0          0
 sdc               0.00         0.00         0.00         0.00          0          0          0

diff --git a/tests/expected.iostat-s-ALL b/tests/expected.iostat-s-ALL
index 41d1d15ad897a5b32990a381908da3e6081e213e..cf45796fd19fadf46c2b1da2f6e58a9056d8ee86 100644 (file)
--- a/tests/expected.iostat-s-ALL
+++ b/tests/expected.iostat-s-ALL
@@ -7,7 +7,7 @@ sdb               0.01         0.29         0.00       2108          0
 sdc               0.00         0.00         0.00          0          0
 sdd               0.00         0.00         0.00          0          0
 sde               0.00         0.00         0.00          0          0
-scd0              0.00         0.00         0.00          0          0
+sr0               0.00         0.00         0.00          0          0
 
 
 Device             tps    kB_read/s     kB_w+d/s    kB_read     kB_w+d
@@ -16,6 +16,6 @@ sdb               0.00         0.00         0.00          0          0
 sdc               0.00         0.00         0.00          0          0
 sdd               0.00         0.00         0.00          0          0
 sde               0.00         0.00         0.00          0          0
-scd0              0.00         0.00         0.00          0          0
+sr0               0.00         0.00         0.00          0          0
 
 

diff --git a/tests/expected.iostat-s-ALL-p-ALL b/tests/expected.iostat-s-ALL-p-ALL
index 7c3451c240a54709c11b979c46397b3c664b1ae4..49f33912b1a98b19a56e0d8568601b2fad52d119 100644 (file)
--- a/tests/expected.iostat-s-ALL-p-ALL
+++ b/tests/expected.iostat-s-ALL-p-ALL
@@ -17,7 +17,7 @@ sda9              6.60       193.17        19.89    1389369     143040
 sda10             0.01         0.31         0.00       2220          0
 sda11             0.01         0.31         0.00       2252          0
 sda12             1.88        25.28        37.19     181825     267480
-scd0              0.00         0.00         0.00          0          0
+sr0               0.00         0.00         0.00          0          0
 sdb               0.01         0.29         0.00       2108          0
 sde               0.00         0.00         0.00          0          0
 sdc               0.00         0.00         0.00          0          0
@@ -42,7 +42,7 @@ sda9              0.00         0.00         0.00          0          0
 sda10             0.00         0.00         0.00          0          0
 sda11             0.00         0.00         0.00          0          0
 sda12             0.00         0.00         0.00          0          0
-scd0              0.00         0.00         0.00          0          0
+sr0               0.00         0.00         0.00          0          0
 sdb               0.00         0.00         0.00          0          0
 sde               0.00         0.00         0.00          0          0
 sdc               0.00         0.00         0.00          0          0

diff --git a/tests/expected.iostat-s-list-p b/tests/expected.iostat-s-list-p
index 4a28ce2ae1370c0c851db9b7d6a7bdbe56516854..8a38a1a4bdb8e3e78fdb582c823cdea361637c08 100644 (file)
--- a/tests/expected.iostat-s-list-p
+++ b/tests/expected.iostat-s-list-p
@@ -18,7 +18,7 @@ sda9              6.60       193.17        19.89    1389369     143040
 sda10             0.01         0.31         0.00       2220          0
 sda11             0.01         0.31         0.00       2252          0
 sda12             1.88        25.28        37.19     181825     267480
-scd0              0.00         0.00         0.00          0          0
+sr0               0.00         0.00         0.00          0          0
 sde               0.00         0.00         0.00          0          0
 sdc               0.00         0.00         0.00          0          0
 sdd               0.00         0.00         0.00          0          0
@@ -43,7 +43,7 @@ sda9              0.00         0.00         0.00          0          0
 sda10             0.00         0.00         0.00          0          0
 sda11             0.00         0.00         0.00          0          0
 sda12             0.00         0.00         0.00          0          0
-scd0              0.00         0.00         0.00          0          0
+sr0               0.00         0.00         0.00          0          0
 sde               0.00         0.00         0.00          0          0
 sdc               0.00         0.00         0.00          0          0
 sdd               0.00         0.00         0.00          0          0

diff --git a/tests/expected.iostat-sigint b/tests/expected.iostat-sigint
index 04eebca7cdf119e6bb64940b9f71f2e1cd1712fe..cd4efada6d48cfdfec17e9eb006c00021de15e92 100644 (file)
--- a/tests/expected.iostat-sigint
+++ b/tests/expected.iostat-sigint
@@ -50,7 +50,7 @@ Device             tps    kB_read/s    kB_wrtn/s    kB_dscd/s    kB_read    kB_w
 cciss/c0d0        0.00         0.00         0.00         0.00          0          0          0
 sda               0.00         0.00         0.00         0.00          0          0         50
 xvdp              0.00         0.00         0.00         0.00       1548          0          0
-xvdiw             0.00         0.00         0.00         0.00       1048          0          0
+xvdq              0.00         0.00         0.00         0.00       1048          0          0
 
 
 avg-cpu:  %user   %nice %system %iowait  %steal   %idle
@@ -60,6 +60,6 @@ Device             tps    kB_read/s    kB_wrtn/s    kB_dscd/s    kB_read    kB_w
 cciss/c0d0    32402.95         0.00         0.00         0.00          0          0          0
 sda               1.60         0.00         0.00         0.80          0          0         25
 xvdp              0.32        16.04         0.00         0.00        500          0          0
-xvdiw             0.32        16.04         0.00         0.00        500          0          0
+xvdq              0.32        16.04         0.00         0.00        500          0          0
 
 

diff --git a/tests/expected.iostat-x-ALL b/tests/expected.iostat-x-ALL
index 47023259d801fc7b2f32aec3e095572dbbcf9ca1..709a944c8c2620013de7c2c201bd104334ab4b97 100644 (file)
--- a/tests/expected.iostat-x-ALL
+++ b/tests/expected.iostat-x-ALL
@@ -10,7 +10,7 @@ sdb              0.01      0.29     0.00   0.00   60.92    41.33    0.00      0.
 sdc              0.00      0.00     0.00   0.00    0.00     0.00    0.00      0.00     0.00   0.00    0.00     0.00    0.00      0.00     0.00   0.00    0.00     0.00    0.00    0.00    0.00   0.00
 sdd              0.00      0.00     0.00   0.00    0.00     0.00    0.00      0.00     0.00   0.00    0.00     0.00    0.00      0.00     0.00   0.00    0.00     0.00    0.00    0.00    0.00   0.00
 sde              0.00      0.00     0.00   0.00    0.00     0.00    0.00      0.00     0.00   0.00    0.00     0.00    0.00      0.00     0.00   0.00    0.00     0.00    0.00    0.00    0.00   0.00
-scd0             0.00      0.00     0.00   0.00    0.00     0.00    0.00      0.00     0.00   0.00    0.00     0.00    0.00      0.00     0.00   0.00    0.00     0.00    0.00    0.00    0.00   0.00
+sr0              0.00      0.00     0.00   0.00    0.00     0.00    0.00      0.00     0.00   0.00    0.00     0.00    0.00      0.00     0.00   0.00    0.00     0.00    0.00    0.00    0.00   0.00
 
 
 avg-cpu:  %user   %nice %system %iowait  %steal   %idle
@@ -22,6 +22,6 @@ sdb              0.00      0.00     0.00   0.00    0.00     0.00    0.00      0.
 sdc              0.00      0.00     0.00   0.00    0.00     0.00    0.00      0.00     0.00   0.00    0.00     0.00    0.00      0.00     0.00   0.00    0.00     0.00    0.00    0.00    0.00   0.00
 sdd              0.00      0.00     0.00   0.00    0.00     0.00    0.00      0.00     0.00   0.00    0.00     0.00    0.00      0.00     0.00   0.00    0.00     0.00    0.00    0.00    0.00   0.00
 sde              0.00      0.00     0.00   0.00    0.00     0.00    0.00      0.00     0.00   0.00    0.00     0.00    0.00      0.00     0.00   0.00    0.00     0.00    0.00    0.00    0.00   0.00
-scd0             0.00      0.00     0.00   0.00    0.00     0.00    0.00      0.00     0.00   0.00    0.00     0.00    0.00      0.00     0.00   0.00    0.00     0.00    0.00    0.00    0.00   0.00
+sr0              0.00      0.00     0.00   0.00    0.00     0.00    0.00      0.00     0.00   0.00    0.00     0.00    0.00      0.00     0.00   0.00    0.00     0.00    0.00    0.00    0.00   0.00
 
 

diff --git a/tests/expected.iostat-x-ALL-flush b/tests/expected.iostat-x-ALL-flush
index d7444db25db3d6f3f1bedb1797cc802730af4f52..d0c048b468d94b92463728e08f923c0a4caa071d 100644 (file)
--- a/tests/expected.iostat-x-ALL-flush
+++ b/tests/expected.iostat-x-ALL-flush
@@ -9,7 +9,7 @@ sdb              0.00      0.10     0.00   0.00   47.00    33.62    0.00      0.
 sdc              0.00      0.00     0.00   0.00    0.00     0.00    0.00      0.00     0.00   0.00    0.00     0.00    0.00      0.00     0.00   0.00    0.00     0.00    0.00    0.00    0.00   0.00
 sdd              0.01      0.29     0.00   0.00   55.08    41.33    0.00      0.00     0.00   0.00    0.00     0.00    0.00      0.00     0.00   0.00    0.00     0.00    0.00   45.80    0.00   0.00
 sde              0.00      0.00     0.00   0.00    0.00     0.00    0.00      0.00     0.00   0.00    0.00     0.00    0.00      0.00     0.00   0.00    0.00     0.00    0.00    0.00    0.00   0.00
-scd0             0.00      0.00     0.00   0.00    0.00     0.00    0.00      0.00     0.00   0.00    0.00     0.00    0.00      0.00     0.00   0.00    0.00     0.00    0.00    0.00    0.00   0.00
+sr0              0.00      0.00     0.00   0.00    0.00     0.00    0.00      0.00     0.00   0.00    0.00     0.00    0.00      0.00     0.00   0.00    0.00     0.00    0.00    0.00    0.00   0.00
 
 
 avg-cpu:  %user   %nice %system %iowait  %steal   %idle

diff --git a/tests/expected.iostat-x-ALL-p-ALL b/tests/expected.iostat-x-ALL-p-ALL
index 0de0962397b0db7805f9f0dcb6c50f4f3a17e121..39ec56eee272aabbfd8c847610599674ea5f322f 100644 (file)
--- a/tests/expected.iostat-x-ALL-p-ALL
+++ b/tests/expected.iostat-x-ALL-p-ALL
@@ -14,7 +14,7 @@ sda9             5.58    193.17     0.30   5.04   11.56    34.60    1.02     19.
 sda10            0.01      0.31     0.00   0.00   27.10    46.25    0.00      0.00     0.00   0.00    0.00     0.00    0.00      0.00     0.00   0.00    0.00     0.00    0.00    0.00    0.00   0.00
 sda11            0.01      0.31     0.00   0.00   38.25    39.51    0.00      0.00     0.00   0.00    0.00     0.00    0.00      0.00     0.00   0.00    0.00     0.00    0.00    0.00    0.00   0.00
 sda12            1.22     25.28     0.10   7.28   14.27    20.78    0.66     37.19     1.06  61.37   12.47    55.96    0.00      0.00     0.00   0.00    0.00     0.00    0.00    0.00    0.02   0.10
-scd0             0.00      0.00     0.00   0.00    0.00     0.00    0.00      0.00     0.00   0.00    0.00     0.00    0.00      0.00     0.00   0.00    0.00     0.00    0.00    0.00    0.00   0.00
+sr0              0.00      0.00     0.00   0.00    0.00     0.00    0.00      0.00     0.00   0.00    0.00     0.00    0.00      0.00     0.00   0.00    0.00     0.00    0.00    0.00    0.00   0.00
 sdb              0.01      0.29     0.00   0.00   60.92    41.33    0.00      0.00     0.00   0.00    0.00     0.00    0.00      0.00     0.00   0.00    0.00     0.00    0.00    0.00    0.00   0.00
 sde              0.00      0.00     0.00   0.00    0.00     0.00    0.00      0.00     0.00   0.00    0.00     0.00    0.00      0.00     0.00   0.00    0.00     0.00    0.00    0.00    0.00   0.00
 sdc              0.00      0.00     0.00   0.00    0.00     0.00    0.00      0.00     0.00   0.00    0.00     0.00    0.00      0.00     0.00   0.00    0.00     0.00    0.00    0.00    0.00   0.00
@@ -36,7 +36,7 @@ sda9             0.00      0.00     0.00   0.00    0.00     0.00    0.00      0.
 sda10            0.00      0.00     0.00   0.00    0.00     0.00    0.00      0.00     0.00   0.00    0.00     0.00    0.00      0.00     0.00   0.00    0.00     0.00    0.00    0.00    0.00   0.00
 sda11            0.00      0.00     0.00   0.00    0.00     0.00    0.00      0.00     0.00   0.00    0.00     0.00    0.00      0.00     0.00   0.00    0.00     0.00    0.00    0.00    0.00   0.00
 sda12            0.00      0.00     0.00   0.00    0.00     0.00    0.00      0.00     0.00   0.00    0.00     0.00    0.00      0.00     0.00   0.00    0.00     0.00    0.00    0.00    0.00   0.00
-scd0             0.00      0.00     0.00   0.00    0.00     0.00    0.00      0.00     0.00   0.00    0.00     0.00    0.00      0.00     0.00   0.00    0.00     0.00    0.00    0.00    0.00   0.00
+sr0              0.00      0.00     0.00   0.00    0.00     0.00    0.00      0.00     0.00   0.00    0.00     0.00    0.00      0.00     0.00   0.00    0.00     0.00    0.00    0.00    0.00   0.00
 sdb              0.00      0.00     0.00   0.00    0.00     0.00    0.00      0.00     0.00   0.00    0.00     0.00    0.00      0.00     0.00   0.00    0.00     0.00    0.00    0.00    0.00   0.00
 sde              0.00      0.00     0.00   0.00    0.00     0.00    0.00      0.00     0.00   0.00    0.00     0.00    0.00      0.00     0.00   0.00    0.00     0.00    0.00    0.00    0.00   0.00
 sdc              0.00      0.00     0.00   0.00    0.00     0.00    0.00      0.00     0.00   0.00    0.00     0.00    0.00      0.00     0.00   0.00    0.00     0.00    0.00    0.00    0.00   0.00
@@ -57,7 +57,7 @@ sda9             0.00      0.00     0.00   0.00    0.00     0.00    0.00      0.
 sda10            0.00      0.00     0.00   0.00    0.00     0.00    0.00      0.00     0.00   0.00    0.00     0.00    0.00      0.00     0.00   0.00    0.00     0.00    0.00    0.00    0.00   0.00
 sda11            0.00      0.00     0.00   0.00    0.00     0.00    0.00      0.00     0.00   0.00    0.00     0.00    0.00      0.00     0.00   0.00    0.00     0.00    0.00    0.00    0.00   0.00
 sda12            0.00      0.00     0.00   0.00    0.00     0.00    0.00      0.00     0.00   0.00    0.00     0.00    0.00      0.00     0.00   0.00    0.00     0.00    0.00    0.00    0.00   0.00
-scd0             0.00      0.00     0.00   0.00    0.00     0.00    0.00      0.00     0.00   0.00    0.00     0.00    0.00      0.00     0.00   0.00    0.00     0.00    0.00    0.00    0.00   0.00
+sr0              0.00      0.00     0.00   0.00    0.00     0.00    0.00      0.00     0.00   0.00    0.00     0.00    0.00      0.00     0.00   0.00    0.00     0.00    0.00    0.00    0.00   0.00
 sdb              0.67     22.60     0.00   0.00   47.00    33.62    0.00      0.00     0.00   0.00    0.00     0.00    0.00      0.00     0.00   0.00    0.00     0.00    0.00    0.00    0.10   0.05
 sde              0.00      0.00     0.00   0.00    0.00     0.00    0.00      0.00     0.00   0.00    0.00     0.00    0.00      0.00     0.00   0.00    0.00     0.00    0.00    0.00    0.00   0.00
 sdc              0.00      0.00     0.00   0.00    0.00     0.00    0.00      0.00     0.00   0.00    0.00     0.00    0.00      0.00     0.00   0.00    0.00     0.00    1.02   67.03    0.00   0.00
@@ -78,7 +78,7 @@ sda9             0.00      0.00     0.00   0.00    0.00     0.00    0.00      0.
 sda10            0.00      0.00     0.00   0.00    0.00     0.00    0.00      0.00     0.00   0.00    0.00     0.00    0.00      0.00     0.00   0.00    0.00     0.00    0.00    0.00    0.00   0.00
 sda11            0.00      0.00     0.00   0.00    0.00     0.00    0.00      0.00     0.00   0.00    0.00     0.00    0.00      0.00     0.00   0.00    0.00     0.00    0.00    0.00    0.00   0.00
 sda12            0.00      0.00     0.00   0.00    0.00     0.00    0.00      0.00     0.00   0.00    0.00     0.00    0.00      0.00     0.00   0.00    0.00     0.00    0.00    0.00    0.00   0.00
-scd0             0.00      0.00     0.00   0.00    0.00     0.00    0.00      0.00     0.00   0.00    0.00     0.00    0.00      0.00     0.00   0.00    0.00     0.00    0.00    0.00    0.00   0.00
+sr0              0.00      0.00     0.00   0.00    0.00     0.00    0.00      0.00     0.00   0.00    0.00     0.00    0.00      0.00     0.00   0.00    0.00     0.00    0.00    0.00    0.00   0.00
 sde              0.00      0.00     0.00   0.00    0.00     0.00    0.00      0.00     0.00   0.00    0.00     0.00    0.00      0.00     0.00   0.00    0.00     0.00    0.00    0.00    0.00   0.00
 sdc              0.00      0.00     0.00   0.00    0.00     0.00    0.00      0.00     0.00   0.00    0.00     0.00    0.00      0.00     0.00   0.00    0.00     0.00    0.62   51.29    0.00   0.00
 sdd              0.00      0.00     0.00   0.00    0.00     0.00    0.00      0.00     0.00   0.00    0.00     0.00    0.00      0.00     0.00   0.00    0.00     0.00    0.00    0.00    0.00   0.00
@@ -100,7 +100,7 @@ sda9             0.00      0.00     0.00   0.00    0.00     0.00    0.00      0.
 sda10            0.00      0.00     0.00   0.00    0.00     0.00    0.00      0.00     0.00   0.00    0.00     0.00    0.00      0.00     0.00   0.00    0.00     0.00    0.00    0.00    0.00   0.00
 sda11            0.00      0.00     0.00   0.00    0.00     0.00    0.00      0.00     0.00   0.00    0.00     0.00    0.00      0.00     0.00   0.00    0.00     0.00    0.00    0.00    0.00   0.00
 sda12            0.00      0.00     0.00   0.00    0.00     0.00    0.00      0.00     0.00   0.00    0.00     0.00    0.00      0.00     0.00   0.00    0.00     0.00    0.00    0.00    0.00   0.00
-scd0             0.00      0.00     0.00   0.00    0.00     0.00    0.00      0.00     0.00   0.00    0.00     0.00    0.00      0.00     0.00   0.00    0.00     0.00    0.00    0.00    0.00   0.00
+sr0              0.00      0.00     0.00   0.00    0.00     0.00    0.00      0.00     0.00   0.00    0.00     0.00    0.00      0.00     0.00   0.00    0.00     0.00    0.00    0.00    0.00   0.00
 sde              0.00      0.00     0.00   0.00    0.00     0.00    0.00      0.00     0.00   0.00    0.00     0.00    0.00      0.00     0.00   0.00    0.00     0.00    0.00    0.00    0.00   0.00
 sdc              0.00      0.00     0.00   0.00    0.00     0.00    0.00      0.00     0.00   0.00    0.00     0.00    0.00      0.00     0.00   0.00    0.00     0.00    1.12   89.28    0.00   0.00
 sdd              0.00      0.00     0.00   0.00    0.00     0.00    0.00      0.00     0.00   0.00    0.00     0.00    0.00      0.00     0.00   0.00    0.00     0.00    0.00    0.00    0.00   0.00
@@ -119,7 +119,7 @@ sda6             0.00      0.00     0.00   0.00    0.00     0.00    0.00      0.
 sda7             0.00      0.00     0.00   0.00    0.00     0.00    0.00      0.00     0.00   0.00    0.00     0.00    0.00      0.00     0.00   0.00    0.00     0.00    0.00    0.00    0.00   0.00
 sda8             0.00      0.00     0.00   0.00    0.00     0.00    0.00      0.00     0.00   0.00    0.00     0.00    0.00      0.00     0.00   0.00    0.00     0.00    0.00    0.00    0.00   0.00
 sda9             0.00      0.00     0.00   0.00    0.00     0.00    0.00      0.00     0.00   0.00    0.00     0.00    0.00      0.00     0.00   0.00    0.00     0.00    0.00    0.00    0.00   0.00
-scd0             0.00      0.00     0.00   0.00    0.00     0.00    0.00      0.00     0.00   0.00    0.00     0.00    0.00      0.00     0.00   0.00    0.00     0.00    0.00    0.00    0.00   0.00
+sr0              0.00      0.00     0.00   0.00    0.00     0.00    0.00      0.00     0.00   0.00    0.00     0.00    0.00      0.00     0.00   0.00    0.00     0.00    0.00    0.00    0.00   0.00
 sdb              0.00      0.00     0.00   0.00    0.00     0.00    0.00      0.00     0.00   0.00    0.00     0.00    0.00      0.00     0.00   0.00    0.00     0.00    0.00    0.00    0.00   0.00
 sde              0.00      0.00     0.00   0.00    0.00     0.00    0.00      0.00     0.00   0.00    0.00     0.00    0.00      0.00     0.00   0.00    0.00     0.00    0.00    0.00    0.00   0.00
 sdc              0.00      0.00     0.00   0.00    0.00     0.00    0.00      0.00     0.00   0.00    0.00     0.00    0.00      0.00     0.00   0.00    0.00     0.00    0.00    0.00    0.00   0.00
@@ -128,7 +128,7 @@ cciss/c0d0       0.00      0.00     0.00  29.81    4.56     0.00    0.00      0.
 cciss/c0d0p1     0.00      0.00     0.00  47.25   10.91     0.00    0.00      0.00     0.00  99.12  158.54     0.00    0.00      0.00     0.00   0.00    0.00     0.00    0.00    0.00    0.00   0.00
 cciss/c0d0p2     0.00      0.00     0.00  25.00    3.33     0.00    0.00      0.00     0.00  66.67    2.00     0.00    0.00      0.00     0.00   0.00    0.00     0.00    0.00    0.00    0.00   0.00
 xvdp             0.00      0.00     0.00   0.00    1.00    18.88    0.00      0.00     0.00   0.00    0.00     0.00    0.00      0.00     0.00   0.00    0.00     0.00    0.00    0.00    0.00   0.00
-xvdiw            0.00      0.00     0.00   0.00    0.60    20.15    0.00      0.00     0.00   0.00    0.00     0.00    0.00      0.00     0.00   0.00    0.00     0.00    0.00    0.00    0.00   0.00
+xvdq             0.00      0.00     0.00   0.00    0.60    20.15    0.00      0.00     0.00   0.00    0.00     0.00    0.00      0.00     0.00   0.00    0.00     0.00    0.00    0.00    0.00   0.00
 
 
 Device            r/s     rkB/s   rrqm/s  %rrqm r_await rareq-sz     w/s     wkB/s   wrqm/s  %wrqm w_await wareq-sz     d/s     dkB/s   drqm/s  %drqm d_await dareq-sz     f/s f_await  aqu-sz  %util
@@ -142,7 +142,7 @@ sda6             0.00      0.00     0.00   0.00    0.00     0.00    0.00      0.
 sda7             0.00      0.00     0.00   0.00    0.00     0.00    0.00      0.00     0.00   0.00    0.00     0.00    0.00      0.00     0.00   0.00    0.00     0.00    0.00    0.00    0.00   0.00
 sda8             0.00      0.00     0.00   0.00    0.00     0.00    0.00      0.00     0.00   0.00    0.00     0.00    0.00      0.00     0.00   0.00    0.00     0.00    0.00    0.00    0.00   0.00
 sda9             0.00      0.00     0.00   0.00    0.00     0.00    0.00      0.00     0.00   0.00    0.00     0.00    0.00      0.00     0.00   0.00    0.00     0.00    0.00    0.00    0.00   0.00
-scd0             0.00      0.00     0.00   0.00    0.00     0.00    0.00      0.00     0.00   0.00    0.00     0.00    0.00      0.00     0.00   0.00    0.00     0.00    0.00    0.00    0.00   0.00
+sr0              0.00      0.00     0.00   0.00    0.00     0.00    0.00      0.00     0.00   0.00    0.00     0.00    0.00      0.00     0.00   0.00    0.00     0.00    0.00    0.00    0.00   0.00
 sdb              0.00      0.00     0.00   0.00    0.00     0.00    0.00      0.00     0.00   0.00    0.00     0.00    0.00      0.00     0.00   0.00    0.00     0.00    0.00    0.00    0.00   0.00
 sde              0.00      0.00     0.00   0.00    0.00     0.00    0.00      0.00     0.00   0.00    0.00     0.00    0.00      0.00     0.00   0.00    0.00     0.00    0.00    0.00    0.00   0.00
 sdc              0.00      0.00     0.00   0.00    0.00     0.00    0.00      0.00     0.00   0.00    0.00     0.00    0.00      0.00     0.00   0.00    0.00     0.00    0.00    0.00    0.00   0.00
@@ -151,6 +151,6 @@ cciss/c0d0     320.82      0.00   320.82  50.00   10.00     0.00 32082.13      0
 cciss/c0d0p1     0.00      0.00     0.00   0.00    0.00     0.00    0.00      0.00     0.00   0.00    0.00     0.00    0.00      0.00     0.00   0.00    0.00     0.00    0.00    0.00    0.00   0.00
 cciss/c0d0p2   320.82      0.00   320.82  50.00   10.00     0.00 32082.13      0.00     0.00   0.00    0.00     0.00    0.00      0.00     0.00   0.00    0.00     0.00    0.00    0.00    0.00   0.00
 xvdp             0.32     16.04     0.00   0.00    1.00    50.00    0.00      0.00     0.00   0.00    0.00     0.00    0.00      0.00     0.00   0.00    0.00     0.00    0.00    0.00    0.00   0.03
-xvdiw            0.32     16.04     0.00   0.00    1.00    50.00    0.00      0.00     0.00   0.00    0.00     0.00    0.00      0.00     0.00   0.00    0.00     0.00    0.00    0.00    0.00   0.03
+xvdq             0.32     16.04     0.00   0.00    1.00    50.00    0.00      0.00     0.00   0.00    0.00     0.00    0.00      0.00     0.00   0.00    0.00     0.00    0.00    0.00    0.00   0.03
 
 

diff --git a/tests/expected.iostat-x-p-ALL b/tests/expected.iostat-x-p-ALL
index 29670bb6add5f4e28fd20a24304c59e1e649c678..ecbb9d04b5b74f87b48e2654a5897e927028e4b5 100644 (file)
--- a/tests/expected.iostat-x-p-ALL
+++ b/tests/expected.iostat-x-p-ALL
@@ -17,7 +17,7 @@ sda9             5.58    193.17     0.30   5.04   11.56    34.60    1.02     19.
 sda10            0.01      0.31     0.00   0.00   27.10    46.25    0.00      0.00     0.00   0.00    0.00     0.00    0.00      0.00     0.00   0.00    0.00     0.00    0.00    0.00    0.00   0.00
 sda11            0.01      0.31     0.00   0.00   38.25    39.51    0.00      0.00     0.00   0.00    0.00     0.00    0.00      0.00     0.00   0.00    0.00     0.00    0.00    0.00    0.00   0.00
 sda12            1.22     25.28     0.10   7.28   14.27    20.78    0.66     37.19     1.06  61.37   12.47    55.96    0.00      0.00     0.00   0.00    0.00     0.00    0.00    0.00    0.02   0.10
-scd0             0.00      0.00     0.00   0.00    0.00     0.00    0.00      0.00     0.00   0.00    0.00     0.00    0.00      0.00     0.00   0.00    0.00     0.00    0.00    0.00    0.00   0.00
+sr0              0.00      0.00     0.00   0.00    0.00     0.00    0.00      0.00     0.00   0.00    0.00     0.00    0.00      0.00     0.00   0.00    0.00     0.00    0.00    0.00    0.00   0.00
 sdb              0.01      0.29     0.00   0.00   60.92    41.33    0.00      0.00     0.00   0.00    0.00     0.00    0.00      0.00     0.00   0.00    0.00     0.00    0.00    0.00    0.00   0.00
 sde              0.00      0.00     0.00   0.00    0.00     0.00    0.00      0.00     0.00   0.00    0.00     0.00    0.00      0.00     0.00   0.00    0.00     0.00    0.00    0.00    0.00   0.00
 sdc              0.00      0.00     0.00   0.00    0.00     0.00    0.00      0.00     0.00   0.00    0.00     0.00    0.00      0.00     0.00   0.00    0.00     0.00    0.00    0.00    0.00   0.00
@@ -42,7 +42,7 @@ sda9             0.00      0.00     0.00   0.00    0.00     0.00    0.00      0.
 sda10            0.00      0.00     0.00   0.00    0.00     0.00    0.00      0.00     0.00   0.00    0.00     0.00    0.00      0.00     0.00   0.00    0.00     0.00    0.00    0.00    0.00   0.00
 sda11            0.00      0.00     0.00   0.00    0.00     0.00    0.00      0.00     0.00   0.00    0.00     0.00    0.00      0.00     0.00   0.00    0.00     0.00    0.00    0.00    0.00   0.00
 sda12            0.00      0.00     0.00   0.00    0.00     0.00    0.00      0.00     0.00   0.00    0.00     0.00    0.00      0.00     0.00   0.00    0.00     0.00    0.00    0.00    0.00   0.00
-scd0             0.00      0.00     0.00   0.00    0.00     0.00    0.00      0.00     0.00   0.00    0.00     0.00    0.00      0.00     0.00   0.00    0.00     0.00    0.00    0.00    0.00   0.00
+sr0              0.00      0.00     0.00   0.00    0.00     0.00    0.00      0.00     0.00   0.00    0.00     0.00    0.00      0.00     0.00   0.00    0.00     0.00    0.00    0.00    0.00   0.00
 sdb              0.00      0.00     0.00   0.00    0.00     0.00    0.00      0.00     0.00   0.00    0.00     0.00    0.00      0.00     0.00   0.00    0.00     0.00    0.00    0.00    0.00   0.00
 sde              0.00      0.00     0.00   0.00    0.00     0.00    0.00      0.00     0.00   0.00    0.00     0.00    0.00      0.00     0.00   0.00    0.00     0.00    0.00    0.00    0.00   0.00
 sdc              0.00      0.00     0.00   0.00    0.00     0.00    0.00      0.00     0.00   0.00    0.00     0.00    0.00      0.00     0.00   0.00    0.00     0.00    0.00    0.00    0.00   0.00

diff --git a/tests/expected.iostat-x-p-ALL-JSON b/tests/expected.iostat-x-p-ALL-JSON
index 7a0df30faa68df999187f775002aebf1bb14b18f..e6770ea18cf231a80e2181c2c8527f4b7bfb40dc 100644 (file)
--- a/tests/expected.iostat-x-p-ALL-JSON
+++ b/tests/expected.iostat-x-p-ALL-JSON
@@ -24,7 +24,7 @@
                                                {"disk_device": "sda10", "r/s": 0.01, "w/s": 0.00, "d/s": 0.00, "f/s": 0.00, "rkB/s": 0.31, "wkB/s": 0.00, "dkB/s": 0.00, "rrqm/s": 0.00, "wrqm/s": 0.00, "drqm/s": 0.00, "rrqm": 0.00, "wrqm": 0.00, "drqm": 0.00, "r_await": 27.10, "w_await": 0.00, "d_await": 0.00, "f_await": 0.00, "rareq-sz": 46.25, "wareq-sz": 0.00, "dareq-sz": 0.00, "aqu-sz": 0.00, "util": 0.00},
                                                {"disk_device": "sda11", "r/s": 0.01, "w/s": 0.00, "d/s": 0.00, "f/s": 0.00, "rkB/s": 0.31, "wkB/s": 0.00, "dkB/s": 0.00, "rrqm/s": 0.00, "wrqm/s": 0.00, "drqm/s": 0.00, "rrqm": 0.00, "wrqm": 0.00, "drqm": 0.00, "r_await": 38.25, "w_await": 0.00, "d_await": 0.00, "f_await": 0.00, "rareq-sz": 39.51, "wareq-sz": 0.00, "dareq-sz": 0.00, "aqu-sz": 0.00, "util": 0.00},
                                                {"disk_device": "sda12", "r/s": 1.22, "w/s": 0.66, "d/s": 0.00, "f/s": 0.00, "rkB/s": 25.28, "wkB/s": 37.19, "dkB/s": 0.00, "rrqm/s": 0.10, "wrqm/s": 1.06, "drqm/s": 0.00, "rrqm": 7.28, "wrqm": 61.37, "drqm": 0.00, "r_await": 14.27, "w_await": 12.47, "d_await": 0.00, "f_await": 0.00, "rareq-sz": 20.78, "wareq-sz": 55.96, "dareq-sz": 0.00, "aqu-sz": 0.02, "util": 0.10},
-                                               {"disk_device": "scd0", "r/s": 0.00, "w/s": 0.00, "d/s": 0.00, "f/s": 0.00, "rkB/s": 0.00, "wkB/s": 0.00, "dkB/s": 0.00, "rrqm/s": 0.00, "wrqm/s": 0.00, "drqm/s": 0.00, "rrqm": 0.00, "wrqm": 0.00, "drqm": 0.00, "r_await": 0.00, "w_await": 0.00, "d_await": 0.00, "f_await": 0.00, "rareq-sz": 0.00, "wareq-sz": 0.00, "dareq-sz": 0.00, "aqu-sz": 0.00, "util": 0.00},
+                                               {"disk_device": "sr0", "r/s": 0.00, "w/s": 0.00, "d/s": 0.00, "f/s": 0.00, "rkB/s": 0.00, "wkB/s": 0.00, "dkB/s": 0.00, "rrqm/s": 0.00, "wrqm/s": 0.00, "drqm/s": 0.00, "rrqm": 0.00, "wrqm": 0.00, "drqm": 0.00, "r_await": 0.00, "w_await": 0.00, "d_await": 0.00, "f_await": 0.00, "rareq-sz": 0.00, "wareq-sz": 0.00, "dareq-sz": 0.00, "aqu-sz": 0.00, "util": 0.00},
                                                {"disk_device": "sdb", "r/s": 0.01, "w/s": 0.00, "d/s": 0.00, "f/s": 0.00, "rkB/s": 0.29, "wkB/s": 0.00, "dkB/s": 0.00, "rrqm/s": 0.00, "wrqm/s": 0.00, "drqm/s": 0.00, "rrqm": 0.00, "wrqm": 0.00, "drqm": 0.00, "r_await": 60.92, "w_await": 0.00, "d_await": 0.00, "f_await": 0.00, "rareq-sz": 41.33, "wareq-sz": 0.00, "dareq-sz": 0.00, "aqu-sz": 0.00, "util": 0.00},
                                                {"disk_device": "sde", "r/s": 0.00, "w/s": 0.00, "d/s": 0.00, "f/s": 0.00, "rkB/s": 0.00, "wkB/s": 0.00, "dkB/s": 0.00, "rrqm/s": 0.00, "wrqm/s": 0.00, "drqm/s": 0.00, "rrqm": 0.00, "wrqm": 0.00, "drqm": 0.00, "r_await": 0.00, "w_await": 0.00, "d_await": 0.00, "f_await": 0.00, "rareq-sz": 0.00, "wareq-sz": 0.00, "dareq-sz": 0.00, "aqu-sz": 0.00, "util": 0.00},
                                                {"disk_device": "sdc", "r/s": 0.00, "w/s": 0.00, "d/s": 0.00, "f/s": 0.00, "rkB/s": 0.00, "wkB/s": 0.00, "dkB/s": 0.00, "rrqm/s": 0.00, "wrqm/s": 0.00, "drqm/s": 0.00, "rrqm": 0.00, "wrqm": 0.00, "drqm": 0.00, "r_await": 0.00, "w_await": 0.00, "d_await": 0.00, "f_await": 0.00, "rareq-sz": 0.00, "wareq-sz": 0.00, "dareq-sz": 0.00, "aqu-sz": 0.00, "util": 0.00},
@@ -48,7 +48,7 @@
                                                {"disk_device": "sda10", "r/s": 0.00, "w/s": 0.00, "d/s": 0.00, "f/s": 0.00, "rkB/s": 0.00, "wkB/s": 0.00, "dkB/s": 0.00, "rrqm/s": 0.00, "wrqm/s": 0.00, "drqm/s": 0.00, "rrqm": 0.00, "wrqm": 0.00, "drqm": 0.00, "r_await": 0.00, "w_await": 0.00, "d_await": 0.00, "f_await": 0.00, "rareq-sz": 0.00, "wareq-sz": 0.00, "dareq-sz": 0.00, "aqu-sz": 0.00, "util": 0.00},
                                                {"disk_device": "sda11", "r/s": 0.00, "w/s": 0.00, "d/s": 0.00, "f/s": 0.00, "rkB/s": 0.00, "wkB/s": 0.00, "dkB/s": 0.00, "rrqm/s": 0.00, "wrqm/s": 0.00, "drqm/s": 0.00, "rrqm": 0.00, "wrqm": 0.00, "drqm": 0.00, "r_await": 0.00, "w_await": 0.00, "d_await": 0.00, "f_await": 0.00, "rareq-sz": 0.00, "wareq-sz": 0.00, "dareq-sz": 0.00, "aqu-sz": 0.00, "util": 0.00},
                                                {"disk_device": "sda12", "r/s": 0.00, "w/s": 0.00, "d/s": 0.00, "f/s": 0.00, "rkB/s": 0.00, "wkB/s": 0.00, "dkB/s": 0.00, "rrqm/s": 0.00, "wrqm/s": 0.00, "drqm/s": 0.00, "rrqm": 0.00, "wrqm": 0.00, "drqm": 0.00, "r_await": 0.00, "w_await": 0.00, "d_await": 0.00, "f_await": 0.00, "rareq-sz": 0.00, "wareq-sz": 0.00, "dareq-sz": 0.00, "aqu-sz": 0.00, "util": 0.00},
-                                               {"disk_device": "scd0", "r/s": 0.00, "w/s": 0.00, "d/s": 0.00, "f/s": 0.00, "rkB/s": 0.00, "wkB/s": 0.00, "dkB/s": 0.00, "rrqm/s": 0.00, "wrqm/s": 0.00, "drqm/s": 0.00, "rrqm": 0.00, "wrqm": 0.00, "drqm": 0.00, "r_await": 0.00, "w_await": 0.00, "d_await": 0.00, "f_await": 0.00, "rareq-sz": 0.00, "wareq-sz": 0.00, "dareq-sz": 0.00, "aqu-sz": 0.00, "util": 0.00},
+                                               {"disk_device": "sr0", "r/s": 0.00, "w/s": 0.00, "d/s": 0.00, "f/s": 0.00, "rkB/s": 0.00, "wkB/s": 0.00, "dkB/s": 0.00, "rrqm/s": 0.00, "wrqm/s": 0.00, "drqm/s": 0.00, "rrqm": 0.00, "wrqm": 0.00, "drqm": 0.00, "r_await": 0.00, "w_await": 0.00, "d_await": 0.00, "f_await": 0.00, "rareq-sz": 0.00, "wareq-sz": 0.00, "dareq-sz": 0.00, "aqu-sz": 0.00, "util": 0.00},
                                                {"disk_device": "sdb", "r/s": 0.00, "w/s": 0.00, "d/s": 0.00, "f/s": 0.00, "rkB/s": 0.00, "wkB/s": 0.00, "dkB/s": 0.00, "rrqm/s": 0.00, "wrqm/s": 0.00, "drqm/s": 0.00, "rrqm": 0.00, "wrqm": 0.00, "drqm": 0.00, "r_await": 0.00, "w_await": 0.00, "d_await": 0.00, "f_await": 0.00, "rareq-sz": 0.00, "wareq-sz": 0.00, "dareq-sz": 0.00, "aqu-sz": 0.00, "util": 0.00},
                                                {"disk_device": "sde", "r/s": 0.00, "w/s": 0.00, "d/s": 0.00, "f/s": 0.00, "rkB/s": 0.00, "wkB/s": 0.00, "dkB/s": 0.00, "rrqm/s": 0.00, "wrqm/s": 0.00, "drqm/s": 0.00, "rrqm": 0.00, "wrqm": 0.00, "drqm": 0.00, "r_await": 0.00, "w_await": 0.00, "d_await": 0.00, "f_await": 0.00, "rareq-sz": 0.00, "wareq-sz": 0.00, "dareq-sz": 0.00, "aqu-sz": 0.00, "util": 0.00},
                                                {"disk_device": "sdc", "r/s": 0.00, "w/s": 0.00, "d/s": 0.00, "f/s": 0.00, "rkB/s": 0.00, "wkB/s": 0.00, "dkB/s": 0.00, "rrqm/s": 0.00, "wrqm/s": 0.00, "drqm/s": 0.00, "rrqm": 0.00, "wrqm": 0.00, "drqm": 0.00, "r_await": 0.00, "w_await": 0.00, "d_await": 0.00, "f_await": 0.00, "rareq-sz": 0.00, "wareq-sz": 0.00, "dareq-sz": 0.00, "aqu-sz": 0.00, "util": 0.00},

diff --git a/tests/expected2.iostat-gpALL b/tests/expected2.iostat-gpALL
index 8ad9347aeed05ad2955b687c8a340039d1f1478f..4c82b408be3566a643b5e16dc50b60935bb8943a 100644 (file)
--- a/tests/expected2.iostat-gpALL
+++ b/tests/expected2.iostat-gpALL
@@ -18,7 +18,7 @@ sda7              0.02         0.62         0.00         0.00       4437
 sda8              0.01         0.34         0.00         0.00       2444          0          0
 sda10             0.01         0.31         0.00         0.00       2220          0          0
 sda11             0.01         0.31         0.00         0.00       2252          0          0
-scd0              0.00         0.00         0.00         0.00          0          0          0
+sr0               0.00         0.00         0.00         0.00          0          0          0
 sdb               0.01         0.29         0.00         0.00       2108          0          0
 sde               0.00         0.00         0.00         0.00          0          0          0
 sdc               0.00         0.00         0.00         0.00          0          0          0
@@ -45,7 +45,7 @@ sda7              0.00         0.00         0.00         0.00          0
 sda8              0.00         0.00         0.00         0.00          0          0          0
 sda10             0.00         0.00         0.00         0.00          0          0          0
 sda11             0.00         0.00         0.00         0.00          0          0          0
-scd0              0.00         0.00         0.00         0.00          0          0          0
+sr0               0.00         0.00         0.00         0.00          0          0          0
 sdb               0.00         0.00         0.00         0.00          0          0          0
 sde               0.00         0.00         0.00         0.00          0          0          0
 sdc               0.00         0.00         0.00         0.00          0          0          0

diff --git a/tests/expected3.iostat-gpALL b/tests/expected3.iostat-gpALL
index 1894f605c45b10abb1538dcb7a7519b9e4259952..90b346bb7099759b07fba4b601972fb726399df8 100644 (file)
--- a/tests/expected3.iostat-gpALL
+++ b/tests/expected3.iostat-gpALL
@@ -18,7 +18,7 @@ sda7              0.02         0.62         0.00         0.00       4437
 sda8              0.01         0.34         0.00         0.00       2444          0          0
 sda10             0.01         0.31         0.00         0.00       2220          0          0
 sda11             0.01         0.31         0.00         0.00       2252          0          0
-scd0              0.00         0.00         0.00         0.00          0          0          0
+sr0               0.00         0.00         0.00         0.00          0          0          0
 sdb               0.01         0.29         0.00         0.00       2108          0          0
 sde               0.00         0.00         0.00         0.00          0          0          0
 sdc               0.00         0.00         0.00         0.00          0          0          0
@@ -45,7 +45,7 @@ sda7              0.00         0.00         0.00         0.00          0
 sda8              0.00         0.00         0.00         0.00          0          0          0
 sda10             0.00         0.00         0.00         0.00          0          0          0
 sda11             0.00         0.00         0.00         0.00          0          0          0
-scd0              0.00         0.00         0.00         0.00          0          0          0
+sr0               0.00         0.00         0.00         0.00          0          0          0
 sdb               0.00         0.00         0.00         0.00          0          0          0
 sde               0.00         0.00         0.00         0.00          0          0          0
 sdc               0.00         0.00         0.00         0.00          0          0          0