nvme/{014,015,018,019,020,023,024,026,045,046}: use long command line option for...

The long format of the command line option are more descriptive and more
likely to stay stable.

Signed-off-by: Daniel Wagner <dwagner@suse.de>
Signed-off-by: Shin'ichiro Kawasaki <shinichiro.kawasaki@wdc.com>

diff --git a/tests/nvme/014 b/tests/nvme/014
index 31bfeb76d13d1f0ab68b53d29e3132e78a5b5cd3..c02167142cb3ceba1b1be3a9fba56439b76c1809 100755 (executable)
--- a/tests/nvme/014
+++ b/tests/nvme/014
@@ -39,7 +39,7 @@ test() {
        dd if=/dev/urandom of="/dev/${nvmedev}n1" \
                count="${count}" bs="${bs}" status=none
 
-       nvme flush "/dev/${nvmedev}" -n 1
+       nvme flush "/dev/${nvmedev}" --namespace-id 1
 
        _nvme_disconnect_subsys "${def_subsysnqn}"
 

diff --git a/tests/nvme/015 b/tests/nvme/015
index 4315ffa5757786080798a316b0f5371648c9315c..8ea90f10bda7d1a5f3085b623b8178b50378dbfb 100755 (executable)
--- a/tests/nvme/015
+++ b/tests/nvme/015
@@ -39,7 +39,7 @@ test() {
        dd if=/dev/urandom of="/dev/${nvmedev}n1" \
                count="${count}" bs="${bs}" status=none
 
-       nvme flush "/dev/${nvmedev}n1" -n 1
+       nvme flush "/dev/${nvmedev}n1" --namespace-id 1
 
        _nvme_disconnect_subsys "${def_subsysnqn}"
 

diff --git a/tests/nvme/018 b/tests/nvme/018
index e90173098ec1bc2599bf707abe9113c3387e8c44..e631434d7bd69e59df709e9dba5625c3ef7cbced 100755 (executable)
--- a/tests/nvme/018
+++ b/tests/nvme/018
@@ -35,7 +35,8 @@ test() {
        sectors="$(blockdev --getsz "/dev/${nvmedev}n1")"
        bs="$(blockdev --getbsz "/dev/${nvmedev}n1")"
 
-       nvme read "/dev/${nvmedev}n1" -s "$sectors" -c 0 -z "$bs" &>"$FULL" \
+       nvme read "/dev/${nvmedev}n1" --start-block "$sectors" \
+               --block-count 0 --data-size "$bs" &>"$FULL" \
                && echo "ERROR: nvme read for out of range LBA was not rejected"
 
        _nvme_disconnect_subsys "${def_subsysnqn}"

diff --git a/tests/nvme/019 b/tests/nvme/019
index a1035ff8d8c7df537db753997e7bc3dc07b9dad7..3ab22e2cba01217ad8b101bb837c65e04df09c0c 100755 (executable)
--- a/tests/nvme/019
+++ b/tests/nvme/019
@@ -31,7 +31,8 @@ test() {
        nvmedev=$(_find_nvme_dev "${def_subsysnqn}")
        _check_uuid "${nvmedev}"
 
-       nvme dsm "/dev/${nvmedev}" -n 1 -d -s "${sblk_range}" -b "${nblk_range}"
+       nvme dsm "/dev/${nvmedev}" --namespace-id 1 --ad \
+               --slbs "${sblk_range}" --blocks "${nblk_range}"
 
        _nvme_disconnect_subsys "${def_subsysnqn}"
 

diff --git a/tests/nvme/020 b/tests/nvme/020
index ba3f4c8a5b3d5c3876426d73ee7e6c9d7d5a5b10..10de114b83af07da3087ddc0ae753e113e5cd577 100755 (executable)
--- a/tests/nvme/020
+++ b/tests/nvme/020
@@ -30,7 +30,8 @@ test() {
        nvmedev=$(_find_nvme_dev "${def_subsysnqn}")
        _check_uuid "${nvmedev}"
 
-       nvme dsm "/dev/${nvmedev}" -n 1 -d -s "${sblk_range}" -b "${nblk_range}"
+       nvme dsm "/dev/${nvmedev}" --namespace-id 1 --ad \
+               --slbs "${sblk_range}" --blocks "${nblk_range}"
 
        _nvme_disconnect_subsys "${def_subsysnqn}"
 

diff --git a/tests/nvme/023 b/tests/nvme/023
index 4e4d838ef6c91798064d88c3168ccebb378b3884..58f03e8603a7320fa2d0794ddd20dd905fdd2cae 100755 (executable)
--- a/tests/nvme/023
+++ b/tests/nvme/023
@@ -29,7 +29,8 @@ test() {
        nvmedev=$(_find_nvme_dev "${def_subsysnqn}")
        _check_uuid "${nvmedev}"
 
-       if ! nvme smart-log "/dev/${nvmedev}" -n 1 >> "$FULL" 2>&1; then
+       if ! nvme smart-log "/dev/${nvmedev}" --namespace-id 1 \
+               >> "$FULL" 2>&1; then
                echo "ERROR: smart-log bdev-ns failed"
        fi
 

diff --git a/tests/nvme/024 b/tests/nvme/024
index 2535a9a78d23a33a2b4a8ada5a9bb86e024f141e..4608f015c4c326c8276bcee37c5fd50cf9733a55 100755 (executable)
--- a/tests/nvme/024
+++ b/tests/nvme/024
@@ -29,7 +29,8 @@ test() {
        nvmedev=$(_find_nvme_dev "${def_subsysnqn}")
        _check_uuid "${nvmedev}"
 
-       if ! nvme smart-log "/dev/${nvmedev}" -n 1 >> "$FULL" 2>&1; then
+       if ! nvme smart-log "/dev/${nvmedev}" --namespace-id 1 \
+               >> "$FULL" 2>&1; then
                echo "ERROR: smart-log file-ns failed"
        fi
        _nvme_disconnect_subsys "${def_subsysnqn}" >> "$FULL" 2>&1

diff --git a/tests/nvme/026 b/tests/nvme/026
index 5a7d9927b44bc265b36aae480982472261482721..d5e13db0a916a031d997eec5bea74dc923fd6568 100755 (executable)
--- a/tests/nvme/026
+++ b/tests/nvme/026
@@ -29,7 +29,8 @@ test() {
        nvmedev=$(_find_nvme_dev "${def_subsysnqn}")
        _check_uuid "${nvmedev}"
 
-       if ! nvme ns-descs "/dev/${nvmedev}" -n 1 >> "$FULL" 2>&1; then
+       if ! nvme ns-descs "/dev/${nvmedev}" --namespace-id 1 \
+               >> "$FULL" 2>&1; then
                echo "ERROR: ns-desc failed"
        fi
 

diff --git a/tests/nvme/045 b/tests/nvme/045
index be408b6297710212e61e2d9b6f67db0dc613e22e..9e5cb54e9533bd1e42c3b0a1c8b760bc8ab06121 100755 (executable)
--- a/tests/nvme/045
+++ b/tests/nvme/045
@@ -68,7 +68,7 @@ test() {
 
        echo "Renew host key on the controller"
 
-       new_hostkey="$(nvme gen-dhchap-key -n ${def_subsysnqn} 2> /dev/null)"
+       new_hostkey="$(nvme gen-dhchap-key --nqn ${def_subsysnqn} 2> /dev/null)"
 
        _set_nvmet_hostkey "${def_hostnqn}" "${new_hostkey}"
 
@@ -78,7 +78,7 @@ test() {
 
        echo "Renew ctrl key on the controller"
 
-       new_ctrlkey="$(nvme gen-dhchap-key -n ${def_subsysnqn} 2> /dev/null)"
+       new_ctrlkey="$(nvme gen-dhchap-key --nqn ${def_subsysnqn} 2> /dev/null)"
 
        _set_nvmet_ctrlkey "${def_hostnqn}" "${new_ctrlkey}"
 

diff --git a/tests/nvme/046 b/tests/nvme/046
index 7576a24f234d13e38907f5d323691fd038a0bef7..ea68d4079403bdeaad1f8f1e504e917492452f78 100755 (executable)
--- a/tests/nvme/046
+++ b/tests/nvme/046
@@ -25,13 +25,14 @@ test_device() {
 
        chmod g+r,o+r "$ngdev"
 
-       if ! _run_user "nvme io-passthru ${ngdev} --opcode 2 -l 4096 \
-               -n $nsid -r" >> "${FULL}" 2>&1; then
+       if ! _run_user "nvme io-passthru ${ngdev} --opcode 2 --data-len 4096 \
+               --namespace-id $nsid --read" >> "${FULL}" 2>&1; then
                echo "Error: io-passthru read failed"
        fi
 
        if _run_user "echo hello | nvme io-passthru ${ngdev} --opcode 1 \
-               -l 4096 -n $nsid -r" >> "${FULL}" 2>&1; then
+               --data-len 4096 --namespace-id $nsid --read" \
+               >> "${FULL}" 2>&1; then
                echo "Error: io-passthru write passed (unexpected)"
        fi