From 6ee1f99b3f937b71222f81f1e3815957ac2b9cec Mon Sep 17 00:00:00 2001
From: Changpeng Liu <changpeng.liu@intel.com>
Date: Sun, 27 Jan 2019 23:52:39 -0500
Subject: [PATCH] nvmf: add TCP sample items to nvmf.conf.in

Change-Id: I99c8172b1ce1906b235b65dd5854372900b2bb0a
Signed-off-by: Changpeng Liu <changpeng.liu@intel.com>
Reviewed-on: https://review.gerrithub.io/c/442243
Reviewed-by: Maciej Szwed <maciej.szwed@intel.com>
Reviewed-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com>
Reviewed-by: Darek Stojaczyk <dariusz.stojaczyk@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Chandler-Test-Pool: SPDK Automated Test System <sys_sgsw@intel.com>
---
 etc/spdk/nvmf.conf.in | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/etc/spdk/nvmf.conf.in b/etc/spdk/nvmf.conf.in
index c57524a08..a706d94ef 100644
--- a/etc/spdk/nvmf.conf.in
+++ b/etc/spdk/nvmf.conf.in
@@ -66,8 +66,11 @@
   AcceptorPollRate 10000
 
 [Transport]
-  # Set a transport type, this is mandatory
+  # Users must set at least one transport type.
+  # Set RDMA transport type.
   Type RDMA
+  # Set TCP transport type.
+  Type TCP
 
   # Set the maximum number of outstanding I/O per queue.
   #MaxQueueDepth 128
@@ -110,6 +113,7 @@
   TransportID "trtype:PCIe traddr:0000:02:00.0" Nvme2
   TransportID "trtype:PCIe traddr:0000:03:00.0" Nvme3
   TransportID "trtype:RDMA traddr:192.168.100.8 trsvcid:4420 hostaddr:192.168.100.9" Nvme4
+  TransportID "trtype:TCP adrfam:IPv4 traddr:192.168.100.3 trsvcid:4420" Nvme5
 
   # The number of attempts per I/O when an I/O fails. Do not include
   # this key to get the default behavior.
@@ -177,7 +181,7 @@
 # Namespaces backed by physical NVMe devices
 [Subsystem1]
   NQN nqn.2016-06.io.spdk:cnode1
-  Listen RDMA 15.15.15.2:4420
+  Listen TCP 15.15.15.2:4420
   AllowAnyHost No
   Host nqn.2016-06.io.spdk:init
   SN SPDK00000000000001