Commit 8486e38d authored by Daniel Verkamp's avatar Daniel Verkamp
Browse files

nvmf/rpc: add trtype alias for transport names 



Use "trtype" to represent transport types in nvmf_tgt RPCs for
consistency with the NVMe-oF spec and other SPDK RPCs.

The current "transport" names are still supported for compatibility with
existing RPC users.

Change-Id: Ib03dda384dc01a41a18c06c56baff16b82d36c00
Signed-off-by: default avatarDaniel Verkamp <daniel.verkamp@intel.com>
Reviewed-on: https://review.gerrithub.io/367422


Tested-by: default avatarSPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
parent 37a7ff0f

app/nvmf_tgt/conf.c

+5 −0
Original line number Diff line number Diff line
@@ -509,6 +509,11 @@ spdk_nvmf_construct_subsystem(const char *name, 
			}

		}



		if (addresses[i].transport == NULL) {

			SPDK_ERRLOG("Missing listen address transport type\n");

			goto error;

		}



		listen_addr = spdk_nvmf_tgt_listen(addresses[i].transport,

						   addresses[i].traddr, addresses[i].trsvcid);

		if (listen_addr == NULL) {

app/nvmf_tgt/nvmf_rpc.c

+6 −1
Original line number Diff line number Diff line
@@ -79,8 +79,11 @@ dump_nvmf_subsystem(struct spdk_json_write_ctx *w, struct nvmf_tgt_subsystem *tg 
	TAILQ_FOREACH(allowed_listener, &subsystem->allowed_listeners, link) {

		listen_addr = allowed_listener->listen_addr;

		spdk_json_write_object_begin(w);

		/* NOTE: "transport" is kept for compatibility; new code should use "trtype" */

		spdk_json_write_name(w, "transport");

		spdk_json_write_string(w, listen_addr->trname);

		spdk_json_write_name(w, "trtype");

		spdk_json_write_string(w, listen_addr->trname);

		spdk_json_write_name(w, "traddr");

		spdk_json_write_string(w, listen_addr->traddr);

		spdk_json_write_name(w, "trsvcid");
@@ -174,7 +177,9 @@ struct rpc_listen_addresses { 
};



static const struct spdk_json_object_decoder rpc_listen_address_decoders[] = {

	{"transport", offsetof(struct rpc_listen_address, transport), spdk_json_decode_string},

	/* NOTE: "transport" is kept for compatibility; new code should use "trtype" */

	{"transport", offsetof(struct rpc_listen_address, transport), spdk_json_decode_string, true},

	{"trtype", offsetof(struct rpc_listen_address, transport), spdk_json_decode_string, true},

	{"traddr", offsetof(struct rpc_listen_address, traddr), spdk_json_decode_string},

	{"trsvcid", offsetof(struct rpc_listen_address, trsvcid), spdk_json_decode_string},

};

scripts/rpc.py

+3 −3
Original line number Diff line number Diff line
@@ -427,9 +427,9 @@ p = subparsers.add_parser('construct_nvmf_subsystem', help='Add a nvmf subsystem 
p.add_argument("-c", "--core", help='The core Nvmf target run on', type=int, default=-1)

p.add_argument('mode', help='Target mode: Virtual or Direct')

p.add_argument('nqn', help='Target nqn(ASCII)')

p.add_argument('listen', help="""comma-separated list of Listen <transport:transport_name traddr:address trsvcid:port_id> pairs enclosed

in quotes.  Format:  'transport:transport0 traddr:traddr0 trsvcid:trsvcid0,transport:transport1 traddr:traddr1 trsvcid:trsvcid1' etc

Example: 'transport:RDMA traddr:192.168.100.8 trsvcid:4420,transport:RDMA traddr:192.168.100.9 trsvcid:4420'""")

p.add_argument('listen', help="""comma-separated list of Listen <trtype:transport_name traddr:address trsvcid:port_id> pairs enclosed

in quotes.  Format:  'trtype:transport0 traddr:traddr0 trsvcid:trsvcid0,trtype:transport1 traddr:traddr1 trsvcid:trsvcid1' etc

Example: 'trtype:RDMA traddr:192.168.100.8 trsvcid:4420,trtype:RDMA traddr:192.168.100.9 trsvcid:4420'""")

p.add_argument('hosts', help="""Whitespace-separated list of host nqn list.

Format:  'nqn1 nqn2' etc

Example: 'nqn.2016-06.io.spdk:init nqn.2016-07.io.spdk:init'""")

test/iscsi_tgt/nvme_remote/fio_remote_nvme.sh

+1 −1
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ trap "killprocess $nvmfpid; exit 1" SIGINT SIGTERM EXIT 
waitforlisten $nvmfpid 5260

echo "NVMf target has started."

bdevs=$($rpc_py construct_malloc_bdev 64 512)

$rpc_py construct_nvmf_subsystem Virtual nqn.2016-06.io.spdk:cnode1 "transport:RDMA traddr:$NVMF_FIRST_TARGET_IP trsvcid:4420" "" -s SPDK00000000000001 -n "$bdevs"

$rpc_py construct_nvmf_subsystem Virtual nqn.2016-06.io.spdk:cnode1 "trtype:RDMA traddr:$NVMF_FIRST_TARGET_IP trsvcid:4420" "" -s SPDK00000000000001 -n "$bdevs"

echo "NVMf subsystem created."



timing_enter start_iscsi_tgt

test/nvmf/discovery/discovery.sh

+2 −2
Original line number Diff line number Diff line
@@ -38,8 +38,8 @@ bdevs="$bdevs $($rpc_py construct_null_bdev Null1 $NULL_BDEV_SIZE $NULL_BLOCK_SI 


modprobe -v nvme-rdma



$rpc_py construct_nvmf_subsystem Direct nqn.2016-06.io.spdk:cnode1 "transport:RDMA traddr:$NVMF_FIRST_TARGET_IP trsvcid:4420" "" -p "*"

$rpc_py construct_nvmf_subsystem Virtual nqn.2016-06.io.spdk:cnode2 "transport:RDMA traddr:$NVMF_FIRST_TARGET_IP trsvcid:4420" "" -s SPDK00000000000001 -n "$bdevs"

$rpc_py construct_nvmf_subsystem Direct nqn.2016-06.io.spdk:cnode1 "trtype:RDMA traddr:$NVMF_FIRST_TARGET_IP trsvcid:4420" "" -p "*"

$rpc_py construct_nvmf_subsystem Virtual nqn.2016-06.io.spdk:cnode2 "trtype:RDMA traddr:$NVMF_FIRST_TARGET_IP trsvcid:4420" "" -s SPDK00000000000001 -n "$bdevs"



nvme discover -t rdma -a $NVMF_FIRST_TARGET_IP -s $NVMF_PORT