Commit ecb6d9ff authored by Eugene Kobyak's avatar Eugene Kobyak Committed by Tomasz Zawadzki
Browse files

python/rpc: Set name for fabrics-timeout parameter 



Change name of fabrics-timeout to fabrics_connect_timeout_us in
bdev_nvme_attach_controller rpc function.
This name used in documentation and in C implementation

Change-Id: I8621cba460734cd69eee397c07e3c8ffba16f279
Signed-off-by: default avatarEugene Kobyak <eugene.kobyak@intel.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/23499


Reviewed-by: default avatarTomasz Zawadzki <tomasz.zawadzki@intel.com>
Reviewed-by: default avatarJim Harris <jim.harris@samsung.com>
Reviewed-by: default avatarKrzysztof Karas <krzysztof.karas@intel.com>
Community-CI: Mellanox Build Bot
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
parent f9eb3739

python/spdk/rpc/bdev.py

+7 −7
Original line number Diff line number Diff line
@@ -779,10 +779,10 @@ def bdev_nvme_set_hotplug(client, enable, period_us=None): 
def bdev_nvme_attach_controller(client, name, trtype, traddr, adrfam=None, trsvcid=None,

                                priority=None, subnqn=None, hostnqn=None, hostaddr=None,

                                hostsvcid=None, prchk_reftag=None, prchk_guard=None,

                                hdgst=None, ddgst=None, fabrics_timeout=None, multipath=None, num_io_queues=None,

                                ctrlr_loss_timeout_sec=None, reconnect_delay_sec=None,

                                fast_io_fail_timeout_sec=None, psk=None, max_bdevs=None,

                                dhchap_key=None, dhchap_ctrlr_key=None):

                                hdgst=None, ddgst=None, fabrics_connect_timeout_us=None,

                                multipath=None, num_io_queues=None, ctrlr_loss_timeout_sec=None,

                                reconnect_delay_sec=None, fast_io_fail_timeout_sec=None,

                                psk=None, max_bdevs=None, dhchap_key=None, dhchap_ctrlr_key=None):

    """Construct block device for each NVMe namespace in the attached controller.



    Args:
@@ -800,7 +800,7 @@ def bdev_nvme_attach_controller(client, name, trtype, traddr, adrfam=None, trsvc 
        prchk_guard: Enable checking of PI guard for I/O processing (optional)

        hdgst: Enable TCP header digest (optional)

        ddgst: Enable TCP data digest (optional)

        fabrics_timeout: Fabrics connect timeout in us (optional)

        fabrics_connect_timeout_us: Fabrics connect timeout in us (optional)

        multipath: The behavior when multiple paths are created ("disable", "failover", or "multipath"; failover if not specified)

        num_io_queues: The number of IO queues to request during initialization. (optional)

        ctrlr_loss_timeout_sec: Time to wait until ctrlr is reconnected before deleting ctrlr.
@@ -862,8 +862,8 @@ def bdev_nvme_attach_controller(client, name, trtype, traddr, adrfam=None, trsvc 
    if ddgst:

        params['ddgst'] = ddgst



    if fabrics_timeout:

        params['fabrics_connect_timeout_us'] = fabrics_timeout

    if fabrics_connect_timeout_us:

        params['fabrics_connect_timeout_us'] = fabrics_connect_timeout_us



    if multipath:

        params['multipath'] = multipath

scripts/rpc.py

+3 −2
Original line number Diff line number Diff line
@@ -702,7 +702,7 @@ if __name__ == "__main__": 
                                                         prchk_guard=args.prchk_guard,

                                                         hdgst=args.hdgst,

                                                         ddgst=args.ddgst,

                                                         fabrics_timeout=args.fabrics_timeout,

                                                         fabrics_connect_timeout_us=args.fabrics_connect_timeout_us,

                                                         multipath=args.multipath,

                                                         num_io_queues=args.num_io_queues,

                                                         ctrlr_loss_timeout_sec=args.ctrlr_loss_timeout_sec,
@@ -739,7 +739,8 @@ if __name__ == "__main__": 
                   help='Enable TCP header digest.', action='store_true')

    p.add_argument('-d', '--ddgst',

                   help='Enable TCP data digest.', action='store_true')

    p.add_argument('--fabrics-timeout', type=int, help='Fabrics connect timeout in microseconds')

    p.add_argument('--fabrics-timeout', type=int, help='Fabrics connect timeout in microseconds',

                   dest="fabrics_connect_timeout_us")

    p.add_argument('-x', '--multipath', help='Set multipath behavior (disable, failover, multipath)')

    p.add_argument('--num-io-queues', type=int, help='Set the number of IO queues to request during initialization.')

    p.add_argument('-l', '--ctrlr-loss-timeout-sec',