RPC: rename destruct_split_vbdev to bdev_split_delete

Signed-off-by: Maciej Wawryk <maciejx.wawryk@intel.com>
Change-Id: Ib1fe9c105b4dd45fd5488b74cefc2260a81fe284
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/468095
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>

doc/jsonrpc.md

@@ -285,7 +285,7 @@ Example response:
     "remove_virtio_bdev",
     "bdev_aio_delete",
     "bdev_aio_create",
-    "destruct_split_vbdev",
+    "bdev_split_delete",
     "bdev_split_create",
     "bdev_error_inject_error",
     "bdev_error_delete",

module/bdev/split/vbdev_split_rpc.c

@@ -105,24 +105,24 @@ out:
 SPDK_RPC_REGISTER("bdev_split_create", spdk_rpc_bdev_split_create, SPDK_RPC_RUNTIME)
 SPDK_RPC_REGISTER_ALIAS_DEPRECATED(bdev_split_create, construct_split_vbdev)
 
-struct rpc_destruct_split {
+struct rpc_delete_split {
 	char *base_bdev;
 };
 
-static const struct spdk_json_object_decoder rpc_destruct_split_decoders[] = {
+static const struct spdk_json_object_decoder rpc_delete_split_decoders[] = {
-	{"base_bdev", offsetof(struct rpc_destruct_split, base_bdev), spdk_json_decode_string},
+	{"base_bdev", offsetof(struct rpc_delete_split, base_bdev), spdk_json_decode_string},
 };
 
 static void
-spdk_rpc_destruct_split_vbdev(struct spdk_jsonrpc_request *request,
+spdk_rpc_bdev_split_delete(struct spdk_jsonrpc_request *request,
-			      const struct spdk_json_val *params)
+			   const struct spdk_json_val *params)
 {
-	struct rpc_destruct_split req = {};
+	struct rpc_delete_split req = {};
 	struct spdk_json_write_ctx *w;
 	int rc;
 
-	if (spdk_json_decode_object(params, rpc_destruct_split_decoders,
+	if (spdk_json_decode_object(params, rpc_delete_split_decoders,
-				    SPDK_COUNTOF(rpc_destruct_split_decoders),
+				    SPDK_COUNTOF(rpc_delete_split_decoders),
 				    &req)) {
 		SPDK_ERRLOG("spdk_json_decode_object failed\n");
 		spdk_jsonrpc_send_error_response(request, SPDK_JSONRPC_ERROR_INVALID_PARAMS, "Invalid parameters");
@@ -141,4 +141,5 @@ spdk_rpc_destruct_split_vbdev(struct spdk_jsonrpc_request *request,
 out:
 	free(req.base_bdev);
 }
-SPDK_RPC_REGISTER("destruct_split_vbdev", spdk_rpc_destruct_split_vbdev, SPDK_RPC_RUNTIME)
+SPDK_RPC_REGISTER("bdev_split_delete", spdk_rpc_bdev_split_delete, SPDK_RPC_RUNTIME)
+SPDK_RPC_REGISTER_ALIAS_DEPRECATED(bdev_split_delete, destruct_split_vbdev)

scripts/rpc.py

@@ -1376,13 +1376,14 @@ Format: 'user:u1 secret:s1 muser:mu1 msecret:ms1,user:u2 secret:s2 muser:mu2 mse
     exceed the base bdev size.""", type=int)
     p.set_defaults(func=bdev_split_create)
 
-    def destruct_split_vbdev(args):
+    def bdev_split_delete(args):
-        rpc.bdev.destruct_split_vbdev(args.client,
+        rpc.bdev.bdev_split_delete(args.client,
-                                      base_bdev=args.base_bdev)
+                                   base_bdev=args.base_bdev)
 
-    p = subparsers.add_parser('destruct_split_vbdev', help="""Delete split config with all created splits.""")
+    p = subparsers.add_parser('bdev_split_delete', aliases=['destruct_split_vbdev'],
+                              help="""Delete split config with all created splits.""")
     p.add_argument('base_bdev', help='base bdev name')
-    p.set_defaults(func=destruct_split_vbdev)
+    p.set_defaults(func=bdev_split_delete)
 
     # ftl
     ftl_valid_limits = ('crit', 'high', 'low', 'start')

scripts/rpc/bdev.py

@@ -662,8 +662,9 @@ def bdev_split_create(client, base_bdev, split_count, split_size_mb=None):
     return client.call('bdev_split_create', params)
 
 
-def destruct_split_vbdev(client, base_bdev):
+@deprecated_alias('destruct_split_vbdev')
-    """Destroy split block devices.
+def bdev_split_delete(client, base_bdev):
+    """Delete split block devices.
 
     Args:
         base_bdev: name of previously split bdev
@@ -672,7 +673,7 @@ def destruct_split_vbdev(client, base_bdev):
         'base_bdev': base_bdev,
     }
 
-    return client.call('destruct_split_vbdev', params)
+    return client.call('bdev_split_delete', params)
 
 
 @deprecated_alias('construct_ftl_bdev')

scripts/spdkcli/ui_node.py

@@ -47,7 +47,7 @@ class UINode(ConfigNode):
                 command in ["create", "delete", "delete_all", "add_initiator",
                             "allow_any_host", "bdev_split_create", "add_lun",
                             "iscsi_target_node_add_pg_ig_maps", "remove_target", "add_secret",
-                            "destruct_split_bdev", "bdev_pmem_delete_pool",
+                            "bdev_split_delete", "bdev_pmem_delete_pool",
                             "bdev_pmem_create_pool", "delete_secret_all",
                             "delete_initiator", "set_auth", "delete_secret",
                             "iscsi_target_node_remove_pg_ig_maps", "load_config",
@@ -408,14 +408,14 @@ class UISplitBdev(UIBdev):
                                                      split_size_mb=split_size_mb)
         self.shell.log.info(ret_name)
 
-    def ui_command_destruct_split_bdev(self, base_bdev):
+    def ui_command_bdev_split_delete(self, base_bdev):
-        """Destroy split block devices associated with base bdev.
+        """Delete split block devices associated with base bdev.
 
         Args:
             base_bdev: name of previously split bdev
         """
 
-        self.get_root().destruct_split_bdev(base_bdev=base_bdev)
+        self.get_root().bdev_split_delete(base_bdev=base_bdev)
 
 
 class UIPmemBdev(UIBdev):

scripts/spdkcli/ui_root.py

@@ -122,8 +122,8 @@ class UIRoot(UINode):
         return self.print_array(response)
 
     @verbose
-    def destruct_split_bdev(self, **kwargs):
+    def bdev_split_delete(self, **kwargs):
-        rpc.bdev.destruct_split_vbdev(self.client, **kwargs)
+        rpc.bdev.bdev_split_delete(self.client, **kwargs)
 
     @verbose
     def create_malloc_bdev(self, **kwargs):

test/iscsi_tgt/ext4test/ext4test.sh

@@ -20,7 +20,7 @@ $ISCSI_APP --wait-for-rpc &
 pid=$!
 echo "Process pid: $pid"
 
-trap '$rpc_py destruct_split_vbdev Name0n1 || true; killprocess $pid; iscsitestfini $1 $2; exit 1' SIGINT SIGTERM EXIT
+trap '$rpc_py bdev_split_delete Name0n1 || true; killprocess $pid; iscsitestfini $1 $2; exit 1' SIGINT SIGTERM EXIT
 
 waitforlisten $pid
 $rpc_py set_iscsi_options -o 30 -a 4 -b $node_base
@@ -123,7 +123,7 @@ done
 trap - SIGINT SIGTERM EXIT
 
 iscsicleanup
-$rpc_py destruct_split_vbdev Nvme0n1
+$rpc_py bdev_split_delete Nvme0n1
 $rpc_py bdev_error_delete EE_Malloc0
 
 if [ -z "$NO_NVME" ]; then

test/spdkcli/vhost.sh

@@ -99,7 +99,7 @@ $spdkcli_job "'vhost/scsi/vhost_scsi2 remove_target 2' 'Nvme0n1p3'
 'vhost/scsi delete vhost_scsi1' 'vhost_scsi1'
 'vhost/block delete vhost_blk2' 'vhost_blk2'
 'vhost/block delete vhost_blk1' 'vhost_blk1'
-'/bdevs/split_disk destruct_split_bdev Nvme0n1' 'Nvme0n1p0'
+'/bdevs/split_disk bdev_split_delete Nvme0n1' 'Nvme0n1p0'
 '/bdevs/aio delete sample0' 'sample0'
 '/bdevs/aio delete_all' 'sample1'
 '/bdevs/nvme delete Nvme0' 'Nvme0'

test/vhost/perf_bench/vhost_perf.sh

@@ -87,7 +87,7 @@ function cleanup_split_cfg()
 {
 	notice "Removing split vbdevs"
 	for (( i=0; i<$max_disks; i++ ));do
-		$rpc_py destruct_split_vbdev Nvme${i}n1
+		$rpc_py bdev_split_delete Nvme${i}n1
 	done
 }