Commit 93fca0e7 authored by Pawel Kaminski's avatar Pawel Kaminski Committed by Daniel Verkamp
Browse files

test/json: Base bdevs test for bdev subsystem. 



   - load spdk_tgt with bdevs
   - check if json config is properly saved and loaded
   - check if all bdevs are properly loaded
   - check if configuration of spdk_tgt is properly set

Change-Id: I89226bc9c05880e73523fb189116e7433a513244
Signed-off-by: default avatarPawel Kaminski <pawelx.kaminski@intel.com>
Reviewed-on: https://review.gerrithub.io/406326


Tested-by: default avatarSPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: default avatarPawel Wodkowski <pawelx.wodkowski@intel.com>
Reviewed-by: default avatarDaniel Verkamp <daniel.verkamp@intel.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
Reviewed-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
parent 7fe37b86

autotest.sh

+3 −0
Original line number Diff line number Diff line
@@ -94,6 +94,9 @@ timing_enter lib 


if [ $SPDK_TEST_BLOCKDEV -eq 1 ]; then

	run_test test/bdev/blockdev.sh

	if [ $(uname -s) = Linux ]; then

		run_test test/bdev/bdevjson/json_config.sh

	fi

fi



if [ $SPDK_TEST_EVENT -eq 1 ]; then

test/bdev/bdevjson/json_config.sh

0 → 100755
+27 −0
Original line number Diff line number Diff line 
#!/usr/bin/env bash

set -ex

BDEV_JSON_DIR=$(readlink -f $(dirname $0))

. $BDEV_JSON_DIR/../../json_config/common.sh



function test_subsystems() {

	run_spdk_tgt

	rootdir=$(readlink -f $BDEV_JSON_DIR/../../..)



	rpc_py="$spdk_rpc_py"

	clear_config_py="$spdk_clear_config_py"

	load_nvme

	create_bdev_subsystem_config

	test_json_config



	clear_bdev_subsystem_config

	test_global_params

	kill_targets

}



timing_enter json_config

trap 'on_error_exit "${FUNCNAME}" "${LINENO}"' ERR



test_subsystems



timing_exit json_config

report_test_completion json_config

test/common/autotest_common.sh

+4 −0
Original line number Diff line number Diff line
@@ -6,6 +6,10 @@ fi 


set -e



# Export flag to skip the known bug that exists in librados

# Bug is reported on ceph bug tracker with number 24078

export ASAN_OPTIONS=new_delete_type_mismatch=0



PS4=' \t	\$ '

ulimit -c unlimited

test/json_config/common.sh

0 → 100644
+141 −0
Original line number Diff line number Diff line 
JSON_DIR=$(readlink -f $(dirname ${BASH_SOURCE[0]}))

SPDK_BUILD_DIR=$JSON_DIR/../../

source $JSON_DIR/../common/autotest_common.sh



spdk_rpc_py="python $SPDK_BUILD_DIR/scripts/rpc.py"

spdk_clear_config_py="$JSON_DIR/clear_config.py"

base_json_config=$JSON_DIR/base_config.json

last_json_config=$JSON_DIR/last_config.json

full_config=$JSON_DIR/full_config.json

base_bdevs=$JSON_DIR/bdevs_base.txt

last_bdevs=$JSON_DIR/bdevs_last.txt

tmp_config=$JSON_DIR/tmp_config.json

null_json_config=$JSON_DIR/null_json_config.json



function run_spdk_tgt() {

	echo "Running spdk target"

	$SPDK_BUILD_DIR/app/spdk_tgt/spdk_tgt -m 0x1 -p 0 -s 1024 -w &

	spdk_tgt_pid=$!



	echo "Waiting for app to run..."

	waitforlisten $spdk_tgt_pid

	echo "spdk_tgt started - pid=$spdk_tgt_pid but waits for subsystem initialization"



	echo ""

}



function load_nvme() {

	echo '{"subsystems": [' > nvme_config.json

	$SPDK_BUILD_DIR/scripts/gen_nvme.sh --json >> nvme_config.json

	echo ']}' >> nvme_config.json

	$rpc_py load_config -f nvme_config.json

	rm nvme_config.json

}



function kill_targets() {

	killprocess $spdk_tgt_pid

}



# This function test if json config was properly saved and loaded.

# 1. Get a list of bdevs and save it to the file "base_bdevs".

# 2. Save only configuration of the running spdk_tgt to the file "base_json_config"

#    (global parameters are not saved).

# 3. Clear configuration of the running spdk_tgt.

# 4. Save only configuration of the running spdk_tgt to the file "null_json_config"

#    (global parameters are not saved).

# 5. Check if configuration of the running spdk_tgt is cleared by checking

#    if the file "null_json_config" doesn't have any configuration.

# 6. Load the file "base_json_config" to the running spdk_tgt.

# 7. Get a list of bdevs and save it to the file "last_bdevs".

# 8. Save only configuration of the running spdk_tgt to the file "last_json_config".

# 9. Check if the file "base_json_config" matches the file "last_json_config".

# 10. Check if the file "base_bdevs" matches the file "last_bdevs".

# 11. Remove all files.

