a9a0761bcc
Sections 'Nvme', 'Nvmf', 'Bdev' and 'iSCSI' were always present in the output of config_converter. Even when they were not present in the legacy config. This posed an issue with iSCSI section. Support for iscsi_set_options is part of lib/iscsi, that is not compiled with all applications (such as nvmf_tgt). Fixes #1741 This patch checks if there is corresponding section in the legacy config, and only then presents the JSON output. Added test to verify output from empty legacy config. Signed-off-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com> Change-Id: Ief94e92115dbd80c890dcb434b7c6d5376421c9e Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/5879 Community-CI: Broadcom CI Community-CI: Mellanox Build Bot Tested-by: SPDK CI Jenkins <sys_sgci@intel.com> Reviewed-by: Jim Harris <james.r.harris@intel.com> Reviewed-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com> Reviewed-by: <dongx.yi@intel.com>
30 lines
1.0 KiB
Bash
Executable File
30 lines
1.0 KiB
Bash
Executable File
#!/usr/bin/env bash
|
|
testdir=$(readlink -f "$(dirname "$0")")
|
|
rootdir=$(readlink -f "$testdir/../../")
|
|
source "$rootdir/test/common/autotest_common.sh"
|
|
|
|
CONVERTER_DIR=$testdir
|
|
SPDK_BUILD_DIR=$rootdir
|
|
|
|
function test_cleanup() {
|
|
rm -f $CONVERTER_DIR/config_converter.json $CONVERTER_DIR/config_virtio_converter.json
|
|
}
|
|
|
|
function on_error_exit() {
|
|
set +e
|
|
test_cleanup
|
|
print_backtrace
|
|
exit 1
|
|
}
|
|
|
|
trap 'on_error_exit' ERR
|
|
|
|
empty_json=$(echo "" | $SPDK_BUILD_DIR/scripts/config_converter.py | jq -c)
|
|
[[ ${empty_json} == '{"subsystems":[]}' ]]
|
|
|
|
$SPDK_BUILD_DIR/scripts/config_converter.py < $CONVERTER_DIR/config.ini > $CONVERTER_DIR/config_converter.json
|
|
$SPDK_BUILD_DIR/scripts/config_converter.py < $CONVERTER_DIR/config_virtio.ini > $CONVERTER_DIR/config_virtio_converter.json
|
|
diff -I "cpumask" -I "max_queue_depth" -I "queue_depth" <(jq -S . $CONVERTER_DIR/config_converter.json) <(jq -S . $CONVERTER_DIR/spdk_config.json)
|
|
diff <(jq -S . $CONVERTER_DIR/config_virtio_converter.json) <(jq -S . $CONVERTER_DIR/spdk_config_virtio.json)
|
|
test_cleanup
|