In preperation to add another tests which needs the nvmf_wait_for_state
function, move it to the common code base.
Signed-off-by: Daniel Wagner <wagi@xxxxxxxxxx>
---
common/nvme | 27 +++++++++++++++++++++++++++
tests/nvme/048 | 31 ++-----------------------------
2 files changed, 29 insertions(+), 29 deletions(-)
diff --git a/common/nvme b/common/nvme
index 04b49c2c1f9edc6de516398b537502fc30a92969..68720ddc20cf3ed5cfe2841f9921321d9899ce0d 100644
--- a/common/nvme
+++ b/common/nvme
@@ -573,6 +573,33 @@ _nvmf_wait_for_ns() {
return 0
}
+_nvmf_wait_for_state() {
+ local def_state_timeout=5
+ local subsys_name="$1"
+ local state="$2"
+ local timeout="${3:-$def_state_timeout}"
+ local nvmedev
+ local state_file
+ local start_time
+ local end_time
+
+ nvmedev=$(_find_nvme_dev "${subsys_name}")
+ state_file="/sys/class/nvme-fabrics/ctl/${nvmedev}/state"
+
+ start_time=$(date +%s)
+ while ! grep -q "${state}" "${state_file}"; do
+ sleep 1
+ end_time=$(date +%s)
+ if (( end_time - start_time > timeout )); then
+ echo "expected state \"${state}\" not " \
+ "reached within ${timeout} seconds"
+ return 1
+ fi
+ done
+
+ return 0
+}
+
_create_nvmet_ns() {
local subsysnqn="${def_subsysnqn}"
local nsid="${def_nsid}"
diff --git a/tests/nvme/048 b/tests/nvme/048
index bd41faef4e5431957f63184408c147b8ada1a8dd..afd9272c1a31b5a3d2df2e1ce9fe3268de768420 100755
--- a/tests/nvme/048
+++ b/tests/nvme/048
@@ -19,33 +19,6 @@ set_conditions() {
_set_nvme_trtype "$@"
}
-nvmf_wait_for_state() {
- local def_state_timeout=5
- local subsys_name="$1"
- local state="$2"
- local timeout="${3:-$def_state_timeout}"
- local nvmedev
- local state_file
- local start_time
- local end_time
-
- nvmedev=$(_find_nvme_dev "${subsys_name}")
- state_file="/sys/class/nvme-fabrics/ctl/${nvmedev}/state"
-
- start_time=$(date +%s)
- while ! grep -q "${state}" "${state_file}"; do
- sleep 1
- end_time=$(date +%s)
- if (( end_time - start_time > timeout )); then
- echo "expected state \"${state}\" not " \
- "reached within ${timeout} seconds"
- return 1
- fi
- done
-
- return 0
-}
-
nvmf_check_queue_count() {
local subsys_name="$1"
local queue_count="$2"
@@ -87,7 +60,7 @@ set_qid_max() {
set_nvmet_attr_qid_max "${subsys_name}" "${qid_max}"
nvmf_check_queue_count "${subsys_name}" "${qid_max}" || return 1
- nvmf_wait_for_state "${subsys_name}" "live" || return 1
+ _nvmf_wait_for_state "${subsys_name}" "live" || return 1
return 0
}
@@ -106,7 +79,7 @@ test() {
_nvme_connect_subsys --keep-alive-tmo 1 \
--reconnect-delay 2
- if ! nvmf_wait_for_state "${def_subsysnqn}" "live" ; then
+ if ! _nvmf_wait_for_state "${def_subsysnqn}" "live" ; then
echo FAIL
else
set_qid_max "${def_subsysnqn}" 1 || echo FAIL
--
2.49.0
