ivampiresp/Spdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
fb9b29e732
Spdk/test/config_converter/test_converter.sh

30 lines
1.0 KiB
Bash
Raw Normal View History

scripts: add config converter Add a new script to enable converting old INI config files to the new JSON-RPC config file format. This prepares for deprecating the INI config file file format in the future. Change-Id: I0f2bfa9a585ce3537772b662d8e4028ab08a554d Signed-off-by: Pawel Kaminski <pawelx.kaminski@intel.com> Reviewed-on: https://review.gerrithub.io/420457 Tested-by: SPDK CI Jenkins <sys_sgci@intel.com> Chandler-Test-Pool: SPDK Automated Test System <sys_sgsw@intel.com> Reviewed-by: Ben Walker <benjamin.walker@intel.com> Reviewed-by: Jim Harris <james.r.harris@intel.com> Reviewed-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com> Reviewed-by: Karol Latecki <karol.latecki@intel.com>
2018-07-26 01:32:05 +00:00
#!/usr/bin/env bash
test/config_converter: Declare $rootdir, $testdir paths Make sure that $rootdir and $testdir are accessible in the sourced environment. This is to follow the convention seen throughout the entire repo and make sure that nothing that depends on these paths fails in case they are missing. Change-Id: Ie20754fc7aca7aab3636cb022499e9ff2f2dd30b Signed-off-by: Michal Berger <michalx.berger@intel.com> Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/777 Tested-by: SPDK CI Jenkins <sys_sgci@intel.com> Reviewed-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com> Reviewed-by: Darek Stojaczyk <dariusz.stojaczyk@intel.com>
2020-02-11 15:11:57 +00:00
testdir=$(readlink -f "$(dirname "$0")")
rootdir=$(readlink -f "$testdir/../../")
source "$rootdir/test/common/autotest_common.sh"
CONVERTER_DIR=$testdir
SPDK_BUILD_DIR=$rootdir
scripts: add config converter Add a new script to enable converting old INI config files to the new JSON-RPC config file format. This prepares for deprecating the INI config file file format in the future. Change-Id: I0f2bfa9a585ce3537772b662d8e4028ab08a554d Signed-off-by: Pawel Kaminski <pawelx.kaminski@intel.com> Reviewed-on: https://review.gerrithub.io/420457 Tested-by: SPDK CI Jenkins <sys_sgci@intel.com> Chandler-Test-Pool: SPDK Automated Test System <sys_sgsw@intel.com> Reviewed-by: Ben Walker <benjamin.walker@intel.com> Reviewed-by: Jim Harris <james.r.harris@intel.com> Reviewed-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com> Reviewed-by: Karol Latecki <karol.latecki@intel.com>
2018-07-26 01:32:05 +00:00
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
scripts/config_converter: skip sections not present in legacy config 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>
2021-01-12 11:37:04 +00:00
empty_json=$(echo "" | $SPDK_BUILD_DIR/scripts/config_converter.py | jq -c)
[[ ${empty_json} == '{"subsystems":[]}' ]]
test: shellcheck - apply rule SC2002 SC2002: Useless cat. Consider 'cmd < file | ..' or 'cmd file | ..' instead. Minor fix in test_converter: don't use python3 as config_converter.py is executable. Change-Id: I250e893b48fa95e94778dcc31deb91e6ac0b39c0 Signed-off-by: Pawel Kaminski <pawelx.kaminski@intel.com> Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/481600 Tested-by: SPDK CI Jenkins <sys_sgci@intel.com> Reviewed-by: Jim Harris <james.r.harris@intel.com> Reviewed-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com> Community-CI: SPDK CI Jenkins <sys_sgci@intel.com>
2020-01-14 12:03:17 +00:00
$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
scripts: add config converter Add a new script to enable converting old INI config files to the new JSON-RPC config file format. This prepares for deprecating the INI config file file format in the future. Change-Id: I0f2bfa9a585ce3537772b662d8e4028ab08a554d Signed-off-by: Pawel Kaminski <pawelx.kaminski@intel.com> Reviewed-on: https://review.gerrithub.io/420457 Tested-by: SPDK CI Jenkins <sys_sgci@intel.com> Chandler-Test-Pool: SPDK Automated Test System <sys_sgsw@intel.com> Reviewed-by: Ben Walker <benjamin.walker@intel.com> Reviewed-by: Jim Harris <james.r.harris@intel.com> Reviewed-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com> Reviewed-by: Karol Latecki <karol.latecki@intel.com>
2018-07-26 01:32:05 +00:00
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
Reference in New Issue Copy Permalink