Commit 11b8af05 authored by Pawel Wodkowski's avatar Pawel Wodkowski Committed by Jim Harris
Browse files

test/vhost: remove vhost-blk disk size leftover 



After 1c164f11 ("vhost-blk: enable vhost block with new added
get/set config messages") vhost-blk "_size_X" workaround is not needed
nor used.

Change-Id: I6d8cb761aba65f6eb080d6d285ebf65de12dc212
Signed-off-by: default avatarPawel Wodkowski <pawelx.wodkowski@intel.com>
Reviewed-on: https://review.gerrithub.io/399670


Tested-by: default avatarSPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: default avatarDariusz Stojaczyk <dariuszx.stojaczyk@intel.com>
Reviewed-by: default avatarDaniel Verkamp <daniel.verkamp@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
parent 9f0a73d9

test/vhost/common/common.sh

+0 −6
Original line number Diff line number Diff line
@@ -632,12 +632,6 @@ function vm_setup() 
				cmd+="-device vhost-user-scsi-pci,id=scsi_$disk,num_queues=$queue_number,chardev=char_$disk ${eol}"

				;;

			spdk_vhost_blk)

				[[ $disk =~ _size_([0-9]+[MG]?) ]] || true

				size=${BASH_REMATCH[1]}

				if [ -z "$size" ]; then

					size="20G"

				fi

				disk=${disk%%_*}

				notice "using socket $SPDK_VHOST_SCSI_TEST_DIR/naa.$disk.$vm_num"

				cmd+="-chardev socket,id=char_$disk,path=$SPDK_VHOST_SCSI_TEST_DIR/naa.$disk.$vm_num ${eol}"

				cmd+="-device vhost-user-blk-pci,num-queues=$queue_number,chardev=char_$disk ${eol}"

test/vhost/lvol/lvol_test.sh

+1 −3
Original line number Diff line number Diff line
@@ -206,10 +206,8 @@ for (( i=0; i<$vm_count; i++)); do 
    elif [[ "$ctrl_type" == "spdk_vhost_blk" ]]; then

        disk=""

        for (( j=0; j<${#bdevs[@]}; j++)); do

            blk_dev_size=$(get_bdev_size "${bdevs[$j]}")



            $rpc_py construct_vhost_blk_controller naa.$j.$i ${bdevs[$j]} $mask_arg

            disk+="${j}_size_${blk_dev_size}M:"

            disk+="${j}:"

        done

        disk="${disk::-1}"

        setup_cmd+=" --disks=$disk"

test/vhost/readonly/readonly.sh

+4 −5
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ BASE_DIR=$(readlink -f $(dirname $0)) 
rpc_py="$BASE_DIR/../../../scripts/rpc.py "



vm_img=""

disk="Nvme0n1_size_1G"

disk="Nvme0n1"

x=""



function usage()
@@ -21,10 +21,9 @@ function usage() 
	echo

	echo "-h, --help                Print help and exit"

	echo "    --vm_image=           Path to VM image"

	echo "    --disk=               Disk name and size. Disk can have additional size parameter,"

	echo "                          e.g. --disk=Nvme0n1_size_35G; unit can be M or G; default - 20G."

	echo "    --disk=               Disk name."

	echo "                          If disk=malloc, then creates malloc disk. For malloc disks, size is always 512M,"

	echo "                          e.g. --disk=malloc. (Default: Nvme0n1_size_1G)"

	echo "                          e.g. --disk=malloc. (Default: Nvme0n1)"

	echo "-x                        set -x for script debug"

}
@@ -74,7 +73,7 @@ function blk_ro_tc1() 
			fail "Failed to create malloc bdev"

		fi



		disk=$disk_name"_size_512M"

		disk=$disk_name

	else

		disk_name=${disk%%_*}

		if ! $rpc_py get_bdevs | jq -r '.[] .name' | grep -qi $disk_name$; then

test/vhost/spdk_vhost.sh

+1 −1
Original line number Diff line number Diff line
@@ -162,7 +162,7 @@ case $1 in 
		;;

	-ro|--readonly)

		echo 'Running readonly tests suite...'

		$WORKDIR/readonly/readonly.sh --vm_image=$VM_IMAGE --disk=Nvme0n1_size_1G

		$WORKDIR/readonly/readonly.sh --vm_image=$VM_IMAGE --disk=Nvme0n1

		;;

	*)

		echo "unknown test type: $1"