Commit b7408943 authored by Maciej Szwed's avatar Maciej Szwed Committed by Darek Stojaczyk
Browse files

test/json: Fix json tests for NVMe with multiple namespaces 



Currently json tests try to remove NVMe controller for
each NVMe bdev, but with NVMe that has multiple namepsaces
it actually tries to remove same controller multiple times.
This patch fixes that issue.

Signed-off-by: default avatarMaciej Szwed <maciej.szwed@intel.com>
Change-Id: I555cb2a9aa78fd4cc700ddda0f5c1026329a2d3a
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/461561


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarDarek Stojaczyk <dariusz.stojaczyk@intel.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
Reviewed-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
parent 3fe30060

test/json_config/clear_config.py

+5 −18
Original line number Diff line number Diff line
@@ -30,23 +30,8 @@ def get_bdev_name(bdev): 
    return bdev_name





def delete_subbdevs(args, bdev, rpc_bdevs):

    ret_value = False

    bdev_name = get_bdev_name(bdev)

    if bdev_name and 'method' in bdev:

        construct_method = bdev['method']

        if construct_method == 'construct_nvme_bdev':

            for rpc_bdev in rpc_bdevs:

                if bdev_name in rpc_bdev['name'] and rpc_bdev['product_name'] == "NVMe disk":

                    args.client.call('delete_nvme_controller', {'name': "%s" % rpc_bdev['name'].split('n')[0]})

                    ret_value = True



    return ret_value





def get_bdev_destroy_method(bdev):

    destroy_method_map = {'construct_nvme_bdev': "delete_nvme_controller",

                          'construct_malloc_bdev': "delete_malloc_bdev",

    destroy_method_map = {'construct_malloc_bdev': "delete_malloc_bdev",

                          'construct_null_bdev': "delete_null_bdev",

                          'construct_rbd_bdev': "delete_rbd_bdev",

                          'construct_pmem_bdev': "delete_pmem_bdev",
@@ -71,14 +56,16 @@ def get_bdev_destroy_method(bdev): 
def clear_bdev_subsystem(args, bdev_config):

    rpc_bdevs = args.client.call("get_bdevs")

    for bdev in bdev_config:

        if delete_subbdevs(args, bdev, rpc_bdevs):

            continue

        bdev_name_key = get_bdev_name_key(bdev)

        bdev_name = get_bdev_name(bdev)

        destroy_method = get_bdev_destroy_method(bdev)

        if destroy_method:

            args.client.call(destroy_method, {bdev_name_key: bdev_name})



    nvme_controllers = args.client.call("get_nvme_controllers")

    for ctrlr in nvme_controllers:

        args.client.call('delete_nvme_controller', {'name': ctrlr['name']})



    ''' Disable and reset hotplug '''

    rpc.bdev.set_bdev_nvme_hotplug(args.client, False)