RPC: rename get_virtio_scsi_devs to bdev_virtio_scsi_get_devices

Signed-off-by: Maciej Wawryk <maciejx.wawryk@intel.com>
Change-Id: I47bffe7f7cb7bbd7408ea0be3c56d64d93a3f6da
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/468121
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>
Reviewed-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: Paul Luse <paul.e.luse@intel.com>

doc/jsonrpc.md

@@ -281,7 +281,7 @@ Example response:
     "kill_instance",
     "scan_ioat_copy_engine",
     "construct_virtio_dev",
-    "get_virtio_scsi_devs",
+    "bdev_virtio_scsi_get_devices",
     "bdev_virtio_detach_controller",
     "bdev_aio_delete",
     "bdev_aio_create",
@@ -2448,7 +2448,7 @@ Example response:
 }
 ~~~
 
-## get_virtio_scsi_devs {#rpc_get_virtio_scsi_devs}
+## bdev_virtio_scsi_get_devices {#rpc_bdev_virtio_scsi_get_devices}
 
 Show information about all available Virtio SCSI devices.
 
@@ -2467,7 +2467,7 @@ Example request:
 ~~~
 {
   "jsonrpc": "2.0",
-  "method": "get_virtio_scsi_devs",
+  "method": "bdev_virtio_scsi_get_devices",
   "id": 1
 }
 ~~~

module/bdev/virtio/bdev_virtio_rpc.c

@@ -100,14 +100,14 @@ SPDK_RPC_REGISTER("bdev_virtio_detach_controller",
 SPDK_RPC_REGISTER_ALIAS_DEPRECATED(bdev_virtio_detach_controller, remove_virtio_bdev)
 
 static void
-spdk_rpc_get_virtio_scsi_devs(struct spdk_jsonrpc_request *request,
-			      const struct spdk_json_val *params)
+spdk_rpc_bdev_virtio_scsi_get_devices(struct spdk_jsonrpc_request *request,
+				      const struct spdk_json_val *params)
 {
 	struct spdk_json_write_ctx *w;
 
 	if (params != NULL) {
 		spdk_jsonrpc_send_error_response(request, SPDK_JSONRPC_ERROR_INVALID_PARAMS,
-						 "get_virtio_scsi_devs requires no parameters");
+						 "bdev_virtio_scsi_get_devices requires no parameters");
 		return;
 	}
 
@@ -115,7 +115,9 @@ spdk_rpc_get_virtio_scsi_devs(struct spdk_jsonrpc_request *request,
 	bdev_virtio_scsi_dev_list(w);
 	spdk_jsonrpc_end_result(request, w);
 }
-SPDK_RPC_REGISTER("get_virtio_scsi_devs", spdk_rpc_get_virtio_scsi_devs, SPDK_RPC_RUNTIME)
+SPDK_RPC_REGISTER("bdev_virtio_scsi_get_devices",
+		  spdk_rpc_bdev_virtio_scsi_get_devices, SPDK_RPC_RUNTIME)
+SPDK_RPC_REGISTER_ALIAS_DEPRECATED(bdev_virtio_scsi_get_devices, get_virtio_scsi_devs)
 
 struct rpc_construct_virtio_dev {
 	char *name;

scripts/rpc.py

@@ -1899,11 +1899,12 @@ Format: 'user:u1 secret:s1 muser:mu1 msecret:ms1,user:u2 secret:s2 muser:mu2 mse
     p.add_argument('--vq-size', help='Size of each queue', type=int)
     p.set_defaults(func=construct_virtio_dev)
 
-    def get_virtio_scsi_devs(args):
-        print_dict(rpc.vhost.get_virtio_scsi_devs(args.client))
+    def bdev_virtio_scsi_get_devices(args):
+        print_dict(rpc.vhost.bdev_virtio_scsi_get_devices(args.client))
 
-    p = subparsers.add_parser('get_virtio_scsi_devs', help='List all Virtio-SCSI devices.')
-    p.set_defaults(func=get_virtio_scsi_devs)
+    p = subparsers.add_parser('bdev_virtio_scsi_get_devices', aliases=['get_virtio_scsi_devs'],
+                              help='List all Virtio-SCSI devices.')
+    p.set_defaults(func=bdev_virtio_scsi_get_devices)
 
     def bdev_virtio_detach_controller(args):
         rpc.vhost.bdev_virtio_detach_controller(args.client,

scripts/rpc/vhost.py

@@ -169,6 +169,7 @@ def bdev_virtio_detach_controller(client, name):
     return client.call('bdev_virtio_detach_controller', params)
 
 
-def get_virtio_scsi_devs(client):
+@deprecated_alias('get_virtio_scsi_devs')
+def bdev_virtio_scsi_get_devices(client):
     """Get list of virtio scsi devices."""
-    return client.call('get_virtio_scsi_devs')
+    return client.call('bdev_virtio_scsi_get_devices')

scripts/spdkcli/ui_node.py

@@ -550,7 +550,7 @@ class UIVirtioScsiBdev(UIBdev):
 
     def refresh(self):
         self._children = set([])
-        for bdev in self.get_root().get_virtio_scsi_devs():
+        for bdev in self.get_root().bdev_virtio_scsi_get_devices():
             UIVirtioScsiBdevObj(bdev, self)
 
     def ui_command_create(self, name, trtype, traddr,

scripts/spdkcli/ui_root.py

@@ -259,9 +259,9 @@ class UIRoot(UINode):
 
     @verbose
     @is_method_available
-    def get_virtio_scsi_devs(self):
+    def bdev_virtio_scsi_get_devices(self):
         if self.is_init:
-            for bdev in rpc.vhost.get_virtio_scsi_devs(self.client):
+            for bdev in rpc.vhost.bdev_virtio_scsi_get_devices(self.client):
                 test = Bdev(bdev)
                 yield test