Helper _nvme_requires will be required for md atomics NVMe testing, so
relocate to a common file.
Helper _require_nvme_test_img_size is referenced by _nvme_requires, so
relocate that as well.
Signed-off-by: John Garry <john.g.garry@xxxxxxxxxx>
---
common/nvme | 72 +++++++++++++++++++++++++++++++++++++++++++++++++++
tests/nvme/rc | 72 ---------------------------------------------------
2 files changed, 72 insertions(+), 72 deletions(-)
diff --git a/common/nvme b/common/nvme
index 8de41fa..26b3b97 100644
--- a/common/nvme
+++ b/common/nvme
@@ -1102,3 +1102,75 @@ _nvmet_target_cleanup() {
_cleanup_blkdev
fi
}
+
+_require_nvme_test_img_size() {
+ local require_sz_mb
+ local nvme_img_size_mb
+
+ require_sz_mb="$(convert_to_mb "$1")"
+ nvme_img_size_mb="$(convert_to_mb "${NVME_IMG_SIZE}")"
+
+ if ((nvme_img_size_mb < require_sz_mb)); then
+ SKIP_REASONS+=("NVME_IMG_SIZE must be at least ${require_sz_mb}m")
+ return 1
+ fi
+ return 0
+}
+
+_nvme_requires() {
+ _require_nvme_test_img_size 4m
+ case ${nvme_trtype} in
+ loop)
+ _have_driver nvme-loop
+ _have_configfs
+ ;;
+ pci)
+ _have_driver nvme
+ ;;
+ tcp)
+ _have_driver nvme-tcp
+ _have_driver nvmet-tcp
+ _have_configfs
+ ;;
+ rdma)
+ _have_driver nvme-rdma
+ _have_driver nvmet-rdma
+ _have_configfs
+ _have_program rdma
+ if [ -n "$USE_RXE" ]; then
+ _have_driver rdma_rxe
+ else
+ _have_driver siw
+ fi
+ ;;
+ fc)
+ _have_driver nvme-fc
+ _have_driver nvme-fcloop
+ _have_configfs
+ def_adrfam="fc"
+ ;;
+ esac
+
+ if [[ -n ${nvme_adrfam} ]]; then
+ case ${nvme_adrfam} in
+ ipv6)
+ def_traddr="::1"
+ def_adrfam="ipv6"
+ ;;
+ ipv4)
+ ;; # was already set
+ fc)
+ def_adrfam="fc"
+ ;;
+ *)
+ # ignore for non ip transports
+ if [[ "${nvme_trtype}" == "tcp" ||
+ "${nvme_trtype}" == "rdma" ]]; then
+ SKIP_REASONS+=("unsupported nvme_adrfam=${nvme_adrfam}")
+ return 1
+ fi
+ esac
+ fi
+
+ return 0
+}
diff --git a/tests/nvme/rc b/tests/nvme/rc
index 6d86ad4..33055ef 100644
--- a/tests/nvme/rc
+++ b/tests/nvme/rc
@@ -54,64 +54,6 @@ _set_nvmet_blkdev_type() {
COND_DESC="bd=${nvmet_blkdev_type}"
}
-_nvme_requires() {
- _require_nvme_test_img_size 4m
- case ${nvme_trtype} in
- loop)
- _have_driver nvme-loop
- _have_configfs
- ;;
- pci)
- _have_driver nvme
- ;;
- tcp)
- _have_driver nvme-tcp
- _have_driver nvmet-tcp
- _have_configfs
- ;;
- rdma)
- _have_driver nvme-rdma
- _have_driver nvmet-rdma
- _have_configfs
- _have_program rdma
- if [ -n "$USE_RXE" ]; then
- _have_driver rdma_rxe
- else
- _have_driver siw
- fi
- ;;
- fc)
- _have_driver nvme-fc
- _have_driver nvme-fcloop
- _have_configfs
- def_adrfam="fc"
- ;;
- esac
-
- if [[ -n ${nvme_adrfam} ]]; then
- case ${nvme_adrfam} in
- ipv6)
- def_traddr="::1"
- def_adrfam="ipv6"
- ;;
- ipv4)
- ;; # was already set
- fc)
- def_adrfam="fc"
- ;;
- *)
- # ignore for non ip transports
- if [[ "${nvme_trtype}" == "tcp" ||
- "${nvme_trtype}" == "rdma" ]]; then
- SKIP_REASONS+=("unsupported nvme_adrfam=${nvme_adrfam}")
- return 1
- fi
- esac
- fi
-
- return 0
-}
-
group_setup() {
if [[ -n "${nvme_target_control}" ]]; then
NVMET_TRTYPES="$(${nvme_target_control} config --show-trtype)"
@@ -186,20 +128,6 @@ _test_dev_disables_extended_lba() {
return 0
}
-_require_nvme_test_img_size() {
- local require_sz_mb
- local nvme_img_size_mb
-
- require_sz_mb="$(convert_to_mb "$1")"
- nvme_img_size_mb="$(convert_to_mb "${NVME_IMG_SIZE}")"
-
- if ((nvme_img_size_mb < require_sz_mb)); then
- SKIP_REASONS+=("NVME_IMG_SIZE must be at least ${require_sz_mb}m")
- return 1
- fi
- return 0
-}
-
_require_nvme_cli_auth() {
if ! nvme gen-dhchap-key --nqn nvmf-test-subsys > /dev/null 2>&1 ; then
SKIP_REASONS+=("nvme gen-dhchap-key command missing")
--
2.43.5