function test_json_config() {

	$rpc_py get_bdevs | jq '.|sort_by(.name)' > $base_bdevs

	$rpc_py save_config -f $full_config

	$JSON_DIR/config_filter.py -method "delete_global_parameters" -filename $full_config > $base_json_config

	$clear_config_py clear_config

	$rpc_py save_config -f $tmp_config

	$JSON_DIR/config_filter.py -method "delete_global_parameters" -filename $tmp_config > $null_json_config

	if [ "[]" != "$(jq '.subsystems | map(select(.config != null)) | map(select(.config != []))' $null_json_config)" ]; then

		echo "Config has not been cleared"

		return 1

	fi

	$rpc_py load_config -f $base_json_config

	$rpc_py get_bdevs | jq '.|sort_by(.name)' > $last_bdevs

	$rpc_py save_config -f $tmp_config

	$JSON_DIR/config_filter.py -method "delete_global_parameters" -filename $tmp_config > $last_json_config

	diff $base_json_config $last_json_config

	diff $base_bdevs $last_bdevs

	remove_config_files_after_test_json_config

}



function remove_config_files_after_test_json_config() {

	rm $last_bdevs $base_bdevs

	rm $last_json_config $base_json_config

	rm $tmp_config $full_config $null_json_config

}



function create_bdev_subsystem_config() {

	$rpc_py construct_split_vbdev Nvme0n1 2

	$rpc_py construct_null_bdev Null0 32 512

	$rpc_py construct_malloc_bdev 128 512 --name Malloc0

	$rpc_py construct_malloc_bdev 64 4096 --name Malloc1

	$rpc_py construct_malloc_bdev 8 1024 --name Malloc2

	$rpc_py construct_error_bdev Malloc2

	if [ $(uname -s) = Linux ]; then

		dd if=/dev/zero of=/tmp/sample_aio bs=2048 count=5000

		$rpc_py construct_aio_bdev /tmp/sample_aio aio_disk 1024

	fi

	$rpc_py construct_lvol_store -c 1048576 Nvme0n1p0 lvs_test

	$rpc_py construct_lvol_bdev -l lvs_test lvol0 32

	$rpc_py construct_lvol_bdev -l lvs_test -t lvol1 32

	$rpc_py snapshot_lvol_bdev lvs_test/lvol0 snapshot0

	$rpc_py clone_lvol_bdev lvs_test/snapshot0 clone0

}



function clear_bdev_subsystem_config() {

	$rpc_py destroy_lvol_bdev lvs_test/clone0

	$rpc_py destroy_lvol_bdev lvs_test/lvol0

	$rpc_py destroy_lvol_bdev lvs_test/snapshot0

	$rpc_py destroy_lvol_store -l lvs_test

	$clear_config_py clear_config

	if [ $(uname -s) = Linux ]; then

		rm -f /tmp/sample_aio

	fi

}



# 1. Save current spdk config to full_config

#    and save only global parameters to the file "base_json_config".

# 2. Exit the running spdk_tgt.

# 3. Start the spdk_tgt and it waits for loading config.

# 4. Load global parameters and configuration to the spdktgt from the file full_config.

# 5. Save json config to the file "full_config".

# 6. Save only global parameters to the file "last_json_config".

# 7. Check if the file "base_json_config" matches the file "last_json_config".

# 8. Delete all files.

function test_global_params() {

	$rpc_py save_config -f $full_config

	python $JSON_DIR/config_filter.py -method "delete_configs" -filename $full_config > $base_json_config

	killprocess $spdk_tgt_pid

	run_spdk_tgt

	$rpc_py load_config -f $full_config

	$rpc_py save_config -f $full_config

	python $JSON_DIR/config_filter.py -method "delete_configs" -filename $full_config > $last_json_config

	diff $base_json_config $last_json_config

	rm $base_json_config $last_json_config

	rm $full_config

}



function on_error_exit() {

	set +e

	echo "Error on $1 - $2"

	remove_config_files_after_test_json_config

	rpc_py="$spdk_rpc_py"

	clear_config_py="$spdk_clear_config_py"

	clear_bdev_subsystem_config

	killprocess $spdk_tgt_pid

	print_backtrace

	exit 1

}

test/json_config/config_filter.py

0 → 100755
+44 −0
Original line number Diff line number Diff line 
#!/usr/bin/python

import json

import argparse





def filter_methods(filename, do_remove_startup_rpcs):

    startup_rpcs = [

        'set_iscsi_options',

        'set_nvmf_target_config',

        'set_nvmf_target_options',

        'set_bdev_options'

    ]



    with open(filename) as json_file:

        data = json.loads(json_file.read())

    out = {'subsystems': []}

    for s in data['subsystems']:

        if s['config']:

            s_config = []

            for config in s['config']:

                m_name = config['method']

                is_startup_rpc = m_name in startup_rpcs

                if do_remove_startup_rpcs != is_startup_rpc:

                    s_config.append(config)

        else:

            s_config = None

        out['subsystems'].append({

            'subsystem': s['subsystem'],

            'config': s_config,

        })



    print json.dumps(out, indent=2)





if __name__ == "__main__":

    parser = argparse.ArgumentParser()

    parser.add_argument('-method', dest='method')

    parser.add_argument('-filename', dest='filename')



    args = parser.parse_args()

    if args.method == "delete_global_parameters":

        filter_methods(args.filename, True)

    if args.method == "delete_configs":

        filter_methods(args.filename, False)