d/numam-spdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

rpc: Rename set_iscsi_options to iscsi_set_options

Browse Source 
Change-Id: I1ad954db0876e2720d7d0bb19bd259f267c2aa36
Signed-off-by: Pawel Kaminski <pawelx.kaminski@intel.com>
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/468091
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Reviewed-by: Paul Luse <paul.e.luse@intel.com>
Reviewed-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
This commit is contained in:
Pawel Kaminski 2019-09-11 07:15:34 -04:00 committed by Jim Harris
parent 44c859e39c
commit cea4c3e51e
26 changed files with 37 additions and 34 deletions

6
doc/jsonrpc.md

@ -270,7 +270,7 @@ Example response:
"iscsi_initiator_group_add_initiators",
"add_initiator_group",
"iscsi_get_initiator_groups",
"set_iscsi_options",
"iscsi_set_options",
"set_bdev_options",
"bdev_set_qos_limit",
"bdev_get_bdevs",
@ -2530,7 +2530,7 @@ Example response:
# iSCSI Target {#jsonrpc_components_iscsi_tgt}
## set_iscsi_options method {#rpc_set_iscsi_options}
## iscsi_set_options method {#rpc_iscsi_set_options}
Set global parameters for iSCSI targets.
@ -2582,7 +2582,7 @@ Example request:
"default_time2wait": 2
},
"jsonrpc": "2.0",
"method": "set_iscsi_options",
"method": "iscsi_set_options",
"id": 1
}
~~~

5
lib/iscsi/iscsi_rpc.c

