Commit f19c5a58 authored by Jacek Kalwas's avatar Jacek Kalwas Committed by Tomasz Zawadzki
Browse files

rpc: prepare _add_ns for transport specific opts 



Change-Id: I163409972dfcde5639593cedd1b106f42cdb72fe
Signed-off-by: default avatarJacek Kalwas <jacek.kalwas@intel.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/22294


Community-CI: Mellanox Build Bot
Reviewed-by: default avatarKonrad Sztyber <konrad.sztyber@intel.com>
Reviewed-by: default avatarJim Harris <jim.harris@samsung.com>
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
parent c00eb482

python/spdk/rpc/nvmf.py

+6 −34
Original line number Diff line number Diff line
@@ -447,16 +447,8 @@ def nvmf_discovery_get_referrals(client, tgt_name=None): 
    return client.call('nvmf_discovery_get_referrals', params)





def nvmf_subsystem_add_ns(client,

                          nqn,

                          bdev_name,

                          tgt_name=None,

                          ptpl_file=None,

                          nsid=None,

                          nguid=None,

                          eui64=None,

                          uuid=None,

                          anagrpid=None):

def nvmf_subsystem_add_ns(client, **params):



    """Add a namespace to a subsystem.



    Args:
@@ -472,31 +464,11 @@ def nvmf_subsystem_add_ns(client, 
    Returns:

        The namespace ID

    """

    ns = {'bdev_name': bdev_name}



    if ptpl_file:

        ns['ptpl_file'] = ptpl_file



    if nsid:

        ns['nsid'] = nsid



    if nguid:

        ns['nguid'] = nguid



    if eui64:

        ns['eui64'] = eui64



    if uuid:

        ns['uuid'] = uuid



    if anagrpid:

        ns['anagrpid'] = anagrpid



    params = {'nqn': nqn,

              'namespace': ns}



    if tgt_name:

        params['tgt_name'] = tgt_name

    strip_globals(params)

    apply_defaults(params, tgt_name=None)

    group_as(params, 'namespace', ['bdev_name', 'ptpl_file', 'nsid', 'nguid', 'eui64', 'uuid', 'anagrpid'])

    remove_null(params)



    return client.call('nvmf_subsystem_add_ns', params)

scripts/rpc.py

+1 −10
Original line number Diff line number Diff line
@@ -2661,16 +2661,7 @@ Format: 'user:u1 secret:s1 muser:mu1 msecret:ms1,user:u2 secret:s2 muser:mu2 mse 
    p.set_defaults(func=nvmf_discovery_get_referrals)



    def nvmf_subsystem_add_ns(args):

        rpc.nvmf.nvmf_subsystem_add_ns(args.client,

                                       nqn=args.nqn,

                                       bdev_name=args.bdev_name,

                                       tgt_name=args.tgt_name,

                                       ptpl_file=args.ptpl_file,

                                       nsid=args.nsid,

                                       nguid=args.nguid,

                                       eui64=args.eui64,

                                       uuid=args.uuid,

                                       anagrpid=args.anagrpid)

        rpc.nvmf.nvmf_subsystem_add_ns(**vars(args))



    p = subparsers.add_parser('nvmf_subsystem_add_ns', help='Add a namespace to an NVMe-oF subsystem')

    p.add_argument('nqn', help='NVMe-oF subsystem NQN')