Commit f0ab59a3 authored by Ben Walker's avatar Ben Walker
Browse files

nvmf: Include the JSON RPC server 



This allows live configuration of the target, much like
the iSCSI target. More function calls will be added
over time.

Also, make the tests wait until the target is listening
on the RPC port to determine that the target is ready.

Change-Id: I8f762e49511d482ef820f6b25a7d3ad9a8bb41f9
Signed-off-by: default avatarBen Walker <benjamin.walker@intel.com>
parent 5d219436

app/nvmf_tgt/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -59,6 +59,8 @@ SPDK_LIBS = \ 
	$(SPDK_ROOT_DIR)/lib/rpc/libspdk_rpc.a \

	$(SPDK_ROOT_DIR)/lib/jsonrpc/libspdk_jsonrpc.a \

	$(SPDK_ROOT_DIR)/lib/json/libspdk_json.a \

	$(SPDK_ROOT_DIR)/lib/event/rpc/libspdk_app_rpc.a \

	$(SPDK_ROOT_DIR)/lib/log/rpc/libspdk_log_rpc.a \



LIBS += $(BLOCKDEV_MODULES_LINKER_ARGS) \

        $(COPY_MODULES_LINKER_ARGS)

test/nvmf/common.sh

+1 −0
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ NVMF_PORT=4420 
NVMF_IP_PREFIX="192.168.100"

NVMF_IP_LEAST_ADDR=8

NVMF_FIRST_TARGET_IP=$NVMF_IP_PREFIX.$NVMF_IP_LEAST_ADDR

RPC_PORT=5260



function load_ib_rdma_modules()

{

test/nvmf/discovery/discovery.sh

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ nvmfpid=$! 


trap "killprocess $nvmfpid; exit 1" SIGINT SIGTERM EXIT



sleep 10

waitforlisten $nvmfpid ${RPC_PORT}



modprobe -v nvme-rdma

test/nvmf/filesystem/filesystem.sh

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ nvmfpid=$! 


trap "killprocess $nvmfpid; exit 1" SIGINT SIGTERM EXIT



sleep 5

waitforlisten $nvmfpid ${RPC_PORT}



modprobe -v nvme-rdma

test/nvmf/fio/fio.sh

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ nvmfpid=$! 


trap "killprocess $nvmfpid; exit 1" SIGINT SIGTERM EXIT



sleep 10

waitforlisten $nvmfpid ${RPC_PORT}



modprobe -v nvme-rdma