@ -1522,7 +1522,7 @@ static const struct spdk_json_object_decoder rpc_set_iscsi_opts_decoders[] = {
};
static void
spdk_rpc_set_iscsi_options(struct spdk_jsonrpc_request *request,
spdk_rpc_iscsi_set_options(struct spdk_jsonrpc_request *request,
const struct spdk_json_val *params)
{
struct spdk_iscsi_opts *opts;
@ -1568,4 +1568,5 @@ spdk_rpc_set_iscsi_options(struct spdk_jsonrpc_request *request,
spdk_json_write_bool(w, true);
spdk_jsonrpc_end_result(request, w);
}
SPDK_RPC_REGISTER("set_iscsi_options", spdk_rpc_set_iscsi_options, SPDK_RPC_STARTUP)
SPDK_RPC_REGISTER("iscsi_set_options", spdk_rpc_iscsi_set_options, SPDK_RPC_STARTUP)
SPDK_RPC_REGISTER_ALIAS_DEPRECATED(iscsi_set_options, set_iscsi_options)

2
lib/iscsi/iscsi_subsystem.c

@ -1527,7 +1527,7 @@ iscsi_opts_config_json(struct spdk_json_write_ctx *w)
{
spdk_json_write_object_begin(w);
spdk_json_write_named_string(w, "method", "set_iscsi_options");
spdk_json_write_named_string(w, "method", "iscsi_set_options");
spdk_json_write_name(w, "params");
spdk_iscsi_opts_info_json(w);

4
scripts/config_converter.py

@ -23,7 +23,7 @@ vhost_dict["construct_vhost_blk_controller"] = []
vhost_dict["construct_vhost_nvme_controller"] = []
iscsi_dict = OrderedDict()
iscsi_dict["set_iscsi_options"] = []
iscsi_dict["iscsi_set_options"] = []
iscsi_dict["iscsi_create_portal_group"] = []
iscsi_dict["add_initiator_group"] = []
iscsi_dict["iscsi_create_target_node"] = []
@ -515,7 +515,7 @@ def get_iscsi_options_json(config, section):
]
for option in config.options(section):
set_param(params, option, config.get(section, option))
return [{"method": "set_iscsi_options", "params": to_json_params(params)}]
return [{"method": "iscsi_set_options", "params": to_json_params(params)}]
def get_iscsi_portal_group_json(config, name):

9
scripts/rpc.py

@ -673,8 +673,8 @@ if __name__ == "__main__":
p.set_defaults(func=bdev_nvme_apply_firmware)
# iSCSI
def set_iscsi_options(args):
rpc.iscsi.set_iscsi_options(
def iscsi_set_options(args):
rpc.iscsi.iscsi_set_options(
args.client,
auth_file=args.auth_file,
node_base=args.node_base,
@ -694,7 +694,8 @@ if __name__ == "__main__":
error_recovery_level=args.error_recovery_level,
allow_duplicated_isid=args.allow_duplicated_isid)
p = subparsers.add_parser('set_iscsi_options', help="""Set options of iSCSI subsystem""")
p = subparsers.add_parser('iscsi_set_options', aliases=['set_iscsi_options'],
help="""Set options of iSCSI subsystem""")
p.add_argument('-f', '--auth-file', help='Path to CHAP shared secret file')
p.add_argument('-b', '--node-base', help='Prefix of the name of iSCSI target node')
p.add_argument('-o', '--nop-timeout', help='Timeout in seconds to nop-in request to the initiator', type=int)
@ -715,7 +716,7 @@ if __name__ == "__main__":
p.add_argument('-i', '--immediate-data', help='Negotiated parameter, ImmediateData.', action='store_true')
p.add_argument('-l', '--error-recovery-level', help='Negotiated parameter, ErrorRecoveryLevel', type=int)
p.add_argument('-p', '--allow-duplicated-isid', help='Allow duplicated initiator session ID.', action='store_true')
p.set_defaults(func=set_iscsi_options)
p.set_defaults(func=iscsi_set_options)
def set_iscsi_discovery_auth(args):
rpc.iscsi.set_iscsi_discovery_auth(

5
scripts/rpc/iscsi.py

@ -1,7 +1,8 @@
from .helpers import deprecated_alias
def set_iscsi_options(
@deprecated_alias('set_iscsi_options')
def iscsi_set_options(
client,
auth_file=None,
node_base=None,
@ -81,7 +82,7 @@ def set_iscsi_options(
if allow_duplicated_isid:
params['allow_duplicated_isid'] = allow_duplicated_isid
return client.call('set_iscsi_options', params)
return client.call('iscsi_set_options', params)
def set_iscsi_discovery_auth(

2
test/config_converter/spdk_config.json

@ -424,7 +424,7 @@
"auth_file": "/usr/local/etc/spdk/auth.conf",
"default_time2wait": 2
},
"method": "set_iscsi_options"
"method": "iscsi_set_options"
},
{
"params": {

2
test/config_converter/spdk_config_virtio.json

@ -125,7 +125,7 @@
"disable_chap": false,
"default_time2wait": 2
},
"method": "set_iscsi_options"
"method": "iscsi_set_options"
}
]
}

2
test/iscsi_tgt/bdev_io_wait/bdev_io_wait.sh

@ -21,7 +21,7 @@ pid=$!
echo "iSCSI target launched. pid: $pid"
trap 'killprocess $pid; iscsitestfini $1 $2; exit 1' SIGINT SIGTERM EXIT
waitforlisten $pid
$rpc_py set_iscsi_options -o 30 -a 4
$rpc_py iscsi_set_options -o 30 -a 4
# Minimal number of bdev io pool (5) and cache (1)
$rpc_py set_bdev_options -p 5 -c 1
$rpc_py start_subsystem_init

2
test/iscsi_tgt/calsoft/iscsi.json

@ -9,7 +9,7 @@
"max_sessions": 256,
"error_recovery_level": 2
},
"method": "set_iscsi_options"
"method": "iscsi_set_options"
}
]
}

2
test/iscsi_tgt/digests/digests.sh

@ -74,7 +74,7 @@ echo "Process pid: $pid"
trap 'killprocess $pid; iscsitestfini $1 $2; exit 1' SIGINT SIGTERM EXIT
waitforlisten $pid
$rpc_py set_iscsi_options -o 30 -a 16
$rpc_py iscsi_set_options -o 30 -a 16
$rpc_py start_subsystem_init
echo "iscsi_tgt is listening. Running tests..."

2
test/iscsi_tgt/ext4test/ext4test.sh

