From b5005497db69ba80b981015f382f7faa557c3561 Mon Sep 17 00:00:00 2001 From: Allen Zhu Date: Tue, 4 Aug 2020 10:24:41 +0300 Subject: [PATCH] rpc/nvmf.py: pass zero values to SPDK when allowed in_capsule_data_size/buf_cache_size/sock_priority/max_namespaces can be 0, which should be passed in nvmf_create_transport/nvmf_create_subsystem commands. Signed-off-by: Allen Zhu Signed-off-by: Alexey Marchuk Signed-off-by: Evgeniy Kochetov Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/3815 (master) (cherry picked from commit 96ab62802ca344c5b04c249855e1d13095908f32) Change-Id: Ib557cf9f20f7ec2c0b3c31156cd79dbd670ce7e7 Signed-off-by: Tomasz Zawadzki Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/4921 Reviewed-by: Aleksey Marchuk Reviewed-by: Changpeng Liu Reviewed-by: Allen Zhu Tested-by: SPDK CI Jenkins --- scripts/rpc/nvmf.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/rpc/nvmf.py b/scripts/rpc/nvmf.py index 363f2c9c0..aa715a179 100644 --- a/scripts/rpc/nvmf.py +++ b/scripts/rpc/nvmf.py @@ -146,7 +146,7 @@ def nvmf_create_transport(client, params['max_qpairs_per_ctrlr'] = max_qpairs_per_ctrlr if max_io_qpairs_per_ctrlr: params['max_io_qpairs_per_ctrlr'] = max_io_qpairs_per_ctrlr - if in_capsule_data_size: + if in_capsule_data_size is not None: params['in_capsule_data_size'] = in_capsule_data_size if max_io_size: params['max_io_size'] = max_io_size @@ -156,7 +156,7 @@ def nvmf_create_transport(client, params['max_aq_depth'] = max_aq_depth if num_shared_buffers: params['num_shared_buffers'] = num_shared_buffers - if buf_cache_size: + if buf_cache_size is not None: params['buf_cache_size'] = buf_cache_size if max_srq_depth: params['max_srq_depth'] = max_srq_depth @@ -166,7 +166,7 @@ def nvmf_create_transport(client, params['c2h_success'] = c2h_success if dif_insert_or_strip: params['dif_insert_or_strip'] = dif_insert_or_strip - if sock_priority: + if sock_priority is not None: params['sock_priority'] = sock_priority if acceptor_backlog is not None: params['acceptor_backlog'] = acceptor_backlog @@ -254,7 +254,7 @@ def nvmf_create_subsystem(client, if allow_any_host: params['allow_any_host'] = True - if max_namespaces: + if max_namespaces is not None: params['max_namespaces'] = max_namespaces if tgt_name: