Commit 5354fc45 authored by Karol Latecki's avatar Karol Latecki Committed by Tomasz Zawadzki
Browse files

test/vhost: remove hardcoded JSON config for shared test 



Using JSON config with hardcoded path makes this test
susceptible to fail if some directory changes are made
during test. Remove the file and generate fresh config
on each test run.

Change-Id: Id8be920daad71207c06a867a8b6cb4403f1962a8
Signed-off-by: default avatarKarol Latecki <karol.latecki@intel.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/8826


Community-CI: Broadcom CI <spdk-ci.pdl@broadcom.com>
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarMaciej Wawryk <maciejx.wawryk@intel.com>
Reviewed-by: default avatarChangpeng Liu <changpeng.liu@intel.com>
Reviewed-by: default avatarTomasz Zawadzki <tomasz.zawadzki@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarKonrad Sztyber <konrad.sztyber@intel.com>
Reviewed-by: default avatarMichal Berger <michalx.berger@intel.com>
parent 4ce17359

test/vhost/shared/bdev.json

deleted100644 → 0
+0 −23
Original line number Diff line number Diff line 
{

  "subsystems": [

    {

      "subsystem": "bdev",

      "config": [

        {

          "method": "bdev_virtio_attach_controller",

          "params": {

            "vq_count": 2,

            "traddr": "Malloc.0",

            "dev_type": "blk",

            "vq_size": 512,

            "name": "VirtioBlk0",

            "trtype": "user"

          }

        },

        {

          "method": "bdev_wait_for_examine"

        }

      ]

    }

  ]

}

test/vhost/shared/shared.sh

+31 −2
Original line number Diff line number Diff line
@@ -6,18 +6,47 @@ source $rootdir/test/common/autotest_common.sh 
source $rootdir/test/vhost/common.sh



rpc_py="$rootdir/scripts/rpc.py -s $(get_vhost_dir 0)/rpc.sock"

vhost_name="0"



bdev_conf=$(

	cat <<- JSON

		{

		"subsystems": [

			{

			"subsystem": "bdev",

			"config": [

				{

				"method": "bdev_virtio_attach_controller",

				"params": {

					"vq_count": 2,

					"traddr": "$(get_vhost_dir $vhost_name)/Malloc.0",

					"dev_type": "blk",

					"vq_size": 512,

					"name": "VirtioBlk0",

					"trtype": "user"

				}

				},

				{

				"method": "bdev_wait_for_examine"

				}

			]

			}

		]

		}

	JSON

)



function run_spdk_fio() {

	fio_bdev --ioengine=spdk_bdev \

		"$rootdir/test/vhost/common/fio_jobs/default_initiator.job" --runtime=10 --rw=randrw \

		--spdk_mem=1024 --spdk_single_seg=1 --spdk_json_conf=$testdir/bdev.json "$@"

		--spdk_mem=1024 --spdk_single_seg=1 --spdk_json_conf=<(echo "$bdev_conf") "$@"

}



vhosttestinit "--no_vm"



trap 'error_exit "${FUNCNAME}" "${LINENO}"' ERR SIGTERM SIGABRT



vhost_run -n 0

vhost_run -n "$vhost_name"



$rpc_py bdev_malloc_create -b Malloc 124 4096

$rpc_py vhost_create_blk_controller Malloc.0 Malloc