diff --git a/doc/jsonrpc.md b/doc/jsonrpc.md index 130c65e72..2036ccbbd 100644 --- a/doc/jsonrpc.md +++ b/doc/jsonrpc.md @@ -4381,7 +4381,7 @@ Example response: } ~~~ -## construct_vhost_scsi_controller {#rpc_construct_vhost_scsi_controller} +## vhost_create_scsi_controller {#rpc_vhost_create_scsi_controller} Construct vhost SCSI target. @@ -4403,7 +4403,7 @@ Example request: "ctrlr": "VhostScsi0" }, "jsonrpc": "2.0", - "method": "construct_vhost_scsi_controller", + "method": "vhost_create_scsi_controller", "id": 1 } ~~~ diff --git a/doc/vhost.md b/doc/vhost.md index e9ce04b71..8f17a3ede 100644 --- a/doc/vhost.md +++ b/doc/vhost.md @@ -134,7 +134,7 @@ on NUMA systems, the cpumask should specify cores on the same CPU socket as its associated VM. ~~~{.sh} -scripts/rpc.py construct_vhost_scsi_controller --cpumask 0x1 vhost.0 +scripts/rpc.py vhost_create_scsi_controller --cpumask 0x1 vhost.0 ~~~ The following RPC will attach the Malloc0 bdev to the vhost.0 vhost-scsi @@ -272,7 +272,7 @@ Malloc0 ~~~ ~~~{.sh} -host:~# ./scripts/rpc.py construct_vhost_scsi_controller --cpumask 0x1 vhost.0 +host:~# ./scripts/rpc.py vhost_create_scsi_controller --cpumask 0x1 vhost.0 VHOST_CONFIG: vhost-user server: socket created, fd: 21 VHOST_CONFIG: bind to /var/tmp/vhost.0 vhost.c: 596:spdk_vhost_dev_construct: *NOTICE*: Controller vhost.0: new controller added diff --git a/lib/vhost/vhost_rpc.c b/lib/vhost/vhost_rpc.c index 1168fb2d2..1a85d2fdd 100644 --- a/lib/vhost/vhost_rpc.c +++ b/lib/vhost/vhost_rpc.c @@ -56,21 +56,21 @@ free_rpc_vhost_scsi_ctrlr(struct rpc_vhost_scsi_ctrlr *req) free(req->cpumask); } -static const struct spdk_json_object_decoder rpc_construct_vhost_ctrlr[] = { +static const struct spdk_json_object_decoder rpc_vhost_create_scsi_ctrlr[] = { {"ctrlr", offsetof(struct rpc_vhost_scsi_ctrlr, ctrlr), spdk_json_decode_string }, {"cpumask", offsetof(struct rpc_vhost_scsi_ctrlr, cpumask), spdk_json_decode_string, true}, }; static void -spdk_rpc_construct_vhost_scsi_controller(struct spdk_jsonrpc_request *request, - const struct spdk_json_val *params) +spdk_rpc_vhost_create_scsi_controller(struct spdk_jsonrpc_request *request, + const struct spdk_json_val *params) { struct rpc_vhost_scsi_ctrlr req = {0}; struct spdk_json_write_ctx *w; int rc; - if (spdk_json_decode_object(params, rpc_construct_vhost_ctrlr, - SPDK_COUNTOF(rpc_construct_vhost_ctrlr), + if (spdk_json_decode_object(params, rpc_vhost_create_scsi_ctrlr, + SPDK_COUNTOF(rpc_vhost_create_scsi_ctrlr), &req)) { SPDK_DEBUGLOG(SPDK_LOG_VHOST_RPC, "spdk_json_decode_object failed\n"); rc = -EINVAL; @@ -94,8 +94,9 @@ invalid: spdk_jsonrpc_send_error_response(request, SPDK_JSONRPC_ERROR_INVALID_PARAMS, spdk_strerror(-rc)); } -SPDK_RPC_REGISTER("construct_vhost_scsi_controller", spdk_rpc_construct_vhost_scsi_controller, +SPDK_RPC_REGISTER("vhost_create_scsi_controller", spdk_rpc_vhost_create_scsi_controller, SPDK_RPC_RUNTIME) +SPDK_RPC_REGISTER_ALIAS_DEPRECATED(vhost_create_scsi_controller, construct_vhost_scsi_controller) struct rpc_add_vhost_scsi_ctrlr_lun { char *ctrlr; diff --git a/lib/vhost/vhost_scsi.c b/lib/vhost/vhost_scsi.c index ab211fa7b..572f4aa19 100644 --- a/lib/vhost/vhost_scsi.c +++ b/lib/vhost/vhost_scsi.c @@ -1534,7 +1534,7 @@ vhost_scsi_write_config_json(struct spdk_vhost_dev *vdev, struct spdk_json_write uint32_t i; spdk_json_write_object_begin(w); - spdk_json_write_named_string(w, "method", "construct_vhost_scsi_controller"); + spdk_json_write_named_string(w, "method", "vhost_create_scsi_controller"); 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 6e26fcf58..23c5a5bbe 100755 --- a/scripts/config_converter.py +++ b/scripts/config_converter.py @@ -18,7 +18,7 @@ bdev_dict["bdev_pmem_create"] = [] bdev_dict["bdev_virtio_attach_controller"] = [] vhost_dict = OrderedDict() -vhost_dict["construct_vhost_scsi_controller"] = [] +vhost_dict["vhost_create_scsi_controller"] = [] vhost_dict["construct_vhost_blk_controller"] = [] vhost_dict["construct_vhost_nvme_controller"] = [] @@ -414,7 +414,7 @@ def get_vhost_scsi_json(config, section): }) vhost_scsi_json.append({ "params": to_json_params(params), - "method": "construct_vhost_scsi_controller" + "method": "vhost_create_scsi_controller" }) for target in targets: vhost_scsi_json.append({ @@ -703,7 +703,7 @@ if __name__ == "__main__": items = get_iscsi_target_node_json(config, section) for item in items: if match_section == "VhostScsi": - section_to_subsystem[match_section]["construct_vhost_scsi_controller"].append(item) + section_to_subsystem[match_section]["vhost_create_scsi_controller"].append(item) elif match_section == "VhostNvme": section_to_subsystem[match_section]["construct_vhost_nvme_controller"].append(item) elif match_section == "Subsystem": diff --git a/scripts/rpc.py b/scripts/rpc.py index 4501f48c5..dcbf057a9 100755 --- a/scripts/rpc.py +++ b/scripts/rpc.py @@ -1862,16 +1862,17 @@ Format: 'user:u1 secret:s1 muser:mu1 msecret:ms1,user:u2 secret:s2 muser:mu2 mse p.add_argument('iops_threshold', help='IOPS threshold when coalescing is enabled', type=int) p.set_defaults(func=vhost_controller_set_coalescing) - def construct_vhost_scsi_controller(args): - rpc.vhost.construct_vhost_scsi_controller(args.client, - ctrlr=args.ctrlr, - cpumask=args.cpumask) + def vhost_create_scsi_controller(args): + rpc.vhost.vhost_create_scsi_controller(args.client, + ctrlr=args.ctrlr, + cpumask=args.cpumask) p = subparsers.add_parser( - 'construct_vhost_scsi_controller', help='Add new vhost controller') + 'vhost_create_scsi_controller', aliases=['construct_vhost_scsi_controller'], + help='Add new vhost controller') p.add_argument('ctrlr', help='controller name') p.add_argument('--cpumask', help='cpu mask for this controller') - p.set_defaults(func=construct_vhost_scsi_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, diff --git a/scripts/rpc/vhost.py b/scripts/rpc/vhost.py index 04f8fa59c..bdf8394ba 100644 --- a/scripts/rpc/vhost.py +++ b/scripts/rpc/vhost.py @@ -17,8 +17,9 @@ def vhost_controller_set_coalescing(client, ctrlr, delay_base_us, iops_threshold return client.call('vhost_controller_set_coalescing', params) -def construct_vhost_scsi_controller(client, ctrlr, cpumask=None): - """Construct a vhost scsi controller. +@deprecated_alias('construct_vhost_scsi_controller') +def vhost_create_scsi_controller(client, ctrlr, cpumask=None): + """Create a vhost scsi controller. Args: ctrlr: controller name cpumask: cpu mask for this controller @@ -28,7 +29,7 @@ def construct_vhost_scsi_controller(client, ctrlr, cpumask=None): if cpumask: params['cpumask'] = cpumask - return client.call('construct_vhost_scsi_controller', params) + return client.call('vhost_create_scsi_controller', params) def add_vhost_scsi_lun(client, ctrlr, scsi_target_num, bdev_name): diff --git a/scripts/spdkcli/ui_node.py b/scripts/spdkcli/ui_node.py index fc58607b6..deb2b3acf 100644 --- a/scripts/spdkcli/ui_node.py +++ b/scripts/spdkcli/ui_node.py @@ -711,14 +711,14 @@ class UIVhostScsi(UIVhost): def ui_command_create(self, name, cpumask=None): """ - Construct a Vhost SCSI controller. + Create a Vhost SCSI controller. Arguments: name - Controller name. cpumask - Optional. Integer to specify mask of CPUs to use. Default: 1. """ - self.get_root().create_vhost_scsi_controller(ctrlr=name, + self.get_root().vhost_create_scsi_controller(ctrlr=name, cpumask=cpumask) diff --git a/scripts/spdkcli/ui_root.py b/scripts/spdkcli/ui_root.py index 6d68eb9aa..41f6f321b 100644 --- a/scripts/spdkcli/ui_root.py +++ b/scripts/spdkcli/ui_root.py @@ -282,8 +282,8 @@ class UIRoot(UINode): rpc.vhost.vhost_delete_controller(self.client, **kwargs) @verbose - def create_vhost_scsi_controller(self, **kwargs): - rpc.vhost.construct_vhost_scsi_controller(self.client, **kwargs) + def vhost_create_scsi_controller(self, **kwargs): + rpc.vhost.vhost_create_scsi_controller(self.client, **kwargs) @verbose def create_vhost_blk_controller(self, **kwargs): diff --git a/test/config_converter/spdk_config.json b/test/config_converter/spdk_config.json index 7088fe83d..0ae1d5db9 100644 --- a/test/config_converter/spdk_config.json +++ b/test/config_converter/spdk_config.json @@ -318,7 +318,7 @@ "cpumask": "1", "ctrlr": "naa.vhost.0" }, - "method": "construct_vhost_scsi_controller" + "method": "vhost_create_scsi_controller" }, { "params": { @@ -349,7 +349,7 @@ "cpumask": "1", "ctrlr": "naa.vhost.1" }, - "method": "construct_vhost_scsi_controller" + "method": "vhost_create_scsi_controller" }, { "params": { diff --git a/test/fuzz/autofuzz_vhost.sh b/test/fuzz/autofuzz_vhost.sh index 337c23d4b..728feb308 100755 --- a/test/fuzz/autofuzz_vhost.sh +++ b/test/fuzz/autofuzz_vhost.sh @@ -51,11 +51,11 @@ fi if [ "$TEST_TRANSPORT" == "scsi" ] || [ "$TEST_TRANSPORT" == "all" ]; then $vhost_rpc_py bdev_malloc_create -b Malloc1 64 512 - $vhost_rpc_py construct_vhost_scsi_controller naa.VhostScsi0.1 + $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 bdev_malloc_create -b Malloc2 64 512 - $vhost_rpc_py construct_vhost_scsi_controller naa.VhostScsi0.2 + $vhost_rpc_py vhost_create_scsi_controller naa.VhostScsi0.2 $vhost_rpc_py add_vhost_scsi_lun naa.VhostScsi0.2 0 Malloc2 # test the vhost scsi I/O queue with valid data buffers on a valid lun. diff --git a/test/json_config/clear_config.py b/test/json_config/clear_config.py index 259abf06a..190fe3b84 100755 --- a/test/json_config/clear_config.py +++ b/test/json_config/clear_config.py @@ -148,7 +148,7 @@ def clear_vhost_subsystem(args, vhost_config): args.client.call("remove_vhost_scsi_target", {"ctrlr": vhost['params']['ctrlr'], "scsi_target_num": vhost['params']['scsi_target_num']}) - elif method in ['construct_vhost_scsi_controller', 'construct_vhost_blk_controller', + elif method in ['vhost_create_scsi_controller', 'construct_vhost_blk_controller', 'construct_vhost_nvme_controller']: args.client.call("vhost_delete_controller", {'ctrlr': vhost['params']['ctrlr']}) diff --git a/test/json_config/json_config.sh b/test/json_config/json_config.sh index ca5b7479a..66349bac8 100755 --- a/test/json_config/json_config.sh +++ b/test/json_config/json_config.sh @@ -281,7 +281,7 @@ function create_vhost_subsystem_config() { tgt_rpc bdev_malloc_create 64 1024 --name MallocForVhost0 tgt_rpc bdev_split_create MallocForVhost0 8 - tgt_rpc construct_vhost_scsi_controller VhostScsiCtrlr0 + 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_controller_set_coalescing VhostScsiCtrlr0 1 100 diff --git a/test/nvmf/target/nvmf_vhost.sh b/test/nvmf/target/nvmf_vhost.sh index 3c7de5e12..f09229baa 100755 --- a/test/nvmf/target/nvmf_vhost.sh +++ b/test/nvmf/target/nvmf_vhost.sh @@ -49,7 +49,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 construct_vhost_scsi_controller naa.VhostScsi0.3 +$VHOST_RPC vhost_create_scsi_controller naa.VhostScsi0.3 $VHOST_RPC add_vhost_scsi_lun naa.VhostScsi0.3 0 "Nvme0n1" # start qemu based VM. diff --git a/test/vhost/fio/fio.sh b/test/vhost/fio/fio.sh index 181cd7c7d..004ad50a4 100755 --- a/test/vhost/fio/fio.sh +++ b/test/vhost/fio/fio.sh @@ -19,9 +19,9 @@ trap "at_app_exit; process_shm --id 0; exit 1" SIGINT SIGTERM EXIT vhost_run vhost0 "-m 0x1" -# Construct vhost scsi controller +# Create vhost scsi controller vhost_rpc vhost0 construct_malloc_bdev $MALLOC_BDEV_SIZE $MALLOC_BLOCK_SIZE -b Malloc0 -vhost_rpc vhost0 construct_vhost_scsi_controller naa.VhostScsi0.0 +vhost_rpc vhost0 vhost_create_scsi_controller naa.VhostScsi0.0 vhost_rpc vhost0 add_vhost_scsi_lun naa.VhostScsi0.0 0 "Malloc0" # Construct vhost blk controller diff --git a/test/vhost/fiotest/conf.json b/test/vhost/fiotest/conf.json index a993a5b5d..0adcd2b40 100644 --- a/test/vhost/fiotest/conf.json +++ b/test/vhost/fiotest/conf.json @@ -131,7 +131,7 @@ "cpumask": "0x1", "ctrlr": "vhost.0" }, - "method": "construct_vhost_scsi_controller" + "method": "vhost_create_scsi_controller" }, { "params": { diff --git a/test/vhost/fiotest/fio.sh b/test/vhost/fiotest/fio.sh index 95706c44c..87b993968 100755 --- a/test/vhost/fiotest/fio.sh +++ b/test/vhost/fiotest/fio.sh @@ -129,7 +129,7 @@ for vm_conf in ${vms[@]}; do $rpc_py construct_vhost_blk_controller naa.$disk.${conf[0]} $based_disk else notice "Creating controller naa.$disk.${conf[0]}" - $rpc_py construct_vhost_scsi_controller naa.$disk.${conf[0]} + $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 diff --git a/test/vhost/fuzz/fuzz.sh b/test/vhost/fuzz/fuzz.sh index e487b2c73..20c177219 100755 --- a/test/vhost/fuzz/fuzz.sh +++ b/test/vhost/fuzz/fuzz.sh @@ -31,11 +31,11 @@ $vhost_rpc_py bdev_malloc_create -b Malloc0 64 512 $vhost_rpc_py construct_vhost_blk_controller Vhost.1 Malloc0 $vhost_rpc_py bdev_malloc_create -b Malloc1 64 512 -$vhost_rpc_py construct_vhost_scsi_controller naa.VhostScsi0.1 +$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 bdev_malloc_create -b Malloc2 64 512 -$vhost_rpc_py construct_vhost_scsi_controller naa.VhostScsi0.2 +$vhost_rpc_py vhost_create_scsi_controller naa.VhostScsi0.2 $vhost_rpc_py add_vhost_scsi_lun naa.VhostScsi0.2 0 Malloc2 # test the vhost blk controller with valid data buffers. diff --git a/test/vhost/hotplug/scsi_hotplug.sh b/test/vhost/hotplug/scsi_hotplug.sh index 01fed2ef2..9b044d292 100755 --- a/test/vhost/hotplug/scsi_hotplug.sh +++ b/test/vhost/hotplug/scsi_hotplug.sh @@ -14,14 +14,14 @@ fi # Then prepare vhost with rpc calls and setup and run 4 VMs. function pre_hot_attach_detach_test_case() { used_vms="" - $rpc_py construct_vhost_scsi_controller naa.Nvme0n1p0.0 - $rpc_py construct_vhost_scsi_controller naa.Nvme0n1p1.0 - $rpc_py construct_vhost_scsi_controller naa.Nvme0n1p2.1 - $rpc_py construct_vhost_scsi_controller naa.Nvme0n1p3.1 - $rpc_py construct_vhost_scsi_controller naa.Nvme0n1p4.2 - $rpc_py construct_vhost_scsi_controller naa.Nvme0n1p5.2 - $rpc_py construct_vhost_scsi_controller naa.Nvme0n1p6.3 - $rpc_py construct_vhost_scsi_controller naa.Nvme0n1p7.3 + $rpc_py vhost_create_scsi_controller naa.Nvme0n1p0.0 + $rpc_py vhost_create_scsi_controller naa.Nvme0n1p1.0 + $rpc_py vhost_create_scsi_controller naa.Nvme0n1p2.1 + $rpc_py vhost_create_scsi_controller naa.Nvme0n1p3.1 + $rpc_py vhost_create_scsi_controller naa.Nvme0n1p4.2 + $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 diff --git a/test/vhost/hotplug/scsi_hotremove.sh b/test/vhost/hotplug/scsi_hotremove.sh index 482258e74..5cd6c9116 100644 --- a/test/vhost/hotplug/scsi_hotremove.sh +++ b/test/vhost/hotplug/scsi_hotremove.sh @@ -211,10 +211,10 @@ function scsi_hotremove_tc4() { } function pre_scsi_hotremove_test_case() { - $rpc_py construct_vhost_scsi_controller naa.Nvme0n1p0.0 - $rpc_py construct_vhost_scsi_controller naa.Nvme0n1p1.0 - $rpc_py construct_vhost_scsi_controller naa.Nvme0n1p2.1 - $rpc_py construct_vhost_scsi_controller naa.Nvme0n1p3.1 + $rpc_py vhost_create_scsi_controller naa.Nvme0n1p0.0 + $rpc_py vhost_create_scsi_controller naa.Nvme0n1p1.0 + $rpc_py vhost_create_scsi_controller naa.Nvme0n1p2.1 + $rpc_py vhost_create_scsi_controller naa.Nvme0n1p3.1 } function post_scsi_hotremove_test_case() { diff --git a/test/vhost/initiator/blockdev.sh b/test/vhost/initiator/blockdev.sh index 9dfe05925..4fa503026 100755 --- a/test/vhost/initiator/blockdev.sh +++ b/test/vhost/initiator/blockdev.sh @@ -65,7 +65,7 @@ function create_bdev_config() $RPC_PY bdev_split_create Nvme0n1 6 - $RPC_PY construct_vhost_scsi_controller naa.Nvme0n1_scsi0.0 + $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 @@ -75,11 +75,11 @@ function create_bdev_config() $RPC_PY construct_vhost_blk_controller naa.Nvme0n1_blk1.0 Nvme0n1p5 $RPC_PY bdev_malloc_create 128 512 --name Malloc0 - $RPC_PY construct_vhost_scsi_controller naa.Malloc0.0 + $RPC_PY vhost_create_scsi_controller naa.Malloc0.0 $RPC_PY add_vhost_scsi_lun naa.Malloc0.0 0 Malloc0 $RPC_PY bdev_malloc_create 128 4096 --name Malloc1 - $RPC_PY construct_vhost_scsi_controller naa.Malloc1.0 + $RPC_PY vhost_create_scsi_controller naa.Malloc1.0 $RPC_PY add_vhost_scsi_lun naa.Malloc1.0 0 Malloc1 vbdevs=$(discover_bdevs $rootdir $testdir/bdev.conf) diff --git a/test/vhost/integrity/integrity_start.sh b/test/vhost/integrity/integrity_start.sh index 764ad84e6..45862dd12 100755 --- a/test/vhost/integrity/integrity_start.sh +++ b/test/vhost/integrity/integrity_start.sh @@ -70,7 +70,7 @@ lvs_uuid=$($rpc_py bdev_lvol_create_lvstore Nvme0n1 lvol_store) $rpc_py bdev_lvol_create lvol_bdev 10000 -l lvol_store if [[ "$ctrl_type" == "spdk_vhost_scsi" ]]; then - $rpc_py construct_vhost_scsi_controller naa.Nvme0n1.0 + $rpc_py vhost_create_scsi_controller naa.Nvme0n1.0 $rpc_py add_vhost_scsi_lun 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 diff --git a/test/vhost/lvol/lvol_test.sh b/test/vhost/lvol/lvol_test.sh index 598a3e80e..6673f18b1 100755 --- a/test/vhost/lvol/lvol_test.sh +++ b/test/vhost/lvol/lvol_test.sh @@ -197,7 +197,7 @@ for (( i=0; i<$vm_count; i++)); do fi if [[ "$ctrl_type" == "spdk_vhost_scsi" ]]; then - $rpc_py construct_vhost_scsi_controller naa.0.$i $mask_arg + $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]} done diff --git a/test/vhost/migration/migration-tc1.sh b/test/vhost/migration/migration-tc1.sh index 940bd06f8..2f5afd067 100644 --- a/test/vhost/migration/migration-tc1.sh +++ b/test/vhost/migration/migration-tc1.sh @@ -29,10 +29,10 @@ function migration_tc1_configure_vhost() $rpc bdev_malloc_create -b Malloc0 128 4096 # And two controllers - one for each VM. Both are using the same Malloc Bdev as LUN 0 - $rpc construct_vhost_scsi_controller $incoming_vm_ctrlr + $rpc vhost_create_scsi_controller $incoming_vm_ctrlr $rpc add_vhost_scsi_lun $incoming_vm_ctrlr 0 Malloc0 - $rpc construct_vhost_scsi_controller $target_vm_ctrlr + $rpc vhost_create_scsi_controller $target_vm_ctrlr $rpc add_vhost_scsi_lun $target_vm_ctrlr 0 Malloc0 } diff --git a/test/vhost/migration/migration-tc2.sh b/test/vhost/migration/migration-tc2.sh index ef37373aa..c787eab0b 100644 --- a/test/vhost/migration/migration-tc2.sh +++ b/test/vhost/migration/migration-tc2.sh @@ -120,11 +120,11 @@ function migration_tc2_configure_vhost() $rpc_nvmf nvmf_subsystem_add_listener nqn.2016-06.io.spdk:cnode1 -t rdma -a $nvmf_target_ip -s 4420 $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 construct_vhost_scsi_controller $incoming_vm_ctrlr + $rpc_0 vhost_create_scsi_controller $incoming_vm_ctrlr $rpc_0 add_vhost_scsi_lun $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 construct_vhost_scsi_controller $target_vm_ctrlr + $rpc_1 vhost_create_scsi_controller $target_vm_ctrlr $rpc_1 add_vhost_scsi_lun $target_vm_ctrlr 0 Nvme0n1 notice "Setting up VMs" diff --git a/test/vhost/migration/migration-tc3a.sh b/test/vhost/migration/migration-tc3a.sh index 84c28324b..b58c768ba 100644 --- a/test/vhost/migration/migration-tc3a.sh +++ b/test/vhost/migration/migration-tc3a.sh @@ -124,7 +124,7 @@ function host1_start_vhost() trap 'host1_cleanup_vhost; error_exit "${FUNCNAME}" "${LINENO}"' INT ERR EXIT 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 construct_vhost_scsi_controller $incoming_vm_ctrlr + $rpc_0 vhost_create_scsi_controller $incoming_vm_ctrlr $rpc_0 add_vhost_scsi_lun $incoming_vm_ctrlr 0 Nvme0n1 vm_setup --os="$share_dir/migration.qcow2" --force=$incoming_vm --disk-type=spdk_vhost_scsi --disks=VhostScsi0 \ diff --git a/test/vhost/migration/migration-tc3b.sh b/test/vhost/migration/migration-tc3b.sh index 8cbacb168..e66f27b11 100644 --- a/test/vhost/migration/migration-tc3b.sh +++ b/test/vhost/migration/migration-tc3b.sh @@ -36,7 +36,7 @@ function host_2_start_vhost() vhost_run 1 "-u" $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 construct_vhost_scsi_controller $target_vm_ctrl + $rpc vhost_create_scsi_controller $target_vm_ctrl $rpc add_vhost_scsi_lun $target_vm_ctrl 0 Nvme0n1 vm_setup --os="$os_image" --force=$target_vm --disk-type=spdk_vhost_scsi --disks=VhostScsi0 \ diff --git a/test/vhost/other/negative.sh b/test/vhost/other/negative.sh index a24c4804c..00ce0cea3 100755 --- a/test/vhost/other/negative.sh +++ b/test/vhost/other/negative.sh @@ -83,7 +83,7 @@ if [[ $RUN_NIGHTLY -eq 1 ]]; then # SCSI notice "Trying to create scsi controller with incorrect cpumask" - if $rpc_py construct_vhost_scsi_controller vhost.invalid.cpumask --cpumask 0x2; then + if $rpc_py vhost_create_scsi_controller vhost.invalid.cpumask --cpumask 0x2; then error "Creating scsi controller with incorrect cpumask succeeded, but it shouldn't" fi @@ -98,12 +98,12 @@ if [[ $RUN_NIGHTLY -eq 1 ]]; then fi notice "Trying to create scsi controller with incorrect name" - if $rpc_py construct_vhost_scsi_controller .; then + if $rpc_py vhost_create_scsi_controller .; then error "Creating scsi controller with incorrect name succeeded, but it shouldn't" fi notice "Creating controller naa.0" - $rpc_py construct_vhost_scsi_controller naa.0 + $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 diff --git a/test/vhost/perf_bench/vhost_perf.sh b/test/vhost/perf_bench/vhost_perf.sh index 2671f1bb5..d8fddd2f3 100755 --- a/test/vhost/perf_bench/vhost_perf.sh +++ b/test/vhost/perf_bench/vhost_perf.sh @@ -284,7 +284,7 @@ for (( i=0; i<$vm_count; i++)); do setup_cmd+=" --os=$VM_IMAGE" if [[ "$ctrl_type" == "spdk_vhost_scsi" ]]; then - $rpc_py construct_vhost_scsi_controller naa.0.$i + $rpc_py vhost_create_scsi_controller naa.0.$i $rpc_py add_vhost_scsi_lun naa.0.$i 0 ${bdevs[$i]} setup_cmd+=" --disks=0" elif [[ "$ctrl_type" == "spdk_vhost_blk" ]]; then diff --git a/test/vhost/vhost_boot/vhost_boot.sh b/test/vhost/vhost_boot/vhost_boot.sh index 1b47e0098..37bc08ef7 100755 --- a/test/vhost/vhost_boot/vhost_boot.sh +++ b/test/vhost/vhost_boot/vhost_boot.sh @@ -90,7 +90,7 @@ timing_exit convert_vm_image trap 'err_clean "${FUNCNAME}" "${LINENO}"' ERR timing_enter create_vhost_controller -$rpc_py construct_vhost_scsi_controller naa.vhost_vm.$vm_no +$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 timing_exit create_vhost_controller diff --git a/test/vhost/windows/windows.sh b/test/vhost/windows/windows.sh index 3690b29d7..6eb14a8b2 100755 --- a/test/vhost/windows/windows.sh +++ b/test/vhost/windows/windows.sh @@ -99,13 +99,13 @@ $rpc_py bdev_aio_create $aio_file Aio0 512 $rpc_py bdev_malloc_create -b Malloc0 256 512 $rpc_py bdev_get_bdevs -# Construct vhost controllers +# Create vhost controllers # Prepare VM setup command setup_cmd="vm_setup --force=0 --memory=8192" setup_cmd+=" --os=$vm_image" if [[ "$ctrl_type" == "spdk_vhost_scsi" ]]; then - $rpc_py construct_vhost_scsi_controller naa.0.0 + $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 diff --git a/test/vhost/windows/windows_scsi_compliance.sh b/test/vhost/windows/windows_scsi_compliance.sh index f7ef02d9e..3fa487851 100755 --- a/test/vhost/windows/windows_scsi_compliance.sh +++ b/test/vhost/windows/windows_scsi_compliance.sh @@ -55,7 +55,7 @@ $rpc_py bdev_nvme_set_hotplug -e $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 construct_vhost_scsi_controller naa.vhost.1 +$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 # TODO: Currently there is bug for aio device. Disable this test