@ -23,7 +23,7 @@ echo "Process pid: $pid"
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
$rpc_py iscsi_set_options -o 30 -a 4 -b $node_base
$rpc_py start_subsystem_init
$rootdir/scripts/gen_nvme.sh --json | $rpc_py load_subsystem_config
$rpc_py bdev_malloc_create 512 4096 --name Malloc0

2
test/iscsi_tgt/filesystem/filesystem.sh

@ -36,7 +36,7 @@ echo "Process pid: $pid"
trap 'killprocess $pid; iscsitestfini $1 $2; exit 1' SIGINT SIGTERM EXIT
waitforlisten $pid
$rpc_py set_iscsi_options -o 30 -a 16
$rpc_py iscsi_set_options -o 30 -a 16
$rpc_py start_subsystem_init
echo "iscsi_tgt is listening. Running tests..."

2
test/iscsi_tgt/fio/iscsi.json

@ -18,7 +18,7 @@
"subsystem": "iscsi",
"config": [
{
"method": "set_iscsi_options",
"method": "iscsi_set_options",
"params": {
"nop_timeout": 30,
"node_base": "iqn.2016-06.io.spdk",

2
test/iscsi_tgt/initiator/initiator.sh

@ -23,7 +23,7 @@ pid=$!
echo "iSCSI target launched. pid: $pid"
trap 'killprocess $pid;exit 1' SIGINT SIGTERM EXIT
waitforlisten $pid
$rpc_py set_iscsi_options -o 30 -a 4
$rpc_py iscsi_set_options -o 30 -a 4
$rpc_py start_subsystem_init
echo "iscsi_tgt is listening. Running tests..."

2
test/iscsi_tgt/ip_migration/ip_migration.sh

@ -54,7 +54,7 @@ for ((i = 0; i < 2; i++)); do
trap 'kill_all_iscsi_target; exit 1' SIGINT SIGTERM EXIT
waitforlisten $pid $rpc_addr
$rpc_py -s $rpc_addr set_iscsi_options -o 30 -a 64
$rpc_py -s $rpc_addr iscsi_set_options -o 30 -a 64
$rpc_py -s $rpc_addr start_subsystem_init
echo "iscsi_tgt is listening. Running tests..."

2
test/iscsi_tgt/lvol/iscsi_lvol.sh

@ -33,7 +33,7 @@ echo "Process pid: $pid"
trap 'iscsicleanup; killprocess $pid; iscsitestfini $1 $2; exit 1' SIGINT SIGTERM EXIT
waitforlisten $pid
$rpc_py set_iscsi_options -o 30 -a 16
$rpc_py iscsi_set_options -o 30 -a 16
$rpc_py start_subsystem_init
echo "iscsi_tgt is listening. Running tests..."

2
test/iscsi_tgt/multiconnection/multiconnection.sh

@ -43,7 +43,7 @@ echo "iSCSI target launched. pid: $iscsipid"
trap 'remove_backends; iscsicleanup; killprocess $iscsipid; iscsitestfini $1 $2; exit 1' SIGINT SIGTERM EXIT
waitforlisten $iscsipid
$rpc_py set_iscsi_options -o 30 -a 128
$rpc_py iscsi_set_options -o 30 -a 128
$rpc_py start_subsystem_init
$rootdir/scripts/gen_nvme.sh --json | $rpc_py load_subsystem_config
timing_exit start_iscsi_tgt

2
test/iscsi_tgt/nvme_remote/fio_remote_nvme.sh

@ -29,7 +29,7 @@ function run_nvme_remote() {
echo "iSCSI target launched. pid: $iscsipid"
trap 'killprocess $iscsipid; iscsitestfini $1 $2; nvmftestfini; exit 1' SIGINT SIGTERM EXIT
waitforlisten $iscsipid "$iscsi_rpc_addr"
$rpc_py -s "$iscsi_rpc_addr" set_iscsi_options -o 30 -a 16
$rpc_py -s "$iscsi_rpc_addr" iscsi_set_options -o 30 -a 16
$rpc_py -s "$iscsi_rpc_addr" start_subsystem_init
if [ "$1" = "remote" ]; then
$rpc_py -s $iscsi_rpc_addr bdev_nvme_attach_controller -b "Nvme0" -t "rdma" -f "ipv4" -a $NVMF_FIRST_TARGET_IP -s $NVMF_PORT -n nqn.2016-06.io.spdk:cnode1

2
test/iscsi_tgt/perf/iscsi_target.sh

@ -83,7 +83,7 @@ $rootdir/app/iscsi_tgt/iscsi_tgt -m $ISCSI_TGT_CM -r $testdir/rpc_iscsi.sock --w
pid=$!
trap 'rm -f $testdir/perf.job; killprocess $pid; print_backtrace; exit 1' ERR SIGTERM SIGABRT
waitforlisten "$pid" "$testdir/rpc_iscsi.sock"
$rpc_py set_iscsi_options -b "iqn.2016-06.io.spdk" -f "/usr/local/etc/spdk/auth.conf" -o 30 -i -l 0 -a 16
$rpc_py iscsi_set_options -b "iqn.2016-06.io.spdk" -f "/usr/local/etc/spdk/auth.conf" -o 30 -i -l 0 -a 16
$rpc_py start_subsystem_init
$rootdir/scripts/gen_nvme.sh --json | $rpc_py load_subsystem_config
sleep 1

2
test/iscsi_tgt/pmem/iscsi_pmem.sh

@ -25,7 +25,7 @@ echo "Process pid: $pid"
trap 'iscsicleanup; killprocess $pid; rm -f /tmp/pool_file*; exit 1' SIGINT SIGTERM EXIT
waitforlisten $pid
$rpc_py set_iscsi_options -o 30 -a 16
$rpc_py iscsi_set_options -o 30 -a 16
$rpc_py start_subsystem_init
echo "iscsi_tgt is listening. Running tests..."
timing_exit start_iscsi_target

2
test/iscsi_tgt/rbd/rbd.sh

@ -32,7 +32,7 @@ pid=$!
trap 'killprocess $pid; rbd_cleanup; iscsitestfini $1 $2; exit 1' SIGINT SIGTERM EXIT
waitforlisten $pid
$rpc_py set_iscsi_options -o 30 -a 16
$rpc_py iscsi_set_options -o 30 -a 16
$rpc_py start_subsystem_init
echo "iscsi_tgt is listening. Running tests..."

2
test/iscsi_tgt/reset/reset.sh

@ -30,7 +30,7 @@ echo "Process pid: $pid"
trap 'killprocess $pid; exit 1' SIGINT SIGTERM EXIT
waitforlisten $pid
$rpc_py set_iscsi_options -o 30 -a 16
$rpc_py iscsi_set_options -o 30 -a 16
$rpc_py start_subsystem_init
echo "iscsi_tgt is listening. Running tests..."

2
test/iscsi_tgt/rpc_config/rpc_config.sh

@ -34,7 +34,7 @@ trap 'killprocess $pid; exit 1' SIGINT SIGTERM EXIT
waitforlisten $pid
$rpc_py wait_subsystem_init &
rpc_wait_pid=$!
$rpc_py set_iscsi_options -o 30 -a 16
$rpc_py iscsi_set_options -o 30 -a 16
# RPC wait_subsystem_init should be blocked, so its process must be existed
ps $rpc_wait_pid

2
test/json_config/clear_config.py

@ -89,7 +89,7 @@ def get_iscsi_destroy_method(iscsi):
delete_method_map = {'iscsi_create_portal_group': "iscsi_delete_portal_group",
'add_initiator_group': "delete_initiator_group",
'iscsi_create_target_node': "delete_target_node",
'set_iscsi_options': None
'iscsi_set_options': None
}
return delete_method_map[iscsi['method']]

2
test/json_config/config_filter.py

@ -23,7 +23,7 @@ def sort_json_object(o):
def filter_methods(do_remove_global_rpcs):
global_rpcs = [
'set_iscsi_options',
'iscsi_set_options',
'set_nvmf_target_config',
'set_nvmf_target_max_subsystems',
'nvmf_create_transport',