diff --git a/doc/jsonrpc.md b/doc/jsonrpc.md index 2036ccbbd..7eb368a8b 100644 --- a/doc/jsonrpc.md +++ b/doc/jsonrpc.md @@ -4418,7 +4418,7 @@ Example response: } ~~~ -## add_vhost_scsi_lun {#rpc_add_vhost_scsi_lun} +## vhost_scsi_controller_add_target {#rpc_vhost_scsi_controller_add_target} In vhost target `ctrlr` create SCSI target with ID `scsi_target_num` and add `bdev_name` as LUN 0. @@ -4446,7 +4446,7 @@ Example request: "ctrlr": "VhostScsi0" }, "jsonrpc": "2.0", - "method": "add_vhost_scsi_lun", + "method": "vhost_scsi_controller_add_target", "id": 1 } ~~~ diff --git a/doc/vhost.md b/doc/vhost.md index 8f17a3ede..e14bd2dc2 100644 --- a/doc/vhost.md +++ b/doc/vhost.md @@ -143,7 +143,7 @@ target ID 0. SPDK Vhost-SCSI device currently supports only one LUN per SCSI tar Additional LUNs can be added by specifying a different target ID. ~~~{.sh} -scripts/rpc.py add_vhost_scsi_lun vhost.0 0 Malloc0 +scripts/rpc.py vhost_scsi_controller_add_target vhost.0 0 Malloc0 ~~~ To remove a bdev from a vhost-scsi controller use the following RPC: @@ -279,13 +279,13 @@ vhost.c: 596:spdk_vhost_dev_construct: *NOTICE*: Controller vhost.0: new control ~~~ ~~~{.sh} -host:~# ./scripts/rpc.py add_vhost_scsi_lun vhost.0 0 Nvme0n1 +host:~# ./scripts/rpc.py vhost_scsi_controller_add_target vhost.0 0 Nvme0n1 vhost_scsi.c: 840:spdk_vhost_scsi_dev_add_tgt: *NOTICE*: Controller vhost.0: defined target 'Target 0' using lun 'Nvme0' ~~~ ~~~{.sh} -host:~# ./scripts/rpc.py add_vhost_scsi_lun vhost.0 1 Malloc0 +host:~# ./scripts/rpc.py vhost_scsi_controller_add_target vhost.0 1 Malloc0 vhost_scsi.c: 840:spdk_vhost_scsi_dev_add_tgt: *NOTICE*: Controller vhost.0: defined target 'Target 1' using lun 'Malloc0' ~~~ @@ -378,7 +378,7 @@ Hot-attach is is done by simply attaching a bdev to a vhost controller with a QE already started. No other extra action is necessary. ~~~{.sh} -scripts/rpc.py add_vhost_scsi_lun vhost.0 0 Malloc0 +scripts/rpc.py vhost_scsi_controller_add_target vhost.0 0 Malloc0 ~~~ ### Hot-detach diff --git a/lib/vhost/vhost_rpc.c b/lib/vhost/vhost_rpc.c index 1a85d2fdd..888f642b1 100644 --- a/lib/vhost/vhost_rpc.c +++ b/lib/vhost/vhost_rpc.c @@ -98,36 +98,36 @@ SPDK_RPC_REGISTER("vhost_create_scsi_controller", spdk_rpc_vhost_create_scsi_con SPDK_RPC_RUNTIME) SPDK_RPC_REGISTER_ALIAS_DEPRECATED(vhost_create_scsi_controller, construct_vhost_scsi_controller) -struct rpc_add_vhost_scsi_ctrlr_lun { +struct rpc_vhost_scsi_ctrlr_add_target { char *ctrlr; int32_t scsi_target_num; char *bdev_name; }; static void -free_rpc_add_vhost_scsi_ctrlr_lun(struct rpc_add_vhost_scsi_ctrlr_lun *req) +free_rpc_vhost_scsi_ctrlr_add_target(struct rpc_vhost_scsi_ctrlr_add_target *req) { free(req->ctrlr); free(req->bdev_name); } -static const struct spdk_json_object_decoder rpc_vhost_add_lun[] = { - {"ctrlr", offsetof(struct rpc_add_vhost_scsi_ctrlr_lun, ctrlr), spdk_json_decode_string }, - {"scsi_target_num", offsetof(struct rpc_add_vhost_scsi_ctrlr_lun, scsi_target_num), spdk_json_decode_int32}, - {"bdev_name", offsetof(struct rpc_add_vhost_scsi_ctrlr_lun, bdev_name), spdk_json_decode_string }, +static const struct spdk_json_object_decoder rpc_vhost_scsi_ctrlr_add_target[] = { + {"ctrlr", offsetof(struct rpc_vhost_scsi_ctrlr_add_target, ctrlr), spdk_json_decode_string }, + {"scsi_target_num", offsetof(struct rpc_vhost_scsi_ctrlr_add_target, scsi_target_num), spdk_json_decode_int32}, + {"bdev_name", offsetof(struct rpc_vhost_scsi_ctrlr_add_target, bdev_name), spdk_json_decode_string }, }; static void -spdk_rpc_add_vhost_scsi_lun(struct spdk_jsonrpc_request *request, - const struct spdk_json_val *params) +spdk_rpc_vhost_scsi_controller_add_target(struct spdk_jsonrpc_request *request, + const struct spdk_json_val *params) { - struct rpc_add_vhost_scsi_ctrlr_lun req = {0}; + struct rpc_vhost_scsi_ctrlr_add_target req = {0}; struct spdk_json_write_ctx *w; struct spdk_vhost_dev *vdev; int rc; - if (spdk_json_decode_object(params, rpc_vhost_add_lun, - SPDK_COUNTOF(rpc_vhost_add_lun), + if (spdk_json_decode_object(params, rpc_vhost_scsi_ctrlr_add_target, + SPDK_COUNTOF(rpc_vhost_scsi_ctrlr_add_target), &req)) { SPDK_DEBUGLOG(SPDK_LOG_VHOST_RPC, "spdk_json_decode_object failed\n"); rc = -EINVAL; @@ -148,7 +148,7 @@ spdk_rpc_add_vhost_scsi_lun(struct spdk_jsonrpc_request *request, goto invalid; } - free_rpc_add_vhost_scsi_ctrlr_lun(&req); + free_rpc_vhost_scsi_ctrlr_add_target(&req); w = spdk_jsonrpc_begin_result(request); spdk_json_write_int32(w, rc); @@ -156,11 +156,13 @@ spdk_rpc_add_vhost_scsi_lun(struct spdk_jsonrpc_request *request, return; invalid: - free_rpc_add_vhost_scsi_ctrlr_lun(&req); + free_rpc_vhost_scsi_ctrlr_add_target(&req); spdk_jsonrpc_send_error_response(request, SPDK_JSONRPC_ERROR_INVALID_PARAMS, spdk_strerror(-rc)); } -SPDK_RPC_REGISTER("add_vhost_scsi_lun", spdk_rpc_add_vhost_scsi_lun, SPDK_RPC_RUNTIME) +SPDK_RPC_REGISTER("vhost_scsi_controller_add_target", spdk_rpc_vhost_scsi_controller_add_target, + SPDK_RPC_RUNTIME) +SPDK_RPC_REGISTER_ALIAS_DEPRECATED(vhost_scsi_controller_add_target, add_vhost_scsi_lun) struct rpc_remove_vhost_scsi_ctrlr_target { char *ctrlr; diff --git a/lib/vhost/vhost_scsi.c b/lib/vhost/vhost_scsi.c index 572f4aa19..f23104736 100644 --- a/lib/vhost/vhost_scsi.c +++ b/lib/vhost/vhost_scsi.c @@ -1552,7 +1552,7 @@ vhost_scsi_write_config_json(struct spdk_vhost_dev *vdev, struct spdk_json_write lun = spdk_scsi_dev_get_lun(scsi_dev, 0); spdk_json_write_object_begin(w); - spdk_json_write_named_string(w, "method", "add_vhost_scsi_lun"); + spdk_json_write_named_string(w, "method", "vhost_scsi_controller_add_target"); spdk_json_write_named_object_begin(w, "params"); spdk_json_write_named_string(w, "ctrlr", vdev->name); diff --git a/scripts/config_converter.py b/scripts/config_converter.py index 23c5a5bbe..d7f800a52 100755 --- a/scripts/config_converter.py +++ b/scripts/config_converter.py @@ -419,7 +419,7 @@ def get_vhost_scsi_json(config, section): for target in targets: vhost_scsi_json.append({ "params": target, - "method": "add_vhost_scsi_lun" + "method": "vhost_scsi_controller_add_target" }) return vhost_scsi_json diff --git a/scripts/rpc.py b/scripts/rpc.py index dcbf057a9..1b3ae9e8c 100755 --- a/scripts/rpc.py +++ b/scripts/rpc.py @@ -1874,18 +1874,19 @@ Format: 'user:u1 secret:s1 muser:mu1 msecret:ms1,user:u2 secret:s2 muser:mu2 mse p.add_argument('--cpumask', help='cpu mask for this controller') p.set_defaults(func=vhost_create_scsi_controller) - def add_vhost_scsi_lun(args): - print_json(rpc.vhost.add_vhost_scsi_lun(args.client, - ctrlr=args.ctrlr, - scsi_target_num=args.scsi_target_num, - bdev_name=args.bdev_name)) + def vhost_scsi_controller_add_target(args): + print_json(rpc.vhost.vhost_scsi_controller_add_target(args.client, + ctrlr=args.ctrlr, + scsi_target_num=args.scsi_target_num, + bdev_name=args.bdev_name)) - p = subparsers.add_parser('add_vhost_scsi_lun', + p = subparsers.add_parser('vhost_scsi_controller_add_target', + aliases=['add_vhost_scsi_lun'], help='Add lun to vhost controller') p.add_argument('ctrlr', help='conntroller name where add lun') p.add_argument('scsi_target_num', help='scsi_target_num', type=int) p.add_argument('bdev_name', help='bdev name') - p.set_defaults(func=add_vhost_scsi_lun) + p.set_defaults(func=vhost_scsi_controller_add_target) def remove_vhost_scsi_target(args): rpc.vhost.remove_vhost_scsi_target(args.client, diff --git a/scripts/rpc/vhost.py b/scripts/rpc/vhost.py index bdf8394ba..906e32e2f 100644 --- a/scripts/rpc/vhost.py +++ b/scripts/rpc/vhost.py @@ -32,7 +32,8 @@ def vhost_create_scsi_controller(client, ctrlr, cpumask=None): return client.call('vhost_create_scsi_controller', params) -def add_vhost_scsi_lun(client, ctrlr, scsi_target_num, bdev_name): +@deprecated_alias('add_vhost_scsi_lun') +def vhost_scsi_controller_add_target(client, ctrlr, scsi_target_num, bdev_name): """Add LUN to vhost scsi controller target. Args: ctrlr: controller name @@ -44,7 +45,7 @@ def add_vhost_scsi_lun(client, ctrlr, scsi_target_num, bdev_name): 'scsi_target_num': scsi_target_num, 'bdev_name': bdev_name, } - return client.call('add_vhost_scsi_lun', params) + return client.call('vhost_scsi_controller_add_target', params) def remove_vhost_scsi_target(client, ctrlr, scsi_target_num): diff --git a/scripts/spdkcli/ui_node.py b/scripts/spdkcli/ui_node.py index deb2b3acf..0b770d773 100644 --- a/scripts/spdkcli/ui_node.py +++ b/scripts/spdkcli/ui_node.py @@ -770,9 +770,9 @@ class UIVhostScsiCtrlObj(UIVhostCtrl): target_num - Integer identifier of target node to modify. bdev - Which bdev to add as LUN. """ - self.get_root().add_vhost_scsi_lun(ctrlr=self.ctrlr.ctrlr, - scsi_target_num=int(target_num), - bdev_name=bdev_name) + self.get_root().vhost_scsi_controller_add_target(ctrlr=self.ctrlr.ctrlr, + scsi_target_num=int(target_num), + bdev_name=bdev_name) for ctrlr in self.get_root().get_vhost_controllers(ctrlr_type="scsi"): if ctrlr.ctrlr == self.ctrlr.ctrlr: self.ctrlr = ctrlr diff --git a/scripts/spdkcli/ui_root.py b/scripts/spdkcli/ui_root.py index 41f6f321b..ac6a4f24b 100644 --- a/scripts/spdkcli/ui_root.py +++ b/scripts/spdkcli/ui_root.py @@ -294,8 +294,8 @@ class UIRoot(UINode): rpc.vhost.remove_vhost_scsi_target(self.client, **kwargs) @verbose - def add_vhost_scsi_lun(self, **kwargs): - rpc.vhost.add_vhost_scsi_lun(self.client, **kwargs) + def vhost_scsi_controller_add_target(self, **kwargs): + rpc.vhost.vhost_scsi_controller_add_target(self.client, **kwargs) def vhost_controller_set_coalescing(self, **kwargs): rpc.vhost.vhost_controller_set_coalescing(self.client, **kwargs) diff --git a/test/config_converter/spdk_config.json b/test/config_converter/spdk_config.json index 0ae1d5db9..d3066cd93 100644 --- a/test/config_converter/spdk_config.json +++ b/test/config_converter/spdk_config.json @@ -326,7 +326,7 @@ "bdev_name": "Malloc4", "ctrlr": "naa.vhost.0" }, - "method": "add_vhost_scsi_lun" + "method": "vhost_scsi_controller_add_target" }, { "params": { @@ -334,7 +334,7 @@ "bdev_name": "AIO3", "ctrlr": "naa.vhost.0" }, - "method": "add_vhost_scsi_lun" + "method": "vhost_scsi_controller_add_target" }, { "params": { @@ -342,7 +342,7 @@ "bdev_name": "Nvme0n1p2", "ctrlr": "naa.vhost.0" }, - "method": "add_vhost_scsi_lun" + "method": "vhost_scsi_controller_add_target" }, { "params": { @@ -357,7 +357,7 @@ "bdev_name": "AIO4", "ctrlr": "naa.vhost.1" }, - "method": "add_vhost_scsi_lun" + "method": "vhost_scsi_controller_add_target" }, { "params": { diff --git a/test/fuzz/autofuzz_vhost.sh b/test/fuzz/autofuzz_vhost.sh index 728feb308..b36047c2c 100755 --- a/test/fuzz/autofuzz_vhost.sh +++ b/test/fuzz/autofuzz_vhost.sh @@ -52,11 +52,11 @@ fi if [ "$TEST_TRANSPORT" == "scsi" ] || [ "$TEST_TRANSPORT" == "all" ]; then $vhost_rpc_py bdev_malloc_create -b Malloc1 64 512 $vhost_rpc_py vhost_create_scsi_controller naa.VhostScsi0.1 - $vhost_rpc_py add_vhost_scsi_lun naa.VhostScsi0.1 0 Malloc1 + $vhost_rpc_py vhost_scsi_controller_add_target naa.VhostScsi0.1 0 Malloc1 $vhost_rpc_py bdev_malloc_create -b Malloc2 64 512 $vhost_rpc_py vhost_create_scsi_controller naa.VhostScsi0.2 - $vhost_rpc_py add_vhost_scsi_lun naa.VhostScsi0.2 0 Malloc2 + $vhost_rpc_py vhost_scsi_controller_add_target naa.VhostScsi0.2 0 Malloc2 # test the vhost scsi I/O queue with valid data buffers on a valid lun. $fuzz_specific_rpc_py fuzz_vhost_create_dev -s $(pwd)/naa.VhostScsi0.1 -l -v diff --git a/test/json_config/clear_config.py b/test/json_config/clear_config.py index 190fe3b84..35509821d 100755 --- a/test/json_config/clear_config.py +++ b/test/json_config/clear_config.py @@ -144,7 +144,7 @@ def clear_vhost_subsystem(args, vhost_config): for vhost in reversed(vhost_config): if 'method' in vhost: method = vhost['method'] - if method in ['add_vhost_scsi_lun']: + if method in ['vhost_scsi_controller_add_target']: args.client.call("remove_vhost_scsi_target", {"ctrlr": vhost['params']['ctrlr'], "scsi_target_num": vhost['params']['scsi_target_num']}) diff --git a/test/json_config/json_config.sh b/test/json_config/json_config.sh index 66349bac8..c58b6697a 100755 --- a/test/json_config/json_config.sh +++ b/test/json_config/json_config.sh @@ -282,8 +282,8 @@ function create_vhost_subsystem_config() { tgt_rpc bdev_split_create MallocForVhost0 8 tgt_rpc vhost_create_scsi_controller VhostScsiCtrlr0 - tgt_rpc add_vhost_scsi_lun VhostScsiCtrlr0 0 MallocForVhost0p3 - tgt_rpc add_vhost_scsi_lun VhostScsiCtrlr0 -1 MallocForVhost0p4 + tgt_rpc vhost_scsi_controller_add_target VhostScsiCtrlr0 0 MallocForVhost0p3 + tgt_rpc vhost_scsi_controller_add_target VhostScsiCtrlr0 -1 MallocForVhost0p4 tgt_rpc vhost_controller_set_coalescing VhostScsiCtrlr0 1 100 tgt_rpc construct_vhost_blk_controller VhostBlkCtrlr0 MallocForVhost0p5 diff --git a/test/nvmf/target/nvmf_vhost.sh b/test/nvmf/target/nvmf_vhost.sh index f09229baa..32d51ab87 100755 --- a/test/nvmf/target/nvmf_vhost.sh +++ b/test/nvmf/target/nvmf_vhost.sh @@ -50,7 +50,7 @@ $NVMF_RPC nvmf_subsystem_add_listener nqn.2016-06.io.spdk:cnode1 -t $TEST_TRANSP # Configure VHost on host machine $VHOST_RPC bdev_nvme_attach_controller -b Nvme0 -t $TEST_TRANSPORT -f ipv4 -a $NVMF_FIRST_TARGET_IP -s $NVMF_PORT -n nqn.2016-06.io.spdk:cnode1 $VHOST_RPC vhost_create_scsi_controller naa.VhostScsi0.3 -$VHOST_RPC add_vhost_scsi_lun naa.VhostScsi0.3 0 "Nvme0n1" +$VHOST_RPC vhost_scsi_controller_add_target naa.VhostScsi0.3 0 "Nvme0n1" # start qemu based VM. vm_setup --os="$VM_IMAGE" --disk-type=spdk_vhost_scsi --disks="VhostScsi0" --force=3 --vhost-name=3 diff --git a/test/vhost/fio/fio.sh b/test/vhost/fio/fio.sh index 004ad50a4..3d8ae49bd 100755 --- a/test/vhost/fio/fio.sh +++ b/test/vhost/fio/fio.sh @@ -22,7 +22,7 @@ vhost_run vhost0 "-m 0x1" # Create vhost scsi controller vhost_rpc vhost0 construct_malloc_bdev $MALLOC_BDEV_SIZE $MALLOC_BLOCK_SIZE -b Malloc0 vhost_rpc vhost0 vhost_create_scsi_controller naa.VhostScsi0.0 -vhost_rpc vhost0 add_vhost_scsi_lun naa.VhostScsi0.0 0 "Malloc0" +vhost_rpc vhost0 vhost_scsi_controller_add_target naa.VhostScsi0.0 0 "Malloc0" # Construct vhost blk controller vhost_rpc vhost0 construct_malloc_bdev $MALLOC_BDEV_SIZE $MALLOC_BLOCK_SIZE -b Malloc1 diff --git a/test/vhost/fiotest/conf.json b/test/vhost/fiotest/conf.json index 0adcd2b40..63dc41663 100644 --- a/test/vhost/fiotest/conf.json +++ b/test/vhost/fiotest/conf.json @@ -139,7 +139,7 @@ "bdev_name": "Malloc0", "ctrlr": "vhost.0" }, - "method": "add_vhost_scsi_lun" + "method": "vhost_scsi_controller_add_target" }, { "params": { diff --git a/test/vhost/fiotest/fio.sh b/test/vhost/fiotest/fio.sh index 87b993968..0fd907a68 100755 --- a/test/vhost/fiotest/fio.sh +++ b/test/vhost/fiotest/fio.sh @@ -132,7 +132,7 @@ for vm_conf in ${vms[@]}; do $rpc_py vhost_create_scsi_controller naa.$disk.${conf[0]} notice "Adding device (0) to naa.$disk.${conf[0]}" - $rpc_py add_vhost_scsi_lun naa.$disk.${conf[0]} 0 $based_disk + $rpc_py vhost_scsi_controller_add_target naa.$disk.${conf[0]} 0 $based_disk fi done done <<< "${conf[2]}" @@ -168,7 +168,7 @@ if [[ $test_type == "spdk_vhost_scsi" ]]; then sleep 0.1 notice "Hotattach test. Re-adding device 0 to naa.$disk.${conf[0]}" - $rpc_py add_vhost_scsi_lun naa.$disk.${conf[0]} 0 $based_disk + $rpc_py vhost_scsi_controller_add_target naa.$disk.${conf[0]} 0 $based_disk done done <<< "${conf[2]}" unset IFS; diff --git a/test/vhost/fuzz/fuzz.sh b/test/vhost/fuzz/fuzz.sh index 20c177219..cb1df0997 100755 --- a/test/vhost/fuzz/fuzz.sh +++ b/test/vhost/fuzz/fuzz.sh @@ -32,11 +32,11 @@ $vhost_rpc_py construct_vhost_blk_controller Vhost.1 Malloc0 $vhost_rpc_py bdev_malloc_create -b Malloc1 64 512 $vhost_rpc_py vhost_create_scsi_controller naa.VhostScsi0.1 -$vhost_rpc_py add_vhost_scsi_lun naa.VhostScsi0.1 0 Malloc1 +$vhost_rpc_py vhost_scsi_controller_add_target naa.VhostScsi0.1 0 Malloc1 $vhost_rpc_py bdev_malloc_create -b Malloc2 64 512 $vhost_rpc_py vhost_create_scsi_controller naa.VhostScsi0.2 -$vhost_rpc_py add_vhost_scsi_lun naa.VhostScsi0.2 0 Malloc2 +$vhost_rpc_py vhost_scsi_controller_add_target naa.VhostScsi0.2 0 Malloc2 # test the vhost blk controller with valid data buffers. $fuzz_specific_rpc_py fuzz_vhost_create_dev -s $(pwd)/Vhost.1 -b -v diff --git a/test/vhost/hotplug/scsi_hotattach.sh b/test/vhost/hotplug/scsi_hotattach.sh index 30ee89eb3..24addea29 100755 --- a/test/vhost/hotplug/scsi_hotattach.sh +++ b/test/vhost/hotplug/scsi_hotattach.sh @@ -28,7 +28,7 @@ function prepare_fio_cmd_tc1() { function hotattach_tc1() { notice "Hotattach test case 1" - $rpc_py add_vhost_scsi_lun naa.Nvme0n1p0.0 0 Nvme0n1p0 + $rpc_py vhost_scsi_controller_add_target naa.Nvme0n1p0.0 0 Nvme0n1p0 sleep 3 prepare_fio_cmd_tc1 "0" @@ -45,7 +45,7 @@ function hotattach_tc2() { $run_fio & last_pid=$! sleep 3 - $rpc_py add_vhost_scsi_lun naa.Nvme0n1p0.0 1 Nvme0n1p1 + $rpc_py vhost_scsi_controller_add_target naa.Nvme0n1p0.0 1 Nvme0n1p1 wait $last_pid check_fio_retcode "Hotattach test case 2: Iteration 1." 0 $? } @@ -59,7 +59,7 @@ function hotattach_tc3() { $run_fio & last_pid=$! sleep 3 - $rpc_py add_vhost_scsi_lun naa.Nvme0n1p1.0 0 Nvme0n1p2 + $rpc_py vhost_scsi_controller_add_target naa.Nvme0n1p1.0 0 Nvme0n1p2 wait $last_pid check_fio_retcode "Hotattach test case 3: Iteration 1." 0 $? } @@ -75,7 +75,7 @@ function hotattach_tc4() { $run_fio & last_pid=$! sleep 3 - $rpc_py add_vhost_scsi_lun naa.Nvme0n1p2.1 0 Nvme0n1p3 + $rpc_py vhost_scsi_controller_add_target naa.Nvme0n1p2.1 0 Nvme0n1p3 wait $last_pid check_fio_retcode "Hotattach test case 4: Iteration 1." 0 $? diff --git a/test/vhost/hotplug/scsi_hotdetach.sh b/test/vhost/hotplug/scsi_hotdetach.sh index 25ff86cb7..c36f1176a 100755 --- a/test/vhost/hotplug/scsi_hotdetach.sh +++ b/test/vhost/hotplug/scsi_hotdetach.sh @@ -232,7 +232,7 @@ function hotdetach_tc4() { } function clear_after_tests() { - $rpc_py add_vhost_scsi_lun naa.Nvme0n1p4.2 0 Nvme0n1p8 + $rpc_py vhost_scsi_controller_add_target naa.Nvme0n1p4.2 0 Nvme0n1p8 } hotdetach_tc1 diff --git a/test/vhost/hotplug/scsi_hotplug.sh b/test/vhost/hotplug/scsi_hotplug.sh index 9b044d292..3f3775e28 100755 --- a/test/vhost/hotplug/scsi_hotplug.sh +++ b/test/vhost/hotplug/scsi_hotplug.sh @@ -22,14 +22,14 @@ function pre_hot_attach_detach_test_case() { $rpc_py vhost_create_scsi_controller naa.Nvme0n1p5.2 $rpc_py vhost_create_scsi_controller naa.Nvme0n1p6.3 $rpc_py vhost_create_scsi_controller naa.Nvme0n1p7.3 - $rpc_py add_vhost_scsi_lun naa.Nvme0n1p4.2 0 Nvme0n1p8 - $rpc_py add_vhost_scsi_lun naa.Nvme0n1p4.2 1 Nvme0n1p9 - $rpc_py add_vhost_scsi_lun naa.Nvme0n1p5.2 0 Nvme0n1p10 - $rpc_py add_vhost_scsi_lun naa.Nvme0n1p5.2 1 Nvme0n1p11 - $rpc_py add_vhost_scsi_lun naa.Nvme0n1p6.3 0 Nvme0n1p12 - $rpc_py add_vhost_scsi_lun naa.Nvme0n1p6.3 1 Nvme0n1p13 - $rpc_py add_vhost_scsi_lun naa.Nvme0n1p7.3 0 Nvme0n1p14 - $rpc_py add_vhost_scsi_lun naa.Nvme0n1p7.3 1 Nvme0n1p15 + $rpc_py vhost_scsi_controller_add_target naa.Nvme0n1p4.2 0 Nvme0n1p8 + $rpc_py vhost_scsi_controller_add_target naa.Nvme0n1p4.2 1 Nvme0n1p9 + $rpc_py vhost_scsi_controller_add_target naa.Nvme0n1p5.2 0 Nvme0n1p10 + $rpc_py vhost_scsi_controller_add_target naa.Nvme0n1p5.2 1 Nvme0n1p11 + $rpc_py vhost_scsi_controller_add_target naa.Nvme0n1p6.3 0 Nvme0n1p12 + $rpc_py vhost_scsi_controller_add_target naa.Nvme0n1p6.3 1 Nvme0n1p13 + $rpc_py vhost_scsi_controller_add_target naa.Nvme0n1p7.3 0 Nvme0n1p14 + $rpc_py vhost_scsi_controller_add_target naa.Nvme0n1p7.3 1 Nvme0n1p15 vms_setup_and_run "0 1 2 3" vms_prepare "0 1 2 3" } diff --git a/test/vhost/hotplug/scsi_hotremove.sh b/test/vhost/hotplug/scsi_hotremove.sh index 5cd6c9116..a2d2367e1 100644 --- a/test/vhost/hotplug/scsi_hotremove.sh +++ b/test/vhost/hotplug/scsi_hotremove.sh @@ -52,10 +52,10 @@ function scsi_hotremove_tc1() { function scsi_hotremove_tc2() { echo "Scsi hotremove test case 2" # 1. Attach split NVMe bdevs to scsi controller. - $rpc_py add_vhost_scsi_lun naa.Nvme0n1p0.0 0 HotInNvme0n1p0 - $rpc_py add_vhost_scsi_lun naa.Nvme0n1p1.0 0 Mallocp0 - $rpc_py add_vhost_scsi_lun naa.Nvme0n1p2.1 0 HotInNvme0n1p1 - $rpc_py add_vhost_scsi_lun naa.Nvme0n1p3.1 0 Mallocp1 + $rpc_py vhost_scsi_controller_add_target naa.Nvme0n1p0.0 0 HotInNvme0n1p0 + $rpc_py vhost_scsi_controller_add_target naa.Nvme0n1p1.0 0 Mallocp0 + $rpc_py vhost_scsi_controller_add_target naa.Nvme0n1p2.1 0 HotInNvme0n1p1 + $rpc_py vhost_scsi_controller_add_target naa.Nvme0n1p3.1 0 Mallocp1 # 2. Run two VMs, attached to scsi controllers. vms_setup @@ -102,7 +102,7 @@ function scsi_hotremove_tc2() { function scsi_hotremove_tc3() { echo "Scsi hotremove test case 3" # 1. Attach added NVMe bdev to scsi controller. - $rpc_py add_vhost_scsi_lun naa.Nvme0n1p0.0 0 HotInNvme1n1p0 + $rpc_py vhost_scsi_controller_add_target naa.Nvme0n1p0.0 0 HotInNvme1n1p0 # 2. Run two VM, attached to scsi controllers. vm_run_with_arg 0 1 vms_prepare "0 1" @@ -143,8 +143,8 @@ function scsi_hotremove_tc3() { function scsi_hotremove_tc4() { echo "Scsi hotremove test case 4" # 1. Attach NVMe bdevs to scsi controllers. - $rpc_py add_vhost_scsi_lun naa.Nvme0n1p0.0 0 HotInNvme2n1p0 - $rpc_py add_vhost_scsi_lun naa.Nvme0n1p2.1 0 HotInNvme2n1p1 + $rpc_py vhost_scsi_controller_add_target naa.Nvme0n1p0.0 0 HotInNvme2n1p0 + $rpc_py vhost_scsi_controller_add_target naa.Nvme0n1p2.1 0 HotInNvme2n1p1 # 2. Run two VMs, attach to scsi controller. vm_run_with_arg 0 1 vms_prepare "0 1" diff --git a/test/vhost/initiator/blockdev.sh b/test/vhost/initiator/blockdev.sh index 4fa503026..5e3868b6a 100755 --- a/test/vhost/initiator/blockdev.sh +++ b/test/vhost/initiator/blockdev.sh @@ -66,21 +66,21 @@ function create_bdev_config() $RPC_PY bdev_split_create Nvme0n1 6 $RPC_PY vhost_create_scsi_controller naa.Nvme0n1_scsi0.0 - $RPC_PY add_vhost_scsi_lun naa.Nvme0n1_scsi0.0 0 Nvme0n1p0 - $RPC_PY add_vhost_scsi_lun naa.Nvme0n1_scsi0.0 1 Nvme0n1p1 - $RPC_PY add_vhost_scsi_lun naa.Nvme0n1_scsi0.0 2 Nvme0n1p2 - $RPC_PY add_vhost_scsi_lun naa.Nvme0n1_scsi0.0 3 Nvme0n1p3 + $RPC_PY vhost_scsi_controller_add_target naa.Nvme0n1_scsi0.0 0 Nvme0n1p0 + $RPC_PY vhost_scsi_controller_add_target naa.Nvme0n1_scsi0.0 1 Nvme0n1p1 + $RPC_PY vhost_scsi_controller_add_target naa.Nvme0n1_scsi0.0 2 Nvme0n1p2 + $RPC_PY vhost_scsi_controller_add_target naa.Nvme0n1_scsi0.0 3 Nvme0n1p3 $RPC_PY construct_vhost_blk_controller naa.Nvme0n1_blk0.0 Nvme0n1p4 $RPC_PY construct_vhost_blk_controller naa.Nvme0n1_blk1.0 Nvme0n1p5 $RPC_PY bdev_malloc_create 128 512 --name Malloc0 $RPC_PY vhost_create_scsi_controller naa.Malloc0.0 - $RPC_PY add_vhost_scsi_lun naa.Malloc0.0 0 Malloc0 + $RPC_PY vhost_scsi_controller_add_target naa.Malloc0.0 0 Malloc0 $RPC_PY bdev_malloc_create 128 4096 --name Malloc1 $RPC_PY vhost_create_scsi_controller naa.Malloc1.0 - $RPC_PY add_vhost_scsi_lun naa.Malloc1.0 0 Malloc1 + $RPC_PY vhost_scsi_controller_add_target naa.Malloc1.0 0 Malloc1 vbdevs=$(discover_bdevs $rootdir $testdir/bdev.conf) virtio_bdevs=$(jq -r '[.[].name] | join(":")' <<< $vbdevs) diff --git a/test/vhost/integrity/integrity_start.sh b/test/vhost/integrity/integrity_start.sh index 45862dd12..a3e929774 100755 --- a/test/vhost/integrity/integrity_start.sh +++ b/test/vhost/integrity/integrity_start.sh @@ -71,7 +71,7 @@ $rpc_py bdev_lvol_create lvol_bdev 10000 -l lvol_store if [[ "$ctrl_type" == "spdk_vhost_scsi" ]]; then $rpc_py vhost_create_scsi_controller naa.Nvme0n1.0 - $rpc_py add_vhost_scsi_lun naa.Nvme0n1.0 0 lvol_store/lvol_bdev + $rpc_py vhost_scsi_controller_add_target naa.Nvme0n1.0 0 lvol_store/lvol_bdev elif [[ "$ctrl_type" == "spdk_vhost_blk" ]]; then $rpc_py construct_vhost_blk_controller naa.Nvme0n1.0 lvol_store/lvol_bdev fi diff --git a/test/vhost/lvol/lvol_test.sh b/test/vhost/lvol/lvol_test.sh index 6673f18b1..e91c7e7e5 100755 --- a/test/vhost/lvol/lvol_test.sh +++ b/test/vhost/lvol/lvol_test.sh @@ -199,7 +199,7 @@ for (( i=0; i<$vm_count; i++)); do if [[ "$ctrl_type" == "spdk_vhost_scsi" ]]; then $rpc_py vhost_create_scsi_controller naa.0.$i $mask_arg for (( j=0; j<${#bdevs[@]}; j++)); do - $rpc_py add_vhost_scsi_lun naa.0.$i $j ${bdevs[$j]} + $rpc_py vhost_scsi_controller_add_target naa.0.$i $j ${bdevs[$j]} done setup_cmd+=" --disks=0" elif [[ "$ctrl_type" == "spdk_vhost_blk" ]]; then diff --git a/test/vhost/migration/migration-tc1.sh b/test/vhost/migration/migration-tc1.sh index 2f5afd067..6c4e2e5df 100644 --- a/test/vhost/migration/migration-tc1.sh +++ b/test/vhost/migration/migration-tc1.sh @@ -30,10 +30,10 @@ function migration_tc1_configure_vhost() # And two controllers - one for each VM. Both are using the same Malloc Bdev as LUN 0 $rpc vhost_create_scsi_controller $incoming_vm_ctrlr - $rpc add_vhost_scsi_lun $incoming_vm_ctrlr 0 Malloc0 + $rpc vhost_scsi_controller_add_target $incoming_vm_ctrlr 0 Malloc0 $rpc vhost_create_scsi_controller $target_vm_ctrlr - $rpc add_vhost_scsi_lun $target_vm_ctrlr 0 Malloc0 + $rpc vhost_scsi_controller_add_target $target_vm_ctrlr 0 Malloc0 } function migration_tc1_error_handler() diff --git a/test/vhost/migration/migration-tc2.sh b/test/vhost/migration/migration-tc2.sh index c787eab0b..e5b47060e 100644 --- a/test/vhost/migration/migration-tc2.sh +++ b/test/vhost/migration/migration-tc2.sh @@ -121,11 +121,11 @@ function migration_tc2_configure_vhost() $rpc_0 bdev_nvme_attach_controller -b Nvme0 -t rdma -f ipv4 -a $nvmf_target_ip -s 4420 -n "nqn.2016-06.io.spdk:cnode1" $rpc_0 vhost_create_scsi_controller $incoming_vm_ctrlr - $rpc_0 add_vhost_scsi_lun $incoming_vm_ctrlr 0 Nvme0n1 + $rpc_0 vhost_scsi_controller_add_target $incoming_vm_ctrlr 0 Nvme0n1 $rpc_1 bdev_nvme_attach_controller -b Nvme0 -t rdma -f ipv4 -a $nvmf_target_ip -s 4420 -n "nqn.2016-06.io.spdk:cnode1" $rpc_1 vhost_create_scsi_controller $target_vm_ctrlr - $rpc_1 add_vhost_scsi_lun $target_vm_ctrlr 0 Nvme0n1 + $rpc_1 vhost_scsi_controller_add_target $target_vm_ctrlr 0 Nvme0n1 notice "Setting up VMs" vm_setup --os="$os_image" --force=$incoming_vm --disk-type=spdk_vhost_scsi --disks=VhostScsi0 \ diff --git a/test/vhost/migration/migration-tc3a.sh b/test/vhost/migration/migration-tc3a.sh index b58c768ba..2825aa697 100644 --- a/test/vhost/migration/migration-tc3a.sh +++ b/test/vhost/migration/migration-tc3a.sh @@ -125,7 +125,7 @@ function host1_start_vhost() vhost_run 0 "-u" $rpc_0 bdev_nvme_attach_controller -b Nvme0 -t rdma -f ipv4 -a $RDMA_TARGET_IP -s 4420 -n "nqn.2018-02.io.spdk:cnode1" $rpc_0 vhost_create_scsi_controller $incoming_vm_ctrlr - $rpc_0 add_vhost_scsi_lun $incoming_vm_ctrlr 0 Nvme0n1 + $rpc_0 vhost_scsi_controller_add_target $incoming_vm_ctrlr 0 Nvme0n1 vm_setup --os="$share_dir/migration.qcow2" --force=$incoming_vm --disk-type=spdk_vhost_scsi --disks=VhostScsi0 \ --migrate-to=$target_vm --memory=512 --queue_num=1 diff --git a/test/vhost/migration/migration-tc3b.sh b/test/vhost/migration/migration-tc3b.sh index e66f27b11..9c3dc5f2a 100644 --- a/test/vhost/migration/migration-tc3b.sh +++ b/test/vhost/migration/migration-tc3b.sh @@ -37,7 +37,7 @@ function host_2_start_vhost() $rpc bdev_nvme_attach_controller -b Nvme0 -t rdma -f ipv4 -a $RDMA_TARGET_IP -s 4420 -n "nqn.2018-02.io.spdk:cnode1" $rpc vhost_create_scsi_controller $target_vm_ctrl - $rpc add_vhost_scsi_lun $target_vm_ctrl 0 Nvme0n1 + $rpc vhost_scsi_controller_add_target $target_vm_ctrl 0 Nvme0n1 vm_setup --os="$os_image" --force=$target_vm --disk-type=spdk_vhost_scsi --disks=VhostScsi0 \ --memory=512 --vhost-name=1 --incoming=$incoming_vm diff --git a/test/vhost/other/negative.sh b/test/vhost/other/negative.sh index 00ce0cea3..b58f08295 100755 --- a/test/vhost/other/negative.sh +++ b/test/vhost/other/negative.sh @@ -93,7 +93,7 @@ if [[ $RUN_NIGHTLY -eq 1 ]]; then fi notice "Trying to add device to nonexistent scsi controller" - if $rpc_py add_vhost_scsi_lun vhost.nonexistent.name 0 Malloc0; then + if $rpc_py vhost_scsi_controller_add_target vhost.nonexistent.name 0 Malloc0; then error "Adding device to nonexistent scsi controller succeeded, but it shouldn't" fi @@ -106,7 +106,7 @@ if [[ $RUN_NIGHTLY -eq 1 ]]; then $rpc_py vhost_create_scsi_controller naa.0 notice "Adding initial device (0) to naa.0" - $rpc_py add_vhost_scsi_lun naa.0 0 Malloc0 + $rpc_py vhost_scsi_controller_add_target naa.0 0 Malloc0 notice "Trying to remove nonexistent device on existing controller" if $rpc_py remove_vhost_scsi_target naa.0 1 > /dev/null; then @@ -122,7 +122,7 @@ if [[ $RUN_NIGHTLY -eq 1 ]]; then fi notice "Re-adding device 0 to naa.0" - $rpc_py add_vhost_scsi_lun naa.0 0 Malloc0 + $rpc_py vhost_scsi_controller_add_target naa.0 0 Malloc0 # BLK notice "Trying to create block controller with incorrect cpumask" diff --git a/test/vhost/perf_bench/vhost_perf.sh b/test/vhost/perf_bench/vhost_perf.sh index d8fddd2f3..f42504085 100755 --- a/test/vhost/perf_bench/vhost_perf.sh +++ b/test/vhost/perf_bench/vhost_perf.sh @@ -285,7 +285,7 @@ for (( i=0; i<$vm_count; i++)); do if [[ "$ctrl_type" == "spdk_vhost_scsi" ]]; then $rpc_py vhost_create_scsi_controller naa.0.$i - $rpc_py add_vhost_scsi_lun naa.0.$i 0 ${bdevs[$i]} + $rpc_py vhost_scsi_controller_add_target naa.0.$i 0 ${bdevs[$i]} setup_cmd+=" --disks=0" elif [[ "$ctrl_type" == "spdk_vhost_blk" ]]; then $rpc_py construct_vhost_blk_controller naa.$i.$i ${bdevs[$i]} diff --git a/test/vhost/vhost_boot/vhost_boot.sh b/test/vhost/vhost_boot/vhost_boot.sh index 37bc08ef7..a115341a9 100755 --- a/test/vhost/vhost_boot/vhost_boot.sh +++ b/test/vhost/vhost_boot/vhost_boot.sh @@ -91,7 +91,7 @@ timing_exit convert_vm_image trap 'err_clean "${FUNCNAME}" "${LINENO}"' ERR timing_enter create_vhost_controller $rpc_py vhost_create_scsi_controller naa.vhost_vm.$vm_no -$rpc_py add_vhost_scsi_lun naa.vhost_vm.$vm_no 0 $lvb_u +$rpc_py vhost_scsi_controller_add_target naa.vhost_vm.$vm_no 0 $lvb_u timing_exit create_vhost_controller timing_enter setup_vm diff --git a/test/vhost/windows/windows.sh b/test/vhost/windows/windows.sh index 6eb14a8b2..6164e3326 100755 --- a/test/vhost/windows/windows.sh +++ b/test/vhost/windows/windows.sh @@ -106,9 +106,9 @@ setup_cmd+=" --os=$vm_image" if [[ "$ctrl_type" == "spdk_vhost_scsi" ]]; then $rpc_py vhost_create_scsi_controller naa.0.0 - $rpc_py add_vhost_scsi_lun naa.0.0 0 Nvme0n1 - $rpc_py add_vhost_scsi_lun naa.0.0 1 Malloc0 - $rpc_py add_vhost_scsi_lun naa.0.0 2 Aio0 + $rpc_py vhost_scsi_controller_add_target naa.0.0 0 Nvme0n1 + $rpc_py vhost_scsi_controller_add_target naa.0.0 1 Malloc0 + $rpc_py vhost_scsi_controller_add_target naa.0.0 2 Aio0 setup_cmd+=" --disk-type=spdk_vhost_scsi --disks=0" elif [[ "$ctrl_type" == "spdk_vhost_blk" ]]; then $rpc_py construct_vhost_blk_controller naa.0.0 Nvme0n1 diff --git a/test/vhost/windows/windows_scsi_compliance.sh b/test/vhost/windows/windows_scsi_compliance.sh index 3fa487851..1479a83c7 100755 --- a/test/vhost/windows/windows_scsi_compliance.sh +++ b/test/vhost/windows/windows_scsi_compliance.sh @@ -56,10 +56,10 @@ $rpc_py bdev_malloc_create 256 4096 -b Malloc0 $rpc_py bdev_aio_create $aio_file Aio0 512 $rpc_py bdev_get_bdevs $rpc_py vhost_create_scsi_controller naa.vhost.1 -$rpc_py add_vhost_scsi_lun naa.vhost.1 0 Nvme0n1 -$rpc_py add_vhost_scsi_lun naa.vhost.1 1 Malloc0 +$rpc_py vhost_scsi_controller_add_target naa.vhost.1 0 Nvme0n1 +$rpc_py vhost_scsi_controller_add_target naa.vhost.1 1 Malloc0 # TODO: Currently there is bug for aio device. Disable this test -# $rpc_py add_vhost_scsi_lun naa.vhost.1 2 Aio0 +# $rpc_py vhost_scsi_controller_add_target naa.vhost.1 2 Aio0 timing_exit vhost_run timing_enter start_vm