test/vhost: Remove vhost_load_config function
It was removed for other/negative.sh test. There is no need to keep it more for one scripts with test as vhost configuration can set by series of rpcs. Change-Id: I86937a5f38641f5ce48c00836e050623c90bdd27 Signed-off-by: Pawel Kaminski <pawelx.kaminski@intel.com> Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/915 Tested-by: SPDK CI Jenkins <sys_sgci@intel.com> Reviewed-by: Michal Berger <michalx.berger@intel.com> Reviewed-by: Karol Latecki <karol.latecki@intel.com> Reviewed-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com> Reviewed-by: Darek Stojaczyk <dariusz.stojaczyk@intel.com>
This commit is contained in:
Pawel Kaminski
Tomasz Zawadzki
parent
7b128ee46b
commit
92e908e6bb
@ -166,16 +166,6 @@ function vhost_run()
|
||||
timing_exit vhost_start
|
||||
}
|
||||
|
||||
function vhost_load_config()
|
||||
{
|
||||
local vhost_num="$1"
|
||||
local vhost_json_conf="$2"
|
||||
local vhost_dir
|
||||
vhost_dir="$(get_vhost_dir $vhost_num)"
|
||||
|
||||
$rootdir/scripts/rpc.py -s $vhost_dir/rpc.sock load_config < "$vhost_json_conf"
|
||||
}
|
||||
|
||||
function vhost_kill()
|
||||
{
|
||||
local rc=0
|
||||
|
||||
@ -1,156 +0,0 @@
|
||||
{
|
||||
"subsystems": [
|
||||
{
|
||||
"subsystem": "accel",
|
||||
"config": null
|
||||
},
|
||||
{
|
||||
"subsystem": "interface",
|
||||
"config": null
|
||||
},
|
||||
{
|
||||
"subsystem": "net_framework",
|
||||
"config": null
|
||||
},
|
||||
{
|
||||
"subsystem": "bdev",
|
||||
"config": [
|
||||
{
|
||||
"params": {
|
||||
"base_bdev": "Nvme0n1",
|
||||
"split_size_mb": 0,
|
||||
"split_count": 4
|
||||
},
|
||||
"method": "bdev_split_create"
|
||||
},
|
||||
{
|
||||
"params": {
|
||||
"block_size": 4096,
|
||||
"num_blocks": 32768
|
||||
},
|
||||
"method": "bdev_malloc_create"
|
||||
},
|
||||
{
|
||||
"params": {
|
||||
"block_size": 4096,
|
||||
"num_blocks": 32768
|
||||
},
|
||||
"method": "bdev_malloc_create"
|
||||
},
|
||||
{
|
||||
"params": {
|
||||
"name": "Malloc2",
|
||||
"num_blocks": 131072,
|
||||
"block_size": 512
|
||||
},
|
||||
"method": "bdev_malloc_create"
|
||||
},
|
||||
{
|
||||
"params": {
|
||||
"name": "Malloc3",
|
||||
"num_blocks": 131072,
|
||||
"block_size": 512
|
||||
},
|
||||
"method": "bdev_malloc_create"
|
||||
},
|
||||
{
|
||||
"params": {
|
||||
"name": "Malloc4",
|
||||
"num_blocks": 131072,
|
||||
"block_size": 512
|
||||
},
|
||||
"method": "bdev_malloc_create"
|
||||
},
|
||||
{
|
||||
"params": {
|
||||
"name": "Malloc5",
|
||||
"num_blocks": 131072,
|
||||
"block_size": 512
|
||||
},
|
||||
"method": "bdev_malloc_create"
|
||||
},
|
||||
{
|
||||
"params": {
|
||||
"name": "Malloc6",
|
||||
"num_blocks": 131072,
|
||||
"block_size": 512
|
||||
},
|
||||
"method": "bdev_malloc_create"
|
||||
},
|
||||
{
|
||||
"method": "bdev_raid_create",
|
||||
"params": {
|
||||
"name": "RaidBdev0",
|
||||
"strip_size": 128,
|
||||
"raid_level": "0",
|
||||
"base_bdevs": [
|
||||
"Malloc2",
|
||||
"Malloc3"
|
||||
]
|
||||
}
|
||||
},
|
||||
{
|
||||
"method": "bdev_raid_create",
|
||||
"params": {
|
||||
"name": "RaidBdev1",
|
||||
"strip_size": 128,
|
||||
"raid_level": "0",
|
||||
"base_bdevs": [
|
||||
"Nvme0n1p2",
|
||||
"Malloc4"
|
||||
]
|
||||
}
|
||||
},
|
||||
{
|
||||
"method": "bdev_raid_create",
|
||||
"params": {
|
||||
"name": "RaidBdev2",
|
||||
"strip_size": 128,
|
||||
"raid_level": "0",
|
||||
"base_bdevs": [
|
||||
"Malloc5",
|
||||
"Malloc6"
|
||||
]
|
||||
}
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"subsystem": "nbd",
|
||||
"config": []
|
||||
},
|
||||
{
|
||||
"subsystem": "scsi",
|
||||
"config": null
|
||||
},
|
||||
{
|
||||
"subsystem": "vhost",
|
||||
"config": [
|
||||
{
|
||||
"params": {
|
||||
"cpumask": "0x1",
|
||||
"ctrlr": "vhost.0"
|
||||
},
|
||||
"method": "vhost_create_scsi_controller"
|
||||
},
|
||||
{
|
||||
"params": {
|
||||
"scsi_target_num": 0,
|
||||
"bdev_name": "Malloc0",
|
||||
"ctrlr": "vhost.0"
|
||||
},
|
||||
"method": "vhost_scsi_controller_add_target"
|
||||
},
|
||||
{
|
||||
"params": {
|
||||
"dev_name": "Malloc1",
|
||||
"readonly": true,
|
||||
"ctrlr": "vhost.1",
|
||||
"cpumask": "0x1"
|
||||
},
|
||||
"method": "vhost_create_blk_controller"
|
||||
}
|
||||
]
|
||||
}
|
||||
]
|
||||
}
|
||||
@ -85,7 +85,21 @@ if [[ $test_type =~ "spdk_vhost" ]]; then
|
||||
notice "running SPDK"
|
||||
notice ""
|
||||
vhost_run 0
|
||||
vhost_load_config 0 $testdir/conf.json
|
||||
rpc_py="$rootdir/scripts/rpc.py -s $(get_vhost_dir 0)/rpc.sock"
|
||||
$rpc_py bdev_split_create Nvme0n1 4
|
||||
$rpc_py bdev_malloc_create -b Malloc0 128 4096
|
||||
$rpc_py bdev_malloc_create -b Malloc1 128 4096
|
||||
$rpc_py bdev_malloc_create -b Malloc2 64 512
|
||||
$rpc_py bdev_malloc_create -b Malloc3 64 512
|
||||
$rpc_py bdev_malloc_create -b Malloc4 64 512
|
||||
$rpc_py bdev_malloc_create -b Malloc5 64 512
|
||||
$rpc_py bdev_malloc_create -b Malloc6 64 512
|
||||
$rpc_py bdev_raid_create -n RaidBdev0 -z 128 -r 0 -b "Malloc2 Malloc3"
|
||||
$rpc_py bdev_raid_create -n RaidBdev1 -z 128 -r 0 -b "Nvme0n1p2 Malloc4"
|
||||
$rpc_py bdev_raid_create -n RaidBdev2 -z 128 -r 0 -b "Malloc5 Malloc6"
|
||||
$rpc_py vhost_create_scsi_controller --cpumask 0x1 vhost.0
|
||||
$rpc_py vhost_scsi_controller_add_target vhost.0 0 Malloc0
|
||||
$rpc_py vhost_create_blk_controller --cpumask 0x1 -r vhost.1 Malloc1
|
||||
notice ""
|
||||
fi
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user