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

nvmf: use "nqn" rather than "subnqn" in RPC param

Browse Source 
This fixes the new nvmf_subsystem_add_listener RPC method to use "nqn"
as the parameter name to be consistent with the other NVMe-oF target RPC
methods.

Since this method is brand new, no provision for compatibility with the
old name is provided.

Fixes: 6336217e16 ("nvmf: Add rpc to add listeners to subsystems")
Change-Id: I86263fb1c53ed6ab48fe70917686d78a4a7ce28d
Signed-off-by: Daniel Verkamp <daniel.verkamp@intel.com>
Reviewed-on: https://review.gerrithub.io/398870
Tested-by: SPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Reviewed-by: Changpeng Liu <changpeng.liu@intel.com>
This commit is contained in:
Daniel Verkamp 2018-02-07 15:27:53 -07:00 committed by Jim Harris
parent 9ee661b493
commit 9f5970550c
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/nvmf_tgt/nvmf_rpc.c
View File

@ -542,7 +542,7 @@ invalid:
SPDK_RPC_REGISTER("delete_nvmf_subsystem", spdk_rpc_delete_nvmf_subsystem) SPDK_RPC_REGISTER("delete_nvmf_subsystem", spdk_rpc_delete_nvmf_subsystem)
struct nvmf_rpc_listener_ctx { struct nvmf_rpc_listener_ctx {
char *subnqn; char *nqn;
struct rpc_listen_address address; struct rpc_listen_address address;
struct spdk_jsonrpc_request *request; struct spdk_jsonrpc_request *request;
@ -551,14 +551,14 @@ struct nvmf_rpc_listener_ctx {
}; };
static const struct spdk_json_object_decoder nvmf_rpc_listener_decoder[] = { static const struct spdk_json_object_decoder nvmf_rpc_listener_decoder[] = {
{"subnqn", offsetof(struct nvmf_rpc_listener_ctx, subnqn), spdk_json_decode_string}, {"nqn", offsetof(struct nvmf_rpc_listener_ctx, nqn), spdk_json_decode_string},
{"listen_address", offsetof(struct nvmf_rpc_listener_ctx, address), decode_rpc_listen_address}, {"listen_address", offsetof(struct nvmf_rpc_listener_ctx, address), decode_rpc_listen_address},
}; };
static void static void
nvmf_rpc_listener_ctx_free(struct nvmf_rpc_listener_ctx *ctx) nvmf_rpc_listener_ctx_free(struct nvmf_rpc_listener_ctx *ctx)
{ {
free(ctx->subnqn); free(ctx->nqn);
free_rpc_listen_address(&ctx->address); free_rpc_listen_address(&ctx->address);
free(ctx); free(ctx);
} }
@ -646,9 +646,9 @@ nvmf_rpc_subsystem_add_listener(struct spdk_jsonrpc_request *request,
return; return;
} }
subsystem = spdk_nvmf_tgt_find_subsystem(g_tgt.tgt, ctx->subnqn); subsystem = spdk_nvmf_tgt_find_subsystem(g_tgt.tgt, ctx->nqn);
if (!subsystem) { if (!subsystem) {
SPDK_ERRLOG("Unable to find subsystem with NQN %s\n", ctx->subnqn); SPDK_ERRLOG("Unable to find subsystem with NQN %s\n", ctx->nqn);
spdk_jsonrpc_send_error_response(request, SPDK_JSONRPC_ERROR_INVALID_PARAMS, "Invalid parameters"); spdk_jsonrpc_send_error_response(request, SPDK_JSONRPC_ERROR_INVALID_PARAMS, "Invalid parameters");
nvmf_rpc_listener_ctx_free(ctx); nvmf_rpc_listener_ctx_free(ctx);
return; return;

4
doc/jsonrpc.md
View File

@ -351,7 +351,7 @@ Add a new listen address to an NVMe-oF subsystem.
Name | Optional | Type | Description Name | Optional | Type | Description
----------------------- | -------- | ----------- | ----------- ----------------------- | -------- | ----------- | -----------
subnqn | Required | string | Subsystem NQN nqn | Required | string | Subsystem NQN
listen_address | Required | object | @ref rpc_construct_nvmf_subsystem_listen_address object listen_address | Required | object | @ref rpc_construct_nvmf_subsystem_listen_address object
### Example ### Example
@ -364,7 +364,7 @@ Example request:
"id": 1, "id": 1,
"method": "nvmf_subsystem_add_listener", "method": "nvmf_subsystem_add_listener",
"params": { "params": {
"subnqn": "nqn.2016-06.io.spdk:cnode1", "nqn": "nqn.2016-06.io.spdk:cnode1",
"listen_address": { "listen_address": {
"trtype": "RDMA", "trtype": "RDMA",
"adrfam": "IPv4", "adrfam": "IPv4",

2
scripts/rpc/nvmf.py
View File

@ -52,7 +52,7 @@ def nvmf_subsystem_add_listener(args):
if args.adrfam: if args.adrfam:
listen_address['adrfam'] = args.adrfam listen_address['adrfam'] = args.adrfam
params = {'subnqn': args.nqn, params = {'nqn': args.nqn,
'listen_address': listen_address} 'listen_address': listen_address}
args.client.call('nvmf_subsystem_add_listener', params) args.client.call('nvmf_subsystem_add_listener', params)