Commit 617f17d8 authored by Pawel Kaminski's avatar Pawel Kaminski Committed by Jim Harris
Browse files

rpc: Rename get_scsi_devices to scsi_get_devices 



Change-Id: I6ebc7323835d192ef89dcb449be90529d63be46e
Signed-off-by: default avatarPawel Kaminski <pawelx.kaminski@intel.com>
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/468904


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarPaul Luse <paul.e.luse@intel.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
parent bf15f51c

doc/jsonrpc.md

+1 −1
Original line number Diff line number Diff line
@@ -240,7 +240,7 @@ Example response: 
  "result": [

    "framework_start_init",

    "rpc_get_methods",

    "get_scsi_devices",

    "scsi_get_devices",

    "net_get_interfaces",

    "delete_ip_address",

    "net_interface_add_ip_address",

lib/scsi/scsi_rpc.c

+4 −3
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ 
#include "spdk/util.h"



static void

spdk_rpc_get_scsi_devices(struct spdk_jsonrpc_request *request,

spdk_rpc_scsi_get_devices(struct spdk_jsonrpc_request *request,

			  const struct spdk_json_val *params)

{

	struct spdk_json_write_ctx *w;
@@ -47,7 +47,7 @@ spdk_rpc_get_scsi_devices(struct spdk_jsonrpc_request *request, 


	if (params != NULL) {

		spdk_jsonrpc_send_error_response(request, SPDK_JSONRPC_ERROR_INVALID_PARAMS,

						 "get_scsi_devices requires no parameters");

						 "scsi_get_devices requires no parameters");

		return;

	}
@@ -73,4 +73,5 @@ spdk_rpc_get_scsi_devices(struct spdk_jsonrpc_request *request, 


	spdk_jsonrpc_end_result(request, w);

}

SPDK_RPC_REGISTER("get_scsi_devices", spdk_rpc_get_scsi_devices, SPDK_RPC_RUNTIME)
 
SPDK_RPC_REGISTER("scsi_get_devices", spdk_rpc_scsi_get_devices, SPDK_RPC_RUNTIME)

SPDK_RPC_REGISTER_ALIAS_DEPRECATED(scsi_get_devices, get_scsi_devices)

scripts/rpc.py

+5 −4
Original line number Diff line number Diff line
@@ -1140,11 +1140,12 @@ Format: 'user:u1 secret:s1 muser:mu1 msecret:ms1,user:u2 secret:s2 muser:mu2 mse 
                              help='Display iSCSI global parameters')

    p.set_defaults(func=iscsi_get_options)



    def get_scsi_devices(args):

        print_dict(rpc.iscsi.get_scsi_devices(args.client))

    def scsi_get_devices(args):

        print_dict(rpc.iscsi.scsi_get_devices(args.client))



    p = subparsers.add_parser('get_scsi_devices', help='Display SCSI devices')

    p.set_defaults(func=get_scsi_devices)

    p = subparsers.add_parser('scsi_get_devices', aliases=['get_scsi_devices'],

                              help='Display SCSI devices')

    p.set_defaults(func=scsi_get_devices)



    # trace

    def trace_enable_tpoint_group(args):

scripts/rpc/iscsi.py

+3 −2
Original line number Diff line number Diff line
@@ -548,10 +548,11 @@ def iscsi_get_options(client): 
    return client.call('iscsi_get_options')





def get_scsi_devices(client):

@deprecated_alias('get_iscsi_devices')

def scsi_get_devices(client):

    """Display SCSI devices.



    Returns:

        List of SCSI device.

    """

    return client.call('get_scsi_devices')
 
    return client.call('scsi_get_devices')

scripts/spdkcli/ui_node_iscsi.py

+1 −1
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ class UIISCSIDevices(UINode): 
    def refresh(self):

        self._children = set([])

        self.target_nodes = list(self.get_root().iscsi_get_target_nodes())

        self.scsi_devices = list(self.get_root().get_scsi_devices())

        self.scsi_devices = list(self.get_root().scsi_get_devices())

        for device in self.scsi_devices:

            for node in self.target_nodes:

                if hasattr(device, "device_name") and node['name'] \