update source to Ceph Pacific 16.2.2

[ceph.git] / ceph / src / spdk / test / vhost / readonly / readonly.sh

diff --git a/ceph/src/spdk/test/vhost/readonly/readonly.sh b/ceph/src/spdk/test/vhost/readonly/readonly.sh
index 4d5459147fbad76439f806a8a0731fed22b0aed8..ad66f72e02ba7ef4a87b8a70d1ff617c712c0ca7 100755 (executable)
--- a/ceph/src/spdk/test/vhost/readonly/readonly.sh
+++ b/ceph/src/spdk/test/vhost/readonly/readonly.sh
@@ -1,21 +1,21 @@
 #!/usr/bin/env bash
 
-set -e
-
 testdir=$(readlink -f $(dirname $0))
 rootdir=$(readlink -f $testdir/../../..)
 source $rootdir/test/common/autotest_common.sh
 source $rootdir/test/vhost/common.sh
 
-rpc_py="$testdir/../../../scripts/rpc.py -s $(get_vhost_dir)/rpc.sock"
+rpc_py="$testdir/../../../scripts/rpc.py -s $(get_vhost_dir 0)/rpc.sock"
 
 vm_img=""
 disk="Nvme0n1"
 x=""
 
-function usage()
-{
-       [[ ! -z $2 ]] && ( echo "$2"; echo ""; )
+function usage() {
+       [[ -n $2 ]] && (
+               echo "$2"
+               echo ""
+       )
        echo "Shortcut script for automated readonly test for vhost-block"
        echo "For test details check test_plan.md"
        echo
@@ -31,18 +31,20 @@ function usage()
 
 while getopts 'xh-:' optchar; do
        case "$optchar" in
-       -)
-               case "$OPTARG" in
-                       help) usage $0 && exit 0;;
-                       vm_image=*) vm_img="${OPTARG#*=}" ;;
-                       disk=*) disk="${OPTARG#*=}" ;;
-                       *) usage $0 "Invalid argument '$OPTARG'" && exit 1
-               esac
-               ;;
-       h)      usage $0 && exit 0 ;;
-       x)      set -x
-               x="-x" ;;
-       *)      usage $0 "Invalid argument '$OPTARG'" && exit 1
+               -)
+                       case "$OPTARG" in
+                               help) usage $0 && exit 0 ;;
+                               vm_image=*) vm_img="${OPTARG#*=}" ;;
+                               disk=*) disk="${OPTARG#*=}" ;;
+                               *) usage $0 "Invalid argument '$OPTARG'" && exit 1 ;;
+                       esac
+                       ;;
+               h) usage $0 && exit 0 ;;
+               x)
+                       set -x
+                       x="-x"
+                       ;;
+               *) usage $0 "Invalid argument '$OPTARG'" && exit 1 ;;
        esac
 done
 
@@ -54,84 +56,81 @@ if [[ $EUID -ne 0 ]]; then
        fail "Go away user come back as root"
 fi
 
-function print_tc_name()
-{
+function print_tc_name() {
        notice ""
        notice "==============================================================="
        notice "Now running: $1"
        notice "==============================================================="
 }
 
-function blk_ro_tc1()
-{
+function blk_ro_tc1() {
        print_tc_name ${FUNCNAME[0]}
        local vm_no="0"
        local disk_name=$disk
        local vhost_blk_name=""
-       local vm_dir="$TEST_DIR/vms/$vm_no"
+       local vm_dir="$VHOST_DIR/vms/$vm_no"
 
        if [[ $disk =~ .*malloc.* ]]; then
-               disk_name=$($rpc_py construct_malloc_bdev 512 4096)
-               if [ $? != 0 ]; then
+               if ! disk_name=$($rpc_py bdev_malloc_create 512 4096); then
                        fail "Failed to create malloc bdev"
                fi
 
                disk=$disk_name
        else
                disk_name=${disk%%_*}
-               if ! $rpc_py get_bdevs | jq -r '.[] .name' | grep -qi $disk_name$; then
+               if ! $rpc_py bdev_get_bdevs | jq -r '.[] .name' | grep -qi $disk_name$; then
                        fail "$disk_name bdev not found!"
                fi
        fi
 
-#Create controller and create file on disk for later test
+       #Create controller and create file on disk for later test
        notice "Creating vhost_blk controller"
        vhost_blk_name="naa.$disk_name.$vm_no"
-       $rpc_py construct_vhost_blk_controller $vhost_blk_name $disk_name
+       $rpc_py vhost_create_blk_controller $vhost_blk_name $disk_name
        vm_setup --disk-type=spdk_vhost_blk --force=$vm_no --os=$vm_img --disks=$disk --read-only=true
 
        vm_run $vm_no
        vm_wait_for_boot 300 $vm_no
        notice "Preparing partition and file on guest VM"
-       vm_ssh $vm_no "bash -s" < $testdir/disabled_readonly_vm.sh
+       vm_exec $vm_no "bash -s" < $testdir/disabled_readonly_vm.sh
        sleep 1
 
        vm_shutdown_all
-#Create readonly controller and test readonly feature
+       #Create readonly controller and test readonly feature
        notice "Removing controller and creating new one with readonly flag"
-       $rpc_py remove_vhost_controller $vhost_blk_name
-       $rpc_py construct_vhost_blk_controller -r $vhost_blk_name $disk_name
+       $rpc_py vhost_delete_controller $vhost_blk_name
+       $rpc_py vhost_create_blk_controller -r $vhost_blk_name $disk_name
 
        vm_run $vm_no
        vm_wait_for_boot 300 $vm_no
        notice "Testing readonly feature on guest VM"
-       vm_ssh $vm_no "bash -s" < $testdir/enabled_readonly_vm.sh
+       vm_exec $vm_no "bash -s" < $testdir/enabled_readonly_vm.sh
        sleep 3
 
        vm_shutdown_all
-#Delete file from disk and delete partition
+       #Delete file from disk and delete partition
        echo "INFO: Removing controller and creating new one"
-       $rpc_py remove_vhost_controller $vhost_blk_name
-       $rpc_py construct_vhost_blk_controller $vhost_blk_name $disk_name
+       $rpc_py vhost_delete_controller $vhost_blk_name
+       $rpc_py vhost_create_blk_controller $vhost_blk_name $disk_name
 
        vm_run $vm_no
        vm_wait_for_boot 300 $vm_no
        notice "Removing partition and file from test disk on guest VM"
-       vm_ssh $vm_no "bash -s" < $testdir/delete_partition_vm.sh
+       vm_exec $vm_no "bash -s" < $testdir/delete_partition_vm.sh
        sleep 1
 
        vm_shutdown_all
 }
 
-vhost_run
+vhost_run 0
 if [[ -z $x ]]; then
        set +x
 fi
 
 blk_ro_tc1
 
-$rpc_py delete_nvme_controller Nvme0
+$rpc_py bdev_nvme_detach_controller Nvme0
 
-vhost_kill
+vhost_kill 0
 
 vhosttestfini