Commit 66a35235 authored by Michal Berger's avatar Michal Berger Committed by Konrad Sztyber
Browse files

test/common: Don't assume cntlid is 0 in nvme_namespace_revert 



Signed-off-by: default avatarMichal Berger <michal.berger@intel.com>
Change-Id: Ib9e26b1c5112d7cfd59e6621bdfe1c9dc0fce008
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/17047


Reviewed-by: default avatarKamil Godzwon <kamilx.godzwon@intel.com>
Reviewed-by: default avatarTomasz Zawadzki <tomasz.zawadzki@intel.com>
Reviewed-by: default avatarKonrad Sztyber <konrad.sztyber@intel.com>
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
parent 216991ed

test/common/autotest_common.sh

+3 −2
Original line number Diff line number Diff line
@@ -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