RPC: rename get_nvmf_transports to nvmf_get_transports

Signed-off-by: Maciej Wawryk <maciejx.wawryk@intel.com>
Change-Id: I088070d130f46113efe4f89baae2508060ef33b3
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/469114
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Reviewed-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>

doc/jsonrpc.md

@@ -4244,7 +4244,7 @@ Example response:
 }
 ~~~
 
-## get_nvmf_transports method {#rpc_get_nvmf_transports}
+## nvmf_get_transports method {#rpc_nvmf_get_transports}
 
 ### Parameters
 
@@ -4260,7 +4260,7 @@ Example request:
 {
   "jsonrpc": "2.0",
   "id": 1,
-  "method": "get_nvmf_transports"
+  "method": "nvmf_get_transports"
 }
 ~~~
 

lib/nvmf/nvmf_rpc.c

@@ -1726,7 +1726,7 @@ static const struct spdk_json_object_decoder rpc_get_transport_decoders[] = {
 };
 
 static void
-spdk_rpc_get_nvmf_transports(struct spdk_jsonrpc_request *request,
+spdk_rpc_nvmf_get_transports(struct spdk_jsonrpc_request *request,
 			     const struct spdk_json_val *params)
 {
 	struct rpc_get_transport req = { 0 };
@@ -1763,7 +1763,8 @@ spdk_rpc_get_nvmf_transports(struct spdk_jsonrpc_request *request,
 	spdk_jsonrpc_end_result(request, w);
 	free(req.tgt_name);
 }
-SPDK_RPC_REGISTER("get_nvmf_transports", spdk_rpc_get_nvmf_transports, SPDK_RPC_RUNTIME)
+SPDK_RPC_REGISTER("nvmf_get_transports", spdk_rpc_nvmf_get_transports, SPDK_RPC_RUNTIME)
+SPDK_RPC_REGISTER_ALIAS_DEPRECATED(nvmf_get_transports, get_nvmf_transports)
 
 struct rpc_nvmf_get_stats_ctx {
 	char *tgt_name;

scripts/perf/nvmf/run_nvmf.py

@@ -466,7 +466,7 @@ class SPDKTarget(Target):
         # Create RDMA transport layer
         rpc.nvmf.nvmf_create_transport(self.client, trtype=self.transport, num_shared_buffers=self.num_shared_buffers)
         self.log_print("SPDK NVMeOF transport layer:")
-        rpc.client.print_dict(rpc.nvmf.get_nvmf_transports(self.client))
+        rpc.client.print_dict(rpc.nvmf.nvmf_get_transports(self.client))
 
         if self.null_block:
             nvme_section = self.spdk_tgt_add_nullblock()

scripts/rpc.py

@@ -1619,13 +1619,13 @@ Format: 'user:u1 secret:s1 muser:mu1 msecret:ms1,user:u2 secret:s2 muser:mu2 mse
     p.add_argument('-y', '--sock-priority', help='The sock priority of the tcp connection. Relevant only for TCP transport', type=int)
     p.set_defaults(func=nvmf_create_transport)
 
-    def get_nvmf_transports(args):
-        print_dict(rpc.nvmf.get_nvmf_transports(args.client, tgt_name=args.tgt_name))
+    def nvmf_get_transports(args):
+        print_dict(rpc.nvmf.nvmf_get_transports(args.client, tgt_name=args.tgt_name))
 
-    p = subparsers.add_parser('get_nvmf_transports',
+    p = subparsers.add_parser('nvmf_get_transports', aliases=['get_nvmf_transports'],
                               help='Display nvmf transports')
     p.add_argument('-t', '--tgt_name', help='The name of the parent NVMe-oF target (optional)', type=str)
-    p.set_defaults(func=get_nvmf_transports)
+    p.set_defaults(func=nvmf_get_transports)
 
     def nvmf_get_subsystems(args):
         print_dict(rpc.nvmf.nvmf_get_subsystems(args.client, tgt_name=args.tgt_name))

scripts/rpc/nvmf.py

@@ -145,7 +145,8 @@ def nvmf_create_transport(client,
     return client.call('nvmf_create_transport', params)
 
 
-def get_nvmf_transports(client, tgt_name=None):
+@deprecated_alias('get_nvmf_transports')
+def nvmf_get_transports(client, tgt_name=None):
     """Get list of NVMe-oF transports.
     Args:
         tgt_name: name of the parent NVMe-oF target (optional).
@@ -161,7 +162,7 @@ def get_nvmf_transports(client, tgt_name=None):
             'tgt_name': tgt_name,
         }
 
-    return client.call('get_nvmf_transports', params)
+    return client.call('nvmf_get_transports', params)
 
 
 @deprecated_alias('get_nvmf_subsystems')

scripts/spdkcli/ui_node_nvmf.py

@@ -20,7 +20,7 @@ class UINVMfTransports(UINode):
 
     def refresh(self):
         self._children = set([])
-        for transport in self.get_root().get_nvmf_transports():
+        for transport in self.get_root().nvmf_get_transports():
             UINVMfTransport(transport, self)
 
     def ui_command_create(self, trtype, max_queue_depth=None, max_qpairs_per_ctrlr=None, in_capsule_data_size=None,

scripts/spdkcli/ui_root.py

@@ -306,11 +306,11 @@ class UIRoot(UINode):
 
     def list_nvmf_transports(self):
         if self.is_init:
-            self.current_nvmf_transports = rpc.nvmf.get_nvmf_transports(self.client)
+            self.current_nvmf_transports = rpc.nvmf.nvmf_get_transports(self.client)
 
     @verbose
     @is_method_available
-    def get_nvmf_transports(self):
+    def nvmf_get_transports(self):
         if self.is_init:
             self.list_nvmf_transports()
             for transport in self.current_nvmf_transports: