ivampiresp/Spdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

RPC: rename delete_nvmf_subsystem to nvmf_delete_subsystem

Browse Source 
Signed-off-by: Maciej Wawryk <maciejx.wawryk@intel.com>
Change-Id: I4654f254cae78b0def789b13754af7c70c73dabb
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/469111
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Reviewed-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
This commit is contained in:
Maciej Wawryk 2019-09-23 12:17:30 +02:00 committed by Jim Harris
parent 7538af7034
commit 19baaa9a0e
27 changed files with 41 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/jsonrpc.md
View File

@ -3879,7 +3879,7 @@ Example response:
}
~~~
## delete_nvmf_subsystem method {#rpc_delete_nvmf_subsystem}
## nvmf_delete_subsystem method {#rpc_nvmf_delete_subsystem}
Delete an existing NVMe-oF subsystem.
@ -3898,7 +3898,7 @@ Example request:
{
"jsonrpc": "2.0",
"id": 1,
"method": "delete_nvmf_subsystem",
"method": "nvmf_delete_subsystem",
"params": {
"nqn": "nqn.2016-06.io.spdk:cnode1"
}

5
lib/nvmf/nvmf_rpc.c
View File

@ -476,7 +476,7 @@ static const struct spdk_json_object_decoder rpc_delete_subsystem_decoders[] = {
};
static void
spdk_rpc_delete_nvmf_subsystem(struct spdk_jsonrpc_request *request,
spdk_rpc_nvmf_delete_subsystem(struct spdk_jsonrpc_request *request,
const struct spdk_json_val *params)
{
struct rpc_delete_subsystem req = { 0 };
@ -520,7 +520,8 @@ invalid:
invalid_custom_response:
free_rpc_delete_subsystem(&req);
}
SPDK_RPC_REGISTER("delete_nvmf_subsystem", spdk_rpc_delete_nvmf_subsystem, SPDK_RPC_RUNTIME)
SPDK_RPC_REGISTER("nvmf_delete_subsystem", spdk_rpc_nvmf_delete_subsystem, SPDK_RPC_RUNTIME)
SPDK_RPC_REGISTER_ALIAS_DEPRECATED(nvmf_delete_subsystem, delete_nvmf_subsystem)
struct rpc_listen_address {
char *transport;

8
scripts/rpc.py
View File

@ -1656,17 +1656,17 @@ Format: 'user:u1 secret:s1 muser:mu1 msecret:ms1,user:u2 secret:s2 muser:mu2 mse
type=int, default=0)
p.set_defaults(func=nvmf_create_subsystem)
def delete_nvmf_subsystem(args):
rpc.nvmf.delete_nvmf_subsystem(args.client,
def nvmf_delete_subsystem(args):
rpc.nvmf.nvmf_delete_subsystem(args.client,
nqn=args.subsystem_nqn,
tgt_name=args.tgt_name)
p = subparsers.add_parser('delete_nvmf_subsystem',
p = subparsers.add_parser('nvmf_delete_subsystem', aliases=['delete_nvmf_subsystem'],
help='Delete a nvmf subsystem')
p.add_argument('subsystem_nqn',
help='subsystem nqn to be deleted. Example: nqn.2016-06.io.spdk:cnode1.')
p.add_argument('-t', '--tgt_name', help='The name of the parent NVMe-oF target (optional)', type=str)
p.set_defaults(func=delete_nvmf_subsystem)
p.set_defaults(func=nvmf_delete_subsystem)
def nvmf_subsystem_add_listener(args):
rpc.nvmf.nvmf_subsystem_add_listener(args.client,

5
scripts/rpc/nvmf.py
View File

@ -412,7 +412,8 @@ def nvmf_subsystem_allow_any_host(client, nqn, disable, tgt_name=None):
return client.call('nvmf_subsystem_allow_any_host', params)
def delete_nvmf_subsystem(client, nqn, tgt_name=None):
@deprecated_alias('delete_nvmf_subsystem')
def nvmf_delete_subsystem(client, nqn, tgt_name=None):
"""Delete an existing NVMe-oF subsystem.
Args:
@ -427,7 +428,7 @@ def delete_nvmf_subsystem(client, nqn, tgt_name=None):
if tgt_name:
params['tgt_name'] = tgt_name
return client.call('delete_nvmf_subsystem', params)
return client.call('nvmf_delete_subsystem', params)
def nvmf_get_stats(client, tgt_name=None):

2
scripts/spdkcli/ui_node_nvmf.py
View File

@ -72,7 +72,7 @@ class UINVMfSubsystems(UINode):
UINVMfSubsystem(subsystem, self)
def delete(self, subsystem_nqn):
self.get_root().delete_nvmf_subsystem(nqn=subsystem_nqn)
self.get_root().nvmf_delete_subsystem(nqn=subsystem_nqn)
def ui_command_create(self, nqn, serial_number=None,
max_namespaces=None, allow_any_host="false"):

4
scripts/spdkcli/ui_root.py
View File

@ -333,8 +333,8 @@ class UIRoot(UINode):
rpc.nvmf.nvmf_create_subsystem(self.client, **kwargs)
@verbose
def delete_nvmf_subsystem(self, **kwargs):
rpc.nvmf.delete_nvmf_subsystem(self.client, **kwargs)
def nvmf_delete_subsystem(self, **kwargs):
rpc.nvmf.nvmf_delete_subsystem(self.client, **kwargs)
@verbose
def nvmf_subsystem_add_listener(self, **kwargs):

2
test/fuzz/autofuzz_nvmf.sh
View File

@ -42,7 +42,7 @@ $rpc_py nvmf_subsystem_add_listener nqn.2016-06.io.spdk:cnode1 -t $TEST_TRANSPOR
$rootdir/test/app/fuzz/nvme_fuzz/nvme_fuzz -m 0xF0 -r "/var/tmp/nvme_fuzz" -t $TEST_TIMEOUT -C $testdir/nvmf_fuzz.conf -N -a 2>$output_dir/nvmf_autofuzz_logs.txt
rm -f $testdir/nvmf_fuzz.conf
$rpc_py delete_nvmf_subsystem nqn.2016-06.io.spdk:cnode1
$rpc_py nvmf_delete_subsystem nqn.2016-06.io.spdk:cnode1
trap - SIGINT SIGTERM EXIT

2
test/iscsi_tgt/nvme_remote/fio_remote_nvme.sh
View File

@ -97,7 +97,7 @@ trap - SIGINT SIGTERM EXIT
iscsicleanup
killprocess $iscsipid
$rpc_py delete_nvmf_subsystem nqn.2016-06.io.spdk:cnode1
$rpc_py nvmf_delete_subsystem nqn.2016-06.io.spdk:cnode1
report_test_completion "iscsi_nvme_remote"
iscsitestfini $1 $2

2
test/json_config/clear_config.py
View File

@ -71,7 +71,7 @@ def clear_bdev_subsystem(args, bdev_config):
def get_nvmf_destroy_method(nvmf):
delete_method_map = {'nvmf_create_subsystem': "delete_nvmf_subsystem"}
delete_method_map = {'nvmf_create_subsystem': "nvmf_delete_subsystem"}
try:
return delete_method_map[nvmf['method']]
except KeyError:

2
test/nvmf/host/aer.sh
View File

@ -44,7 +44,7 @@ wait $aerpid
$rpc_py bdev_malloc_delete Malloc0
$rpc_py bdev_malloc_delete Malloc1
$rpc_py delete_nvmf_subsystem nqn.2016-06.io.spdk:cnode1
$rpc_py nvmf_delete_subsystem nqn.2016-06.io.spdk:cnode1
trap - SIGINT SIGTERM EXIT

2
test/nvmf/host/bdevperf.sh
View File

@ -34,7 +34,7 @@ echo " TransportID \"trtype:$TEST_TRANSPORT adrfam:IPv4 subnqn:nqn.2016-06.io.s
$rootdir/test/bdev/bdevperf/bdevperf -c $testdir/bdevperf.conf -q 128 -o 4096 -w verify -t 1
sync
rm -rf $testdir/bdevperf.conf
$rpc_py delete_nvmf_subsystem nqn.2016-06.io.spdk:cnode1
$rpc_py nvmf_delete_subsystem nqn.2016-06.io.spdk:cnode1
trap - SIGINT SIGTERM EXIT

6
test/nvmf/host/fio.sh
View File

@ -41,7 +41,7 @@ traddr=$NVMF_FIRST_TARGET_IP trsvcid=$NVMF_PORT ns=1"
# second test mocking multiple SGL elements
fio_nvme $PLUGIN_DIR/mock_sgl_config.fio --filename="trtype=$TEST_TRANSPORT adrfam=IPv4 \
traddr=$NVMF_FIRST_TARGET_IP trsvcid=$NVMF_PORT ns=1"
$rpc_py delete_nvmf_subsystem nqn.2016-06.io.spdk:cnode1
$rpc_py nvmf_delete_subsystem nqn.2016-06.io.spdk:cnode1
if [ $RUN_NIGHTLY -eq 1 ]; then
# Test fio_plugin as host with nvme lvol backend
@ -55,7 +55,7 @@ if [ $RUN_NIGHTLY -eq 1 ]; then
$rpc_py nvmf_subsystem_add_listener nqn.2016-06.io.spdk:cnode2 -t $TEST_TRANSPORT -a $NVMF_FIRST_TARGET_IP -s $NVMF_PORT
fio_nvme $PLUGIN_DIR/example_config.fio --filename="trtype=$TEST_TRANSPORT adrfam=IPv4 \
traddr=$NVMF_FIRST_TARGET_IP trsvcid=$NVMF_PORT ns=1"
$rpc_py delete_nvmf_subsystem nqn.2016-06.io.spdk:cnode2
$rpc_py nvmf_delete_subsystem nqn.2016-06.io.spdk:cnode2
# Test fio_plugin as host with nvme lvol nested backend
ls_nested_guid=$($rpc_py bdev_lvol_create_lvstore --clear-method none lvs_0/lbd_0 lvs_n_0)
@ -66,7 +66,7 @@ if [ $RUN_NIGHTLY -eq 1 ]; then
$rpc_py nvmf_subsystem_add_listener nqn.2016-06.io.spdk:cnode3 -t $TEST_TRANSPORT -a $NVMF_FIRST_TARGET_IP -s $NVMF_PORT
fio_nvme $PLUGIN_DIR/example_config.fio --filename="trtype=$TEST_TRANSPORT adrfam=IPv4 \
traddr=$NVMF_FIRST_TARGET_IP trsvcid=$NVMF_PORT ns=1"
$rpc_py delete_nvmf_subsystem nqn.2016-06.io.spdk:cnode3
$rpc_py nvmf_delete_subsystem nqn.2016-06.io.spdk:cnode3
sync
# Delete lvol_bdev and destroy lvol_store.

2
test/nvmf/host/identify.sh
View File

@ -48,7 +48,7 @@ $rootdir/examples/nvme/identify/identify -r "\
trsvcid:$NVMF_PORT \
subnqn:nqn.2016-06.io.spdk:cnode1" -L all
sync
$rpc_py delete_nvmf_subsystem nqn.2016-06.io.spdk:cnode1
$rpc_py nvmf_delete_subsystem nqn.2016-06.io.spdk:cnode1
trap - SIGINT SIGTERM EXIT

4
test/nvmf/host/perf.sh
View File

@ -44,7 +44,7 @@ fi
$rootdir/examples/nvme/perf/perf -q 32 -o 4096 -w randrw -M 50 -t 1 -r "trtype:$TEST_TRANSPORT adrfam:IPv4 traddr:$NVMF_FIRST_TARGET_IP trsvcid:$NVMF_PORT"
$rootdir/examples/nvme/perf/perf -q 128 -o 262144 -w randrw -M 50 -t 2 -r "trtype:$TEST_TRANSPORT adrfam:IPv4 traddr:$NVMF_FIRST_TARGET_IP trsvcid:$NVMF_PORT"
sync
$rpc_py delete_nvmf_subsystem nqn.2016-06.io.spdk:cnode1
$rpc_py nvmf_delete_subsystem nqn.2016-06.io.spdk:cnode1
if [ $RUN_NIGHTLY -eq 1 ]; then
# Configure nvme devices with nvmf lvol_bdev backend
@ -81,7 +81,7 @@ if [ $RUN_NIGHTLY -eq 1 ]; then
done
# Delete subsystems, lvol_bdev and destroy lvol_store.
$rpc_py delete_nvmf_subsystem nqn.2016-06.io.spdk:cnode1
$rpc_py nvmf_delete_subsystem nqn.2016-06.io.spdk:cnode1
$rpc_py bdev_lvol_delete "$lb_nested_guid"
$rpc_py bdev_lvol_delete_lvstore -l lvs_n_0
$rpc_py bdev_lvol_delete "$lb_guid"

2
test/nvmf/target/bdev_io_wait.sh
View File

@ -42,7 +42,7 @@ wait $FLUSH_PID
wait $UNMAP_PID
rm -rf $testdir/bdevperf.conf
$rpc_py delete_nvmf_subsystem nqn.2016-06.io.spdk:cnode1
$rpc_py nvmf_delete_subsystem nqn.2016-06.io.spdk:cnode1
trap - SIGINT SIGTERM EXIT

2
test/nvmf/target/bdevio.sh
View File

@ -26,7 +26,7 @@ echo " TransportID \"trtype:$TEST_TRANSPORT adrfam:IPv4 subnqn:nqn.2016-06.io.s
$rootdir/test/bdev/bdevio/bdevio -c $testdir/bdevperf.conf
rm -rf $testdir/bdevperf.conf
$rpc_py delete_nvmf_subsystem nqn.2016-06.io.spdk:cnode1
$rpc_py nvmf_delete_subsystem nqn.2016-06.io.spdk:cnode1
trap - SIGINT SIGTERM EXIT

2
test/nvmf/target/create_transport.sh
View File

@ -36,7 +36,7 @@ nvme discover -t $TEST_TRANSPORT -a $NVMF_FIRST_TARGET_IP -s $NVMF_PORT
echo "Perform nvmf subsystem discovery via RPC"
$rpc_py nvmf_get_subsystems
$rpc_py delete_nvmf_subsystem nqn.2016-06.io.spdk:cnode1
$rpc_py nvmf_delete_subsystem nqn.2016-06.io.spdk:cnode1
for null_bdev in $null_bdevs; do
$rpc_py bdev_null_delete $null_bdev

2
test/nvmf/target/discovery.sh
View File

@ -35,7 +35,7 @@ echo "Perform nvmf subsystem discovery via RPC"
$rpc_py nvmf_get_subsystems
for i in $(seq 1 4); do
$rpc_py delete_nvmf_subsystem nqn.2016-06.io.spdk:cnode$i
$rpc_py nvmf_delete_subsystem nqn.2016-06.io.spdk:cnode$i
$rpc_py bdev_null_delete Null$i
done

2
test/nvmf/target/filesystem.sh
View File

@ -64,7 +64,7 @@ for incapsule in 0 4096; do
sync
nvme disconnect -n "nqn.2016-06.io.spdk:cnode1" || true
$rpc_py delete_nvmf_subsystem nqn.2016-06.io.spdk:cnode1
$rpc_py nvmf_delete_subsystem nqn.2016-06.io.spdk:cnode1
trap - SIGINT SIGTERM EXIT

2
test/nvmf/target/fio.sh
View File

@ -69,7 +69,7 @@ else
echo "nvmf hotplug test: fio failed as expected"
fi
$rpc_py delete_nvmf_subsystem nqn.2016-06.io.spdk:cnode1
$rpc_py nvmf_delete_subsystem nqn.2016-06.io.spdk:cnode1
rm -f ./local-job0-0-verify.state
rm -f ./local-job1-1-verify.state

2
test/nvmf/target/fuzz.sh
View File

@ -34,7 +34,7 @@ $rootdir/test/app/fuzz/nvme_fuzz/nvme_fuzz -m 0xF0 -r "/var/tmp/nvme_fuzz" -t 30
$rootdir/test/app/fuzz/nvme_fuzz/nvme_fuzz -m 0xF0 -r "/var/tmp/nvme_fuzz" -C $testdir/nvmf_fuzz.conf -j $rootdir/test/app/fuzz/nvme_fuzz/example.json -a 2>$output_dir/nvmf_fuzz_logs2.txt
rm -f $testdir/nvmf_fuzz.conf
$rpc_py delete_nvmf_subsystem nqn.2016-06.io.spdk:cnode1
$rpc_py nvmf_delete_subsystem nqn.2016-06.io.spdk:cnode1
trap - SIGINT SIGTERM EXIT

2
test/nvmf/target/initiator_timeout.sh
View File

@ -63,7 +63,7 @@ else
exit 1
fi
$rpc_py delete_nvmf_subsystem nqn.2016-06.io.spdk:cnode1
$rpc_py nvmf_delete_subsystem nqn.2016-06.io.spdk:cnode1
rm -f ./local-job0-0-verify.state

2
test/nvmf/target/multiconnection.sh
View File

@ -47,7 +47,7 @@ $rootdir/scripts/fio.py -p nvmf -i 262144 -d 64 -t randwrite -r 10
sync
for i in $(seq 1 $NVMF_SUBSYS); do
nvme disconnect -n "nqn.2016-06.io.spdk:cnode${i}" || true
$rpc_py delete_nvmf_subsystem nqn.2016-06.io.spdk:cnode${i}
$rpc_py nvmf_delete_subsystem nqn.2016-06.io.spdk:cnode${i}
done
rm -f ./local-job0-0-verify.state

2
test/nvmf/target/nvme_cli.sh
View File

@ -70,7 +70,7 @@ if [ -d $spdk_nvme_cli ]; then
fi
fi
$rpc_py delete_nvmf_subsystem nqn.2016-06.io.spdk:cnode1
$rpc_py nvmf_delete_subsystem nqn.2016-06.io.spdk:cnode1
trap - SIGINT SIGTERM EXIT
nvmftestfini

2
test/nvmf/target/nvmf_lvol.sh
View File

@ -58,7 +58,7 @@ $rpc_py bdev_lvol_inflate $clone
wait $perf_pid
# Clean up
$rpc_py delete_nvmf_subsystem nqn.2016-06.io.spdk:cnode0
$rpc_py nvmf_delete_subsystem nqn.2016-06.io.spdk:cnode0
$rpc_py bdev_lvol_delete $lvol
$rpc_py bdev_lvol_delete_lvstore -u $lvs

6
test/nvmf/target/rpc.sh
View File

@ -80,7 +80,7 @@ nvme connect -t $TEST_TRANSPORT -n nqn.2016-06.io.spdk:cnode1 -q nqn.2016-06.io.
waitforblk "nvme0n1"
nvme disconnect -n nqn.2016-06.io.spdk:cnode1
$rpc_py delete_nvmf_subsystem nqn.2016-06.io.spdk:cnode1
$rpc_py nvmf_delete_subsystem nqn.2016-06.io.spdk:cnode1
# do frequent add delete of namespaces with different nsid.
for i in $(seq 1 $times)
@ -96,7 +96,7 @@ do
nvme disconnect -n nqn.2016-06.io.spdk:cnode1
$rpc_py nvmf_subsystem_remove_ns nqn.2016-06.io.spdk:cnode1 5
$rpc_py delete_nvmf_subsystem nqn.2016-06.io.spdk:cnode1
$rpc_py nvmf_delete_subsystem nqn.2016-06.io.spdk:cnode1
done
@ -110,7 +110,7 @@ do
$rpc_py nvmf_subsystem_remove_ns nqn.2016-06.io.spdk:cnode1 1
$rpc_py delete_nvmf_subsystem nqn.2016-06.io.spdk:cnode1
$rpc_py nvmf_delete_subsystem nqn.2016-06.io.spdk:cnode1
done
stats=$($rpc_py nvmf_get_stats)

2
test/nvmf/target/srq_overwhelm.sh
View File

@ -43,7 +43,7 @@ sync
for i in $(seq 0 5); do
nvme disconnect -n "nqn.2016-06.io.spdk:cnode${i}"
$rpc_py delete_nvmf_subsystem nqn.2016-06.io.spdk:cnode$i
$rpc_py nvmf_delete_subsystem nqn.2016-06.io.spdk:cnode$i
done
trap - SIGINT SIGTERM EXIT