From d66bb2d185352ba226e0d60cf3896a726021d637 Mon Sep 17 00:00:00 2001
From: Kamil Godzwon <kamilx.godzwon@intel.com>
Date: Fri, 1 Apr 2022 06:22:15 -0400
Subject: [PATCH] test/autotest_common: add an option to wait for a bdev

Adds an option to wait for a bdev to appear
when issuing bdev_get_bdevs in waitforbdev.

Signed-off-by: Kamil Godzwon <kamilx.godzwon@intel.com>
Change-Id: I2f989a2cc5282049182834b67629f2fa11122105
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/12131
Community-CI: Broadcom CI <spdk-ci.pdl@broadcom.com>
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
---
 test/common/autotest_common.sh | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/test/common/autotest_common.sh b/test/common/autotest_common.sh
index 6186b3af8..b0c2f2592 100755
--- a/test/common/autotest_common.sh
+++ b/test/common/autotest_common.sh
@@ -775,21 +775,15 @@ function waitfornbd() {
 
 function waitforbdev() {
 	local bdev_name=$1
+	local bdev_timeout=$2
 	local i
+	[[ -z $bdev_timeout ]] && bdev_timeout=2000 # ms
 
 	$rpc_py bdev_wait_for_examine
 
-	for ((i = 1; i <= 20; i++)); do
-		if $rpc_py bdev_get_bdevs | jq -r '.[] .name' | grep -qw $bdev_name; then
-			return 0
-		fi
-
-		if $rpc_py bdev_get_bdevs | jq -r '.[] .aliases' | grep -qw $bdev_name; then
-			return 0
-		fi
-
-		sleep 0.1
-	done
+	if $rpc_py bdev_get_bdevs -b $bdev_name -t $bdev_timeout; then
+		return 0
+	fi
 
 	return 1
 }