Commit a3e02469 authored by Konrad Sztyber's avatar Konrad Sztyber Committed by Tomasz Zawadzki
Browse files

test/json_config: skip undefined clear_*_subsystem methods 



Many subsystems don't need to clear their configurations in the
json_config test, so simply skip those that don't define a
clear_*_subsystem method.

Signed-off-by: default avatarKonrad Sztyber <konrad.sztyber@intel.com>
Change-Id: Ib0c2c6ec5504fc0bf7124a9f5eacbb64e4826081
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/21798


Reviewed-by: default avatarJim Harris <jim.harris@samsung.com>
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarAleksey Marchuk <alexeymar@nvidia.com>
parent d6641ee5

test/json_config/clear_config.py

+5 −31
Original line number Diff line number Diff line
@@ -142,18 +142,6 @@ def clear_ublk_subsystem(args, ublk_config): 
            args.client.call(destroy_method, {'ublk_device': ublk['params']['ublk_device']})





def clear_net_framework_subsystem(args, net_framework_config):

    pass





def clear_accel_subsystem(args, accel_config):

    pass





def clear_interface_subsystem(args, interface_config):

    pass





def clear_vhost_scsi_subsystem(args, vhost_config):

    for vhost in reversed(vhost_config):

        if 'method' in vhost:
@@ -174,22 +162,6 @@ def clear_vhost_blk_subsystem(args, vhost_config): 
                args.client.call("vhost_delete_controller", {'ctrlr': vhost['params']['ctrlr']})





def clear_vmd_subsystem(args, vmd_config):

    pass





def clear_sock_subsystem(args, sock_config):

    pass





def clear_scheduler_subsystem(args, scheduler_config):

    pass





def clear_iobuf_subsystem(args, config):

    pass





def call_test_cmd(func):

    def rpc_test_cmd(*args, **kwargs):

        try:
@@ -225,9 +197,11 @@ if __name__ == "__main__": 
        config = args.client.call('framework_get_config', {"name": args.subsystem})

        if config is None:

            return

        method = globals().get(f'clear_{args.subsystem}_subsystem')

        if method is not None:

            if args.verbose:

            print("Calling clear_%s_subsystem" % args.subsystem)

        globals()["clear_%s_subsystem" % args.subsystem](args, config)

                print(f'Calling {method.__name__}')

            method(args, config)



    p = subparsers.add_parser('clear_subsystem', help="""Clear configuration of SPDK subsystem using JSON RPC""")

    p.add_argument('--subsystem', help="""Subsystem name""")