tests/nvme: set hostnqn after hostid uuidgen

hostid will not be appended to hostnqn as it was generated after set
hostnqn, so let's set hostnqn after hostid generated.

Reviewed-by: Hannes Reinecke <hare@suse.de>
Signed-off-by: Yi Zhang <yi.zhang@redhat.com>
Signed-off-by: Shin'ichiro Kawasaki <shinichiro.kawasaki@wdc.com>

diff --git a/tests/nvme/041 b/tests/nvme/041
index 98c443e8286794b006405c5994d6d4b7c07a76b1..b3112291c67a700378a002b02dfeb9f8b52ac58b 100755 (executable)
--- a/tests/nvme/041
+++ b/tests/nvme/041
@@ -23,7 +23,7 @@ test() {
        local port
        local subsys_name="blktests-subsystem-1"
        local hostid
-       local hostnqn="nqn.2014-08.org.nvmexpress:uuid:${hostid}"
+       local hostnqn
        local file_path="${TMPDIR}/img"
        local hostkey
        local ctrldev
@@ -35,6 +35,7 @@ test() {
                echo "uuidgen failed"
                return 1
        fi
+       hostnqn="nqn.2014-08.org.nvmexpress:uuid:${hostid}"
        hostkey="$(nvme gen-dhchap-key -n ${subsys_name} 2> /dev/null)"
        if [ -z "$hostkey" ] ; then
                echo "nvme gen-dhchap-key failed"

diff --git a/tests/nvme/042 b/tests/nvme/042
index 06e5d3dc0dc0a009b171570efbfeaa15bf95f1ac..30a638df11086fdc5a94106b6e41c20596add6ff 100755 (executable)
--- a/tests/nvme/042
+++ b/tests/nvme/042
@@ -23,7 +23,7 @@ test() {
        local port
        local subsys_name="blktests-subsystem-1"
        local hostid
-       local hostnqn="nqn.2014-08.org.nvmexpress:uuid:${hostid}"
+       local hostnqn
        local file_path="${TMPDIR}/img"
        local hmac
        local key_len
@@ -37,6 +37,7 @@ test() {
                echo "uuidgen failed"
                return 1
        fi
+       hostnqn="nqn.2014-08.org.nvmexpress:uuid:${hostid}"
 
        _setup_nvmet
 

diff --git a/tests/nvme/043 b/tests/nvme/043
index 87273e5b414d31190bc162428dd725b931432926..84e16660745549bf9628db247f59df216dd2de80 100755 (executable)
--- a/tests/nvme/043
+++ b/tests/nvme/043
@@ -24,7 +24,7 @@ test() {
        local port
        local subsys_name="blktests-subsystem-1"
        local hostid
-       local hostnqn="nqn.2014-08.org.nvmexpress:uuid:${hostid}"
+       local hostnqn
        local file_path="${TMPDIR}/img"
        local hash
        local dhgroup
@@ -38,6 +38,7 @@ test() {
                echo "uuidgen failed"
                return 1
        fi
+       hostnqn="nqn.2014-08.org.nvmexpress:uuid:${hostid}"
 
        _setup_nvmet
 

diff --git a/tests/nvme/044 b/tests/nvme/044
index 13019659b951cf754fdc5407aa05131ff6c43dce..0eb36ccae1a54bcb176c59e1a8530f94911f3bc4 100755 (executable)
--- a/tests/nvme/044
+++ b/tests/nvme/044
@@ -24,7 +24,7 @@ test() {
        local port
        local subsys_name="blktests-subsystem-1"
        local hostid
-       local hostnqn="nqn.2014-08.org.nvmexpress:uuid:${hostid}"
+       local hostnqn
        local file_path="${TMPDIR}/img"
        local hostkey
        local ctrlkey
@@ -37,6 +37,7 @@ test() {
                echo "uuidgen failed"
                return 1
        fi
+       hostnqn="nqn.2014-08.org.nvmexpress:uuid:${hostid}"
 
        hostkey="$(nvme gen-dhchap-key -n ${subsys_name} 2> /dev/null)"
        if [ -z "$hostkey" ] ; then

diff --git a/tests/nvme/045 b/tests/nvme/045
index 264f21053921166da3e24b6261022c3544bf598f..389e434202bd39b8ec53051d375bc0dae69a1e8c 100755 (executable)
--- a/tests/nvme/045
+++ b/tests/nvme/045
@@ -24,7 +24,7 @@ test() {
        local port
        local subsys_name="blktests-subsystem-1"
        local hostid
-       local hostnqn="nqn.2014-08.org.nvmexpress:uuid:${hostid}"
+       local hostnqn
        local file_path="${TMPDIR}/img"
        local hostkey
        local new_hostkey
@@ -39,6 +39,7 @@ test() {
                echo "uuidgen failed"
                return 1
        fi
+       hostnqn="nqn.2014-08.org.nvmexpress:uuid:${hostid}"
 
        hostkey="$(nvme gen-dhchap-key -n ${subsys_name} 2> /dev/null)"
        if [ -z "$hostkey" ] ; then