From 66a352354b383bae75812c6e8a759fca3a7d099b Mon Sep 17 00:00:00 2001
From: Michal Berger <michal.berger@intel.com>
Date: Fri, 3 Mar 2023 12:57:24 +0100
Subject: [PATCH] test/common: Don't assume cntlid is 0 in
 nvme_namespace_revert

Signed-off-by: Michal Berger <michal.berger@intel.com>
Change-Id: Ib9e26b1c5112d7cfd59e6621bdfe1c9dc0fce008
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/17047
Reviewed-by: Kamil Godzwon <kamilx.godzwon@intel.com>
Reviewed-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com>
Reviewed-by: Konrad Sztyber <konrad.sztyber@intel.com>
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
---
 test/common/autotest_common.sh | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/test/common/autotest_common.sh b/test/common/autotest_common.sh
index 1eb4d8741..f82408c7d 100755
--- a/test/common/autotest_common.sh
+++ b/test/common/autotest_common.sh
@@ -1477,14 +1477,15 @@ function nvme_namespace_revert() {
 				continue
 			fi
 			tnvmcap=$(nvme id-ctrl ${nvme_ctrlr} | grep tnvmcap | cut -d: -f2)
+			cntlid=$(nvme id-ctrl ${nvme_ctrlr} | grep cntlid | cut -d: -f2)
 			blksize=512
 
 			size=$((tnvmcap / blksize))
 
-			nvme detach-ns ${nvme_ctrlr} -n 0xffffffff -c 0 || true
+			nvme detach-ns ${nvme_ctrlr} -n 0xffffffff -c $cntlid || true
 			nvme delete-ns ${nvme_ctrlr} -n 0xffffffff || true
 			nvme create-ns ${nvme_ctrlr} -s ${size} -c ${size} -b ${blksize}
-			nvme attach-ns ${nvme_ctrlr} -n 1 -c 0
+			nvme attach-ns ${nvme_ctrlr} -n 1 -c $cntlid
 			nvme reset ${nvme_ctrlr}
 			waitforfile "${nvme_ctrlr}n1"
 		fi