Add filter function for nvme discover

Several NVMe tests (002, 016, 017) used a pipe to a sed call filtering
the output. This call is moved to a new filter function nvme/rc and
the calls to sed are replaced by this function.

Additionally, the test nvme/016 failed for me due to the Generation
counter being greater than 1, so the new filter function was expanded to
replace the Generation counter with 'X'.

Reviewed-by: Johannes Thumshirn <jthumshirn@suse.de>
Signed-off-by: Michael Moese <mmoese@suse.de>
[logang@deltatee.com: added missing changes to 002.out and 017.out]
Signed-off-by: Logan Gunthorpe <logang@deltatee.com>

diff --git a/tests/nvme/002 b/tests/nvme/002
index 106a5a8395f2fc7dad258d2244d4837dc6db0ccf..ceac1c677bd4851948834a43bcabe383a234f8fc 100755 (executable)
--- a/tests/nvme/002
+++ b/tests/nvme/002
@@ -32,7 +32,7 @@ test() {
                _add_nvmet_subsys_to_port "${port}" "blktests-subsystem-$i"
        done
 
-       nvme discover -t loop | sed -r -e "s/portid:  [0-9]+/portid:  X/"
+       nvme discover -t loop | _filter_discovery
 
        for ((i = iterations - 1; i >= 0; i--)); do
                _remove_nvmet_subsystem_from_port "${port}" "blktests-subsystem-$i"

diff --git a/tests/nvme/002.out b/tests/nvme/002.out
index aa71d8f5f5f83ef2862ae237a7239f47fc44311b..7437a21f60a999f2dad35137c6c49e1715870c2d 100644 (file)
--- a/tests/nvme/002.out
+++ b/tests/nvme/002.out
@@ -1,6 +1,6 @@
 Running nvme/002
 
-Discovery Log Number of Records 1000, Generation counter 1000
+Discovery Log Number of Records 1000, Generation counter X
 =====Discovery Log Entry 0======
 trtype:  loop
 adrfam:  pci

diff --git a/tests/nvme/016 b/tests/nvme/016
index 966d5dc0a4a29d557d385cea90de7c32a58553cf..dd1b84a16daa453b7007a880ac076a3c3aa0081d 100755 (executable)
--- a/tests/nvme/016
+++ b/tests/nvme/016
@@ -34,7 +34,7 @@ test() {
        port="$(_create_nvmet_port "loop")"
        _add_nvmet_subsys_to_port "$port" "${subsys_nqn}"
 
-       nvme discover -t loop | sed -r -e "s/portid:  [0-9]+/portid:  X/"
+       nvme discover -t loop | _filter_discovery
        _remove_nvmet_subsystem_from_port "${port}" "${subsys_nqn}"
        _remove_nvmet_port "${port}"
 

diff --git a/tests/nvme/016.out b/tests/nvme/016.out
index 59bd2935346f02329232809cb8b41fd0cfae6242..b70603144d5c61d65b41a619297cf8fec1891c81 100644 (file)
--- a/tests/nvme/016.out
+++ b/tests/nvme/016.out
@@ -1,6 +1,6 @@
 Running nvme/016
 
-Discovery Log Number of Records 1, Generation counter 1
+Discovery Log Number of Records 1, Generation counter X
 =====Discovery Log Entry 0======
 trtype:  loop
 adrfam:  pci

diff --git a/tests/nvme/017 b/tests/nvme/017
index 0b86bece95201f7207ce36a3d719800ca642a554..5f8d6090729359728d936be2532fe04221c99cf4 100755 (executable)
--- a/tests/nvme/017
+++ b/tests/nvme/017
@@ -37,7 +37,7 @@ test() {
        port="$(_create_nvmet_port "loop")"
        _add_nvmet_subsys_to_port "${port}" "${subsys_name}"
 
-       nvme discover -t loop | sed -r -e "s/portid:  [0-9]+/portid:  X/"
+       nvme discover -t loop | _filter_discovery
        _remove_nvmet_subsystem_from_port "${port}" "${subsys_name}"
        _remove_nvmet_port "${port}"
 

diff --git a/tests/nvme/017.out b/tests/nvme/017.out
index 4b0877aaf3ca0635a99cf4ec9f0a889f3c2969fc..cf212971d180e0140d7ac39e8524e1f8addd3614 100644 (file)
--- a/tests/nvme/017.out
+++ b/tests/nvme/017.out
@@ -1,6 +1,6 @@
 Running nvme/017
 
-Discovery Log Number of Records 1, Generation counter 1
+Discovery Log Number of Records 1, Generation counter X
 =====Discovery Log Entry 0======
 trtype:  loop
 adrfam:  pci

diff --git a/tests/nvme/rc b/tests/nvme/rc
index eff1dd992460b4a8f2f1062384ec40ee5c676c60..22833d8ef9bbd1ec888edb062e58ac00b045b15c 100644 (file)
--- a/tests/nvme/rc
+++ b/tests/nvme/rc
@@ -118,3 +118,8 @@ _find_nvme_loop_dev() {
                fi
        done
 }
+
+_filter_discovery() {
+       sed -r  -e "s/portid:  [0-9]+/portid:  X/" \
+               -e "s/Generation counter [0-9]+/Generation counter X/"
+}