From 28f4299fe7a393c35318e9e69c903897319a19e1 Mon Sep 17 00:00:00 2001
From: Marcin Dziegielewski <marcin.dziegielewski@intel.com>
Date: Mon, 12 Aug 2019 15:24:30 +0200
Subject: [PATCH] test: move get_nvme_name_from_bdf function to
 autotest_common.sh

This function is useful for each test which use nvme device, so
it will be easier to keep it in autotest_common.sh file instead of
including also nvme.sh in each test.

Signed-off-by: Marcin Dziegielewski <marcin.dziegielewski@intel.com>
Change-Id: Ic2e186826211725b95f3ec3b455d23f43ea41b8f
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/464691
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
---
 test/common/autotest_common.sh | 21 +++++++++++++++++++++
 test/nvme/nvme.sh              | 21 ---------------------
 2 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/test/common/autotest_common.sh b/test/common/autotest_common.sh
index 17a7d1942..78ec6e519 100644
--- a/test/common/autotest_common.sh
+++ b/test/common/autotest_common.sh
@@ -828,6 +828,27 @@ function freebsd_update_contigmem_mod()
 	fi
 }
 
+function get_nvme_name_from_bdf {
+	blkname=()
+
+	nvme_devs=$(lsblk -d --output NAME | grep "^nvme") || true
+	if [ -z "$nvme_devs" ]; then
+		return
+	fi
+	for dev in $nvme_devs; do
+		link_name=$(readlink /sys/block/$dev/device/device) || true
+		if [ -z "$link_name" ]; then
+			link_name=$(readlink /sys/block/$dev/device)
+		fi
+		bdf=$(basename "$link_name")
+		if [ "$bdf" = "$1" ]; then
+			blkname+=($dev)
+		fi
+	done
+
+	printf '%s\n' "${blkname[@]}"
+}
+
 set -o errtrace
 trap "trap - ERR; print_backtrace >&2" ERR
 
diff --git a/test/nvme/nvme.sh b/test/nvme/nvme.sh
index e5a9bb617..d2f4f56e2 100755
--- a/test/nvme/nvme.sh
+++ b/test/nvme/nvme.sh
@@ -5,27 +5,6 @@ rootdir=$(readlink -f $testdir/../..)
 source $rootdir/scripts/common.sh
 source $rootdir/test/common/autotest_common.sh
 
-function get_nvme_name_from_bdf {
-	blkname=()
-
-	nvme_devs=$(lsblk -d --output NAME | grep "^nvme") || true
-	if [ -z "$nvme_devs" ]; then
-		return
-	fi
-	for dev in $nvme_devs; do
-		link_name=$(readlink /sys/block/$dev/device/device) || true
-		if [ -z "$link_name" ]; then
-			link_name=$(readlink /sys/block/$dev/device)
-		fi
-		bdf=$(basename "$link_name")
-		if [ "$bdf" = "$1" ]; then
-			blkname+=($dev)
-		fi
-	done
-
-	printf '%s\n' "${blkname[@]}"
-}
-
 timing_enter nvme
 
 if [ $(uname) = Linux ]; then