ivampiresp/Spdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
v18.10.1-oracle
Spdk/test/iscsi_tgt/iscsijson/json_config.sh

44 lines
1.4 KiB
Bash
Raw Permalink Normal View History

test/json: Tests for iscsi subsystems. Change-Id: I7053dca9cc6f2ef09566ba2bf8338f7f4c92ebf0 Signed-off-by: Pawel Niedzwiecki <pawelx.niedzwiecki@intel.com> Reviewed-on: https://review.gerrithub.io/416745 Tested-by: SPDK CI Jenkins <sys_sgci@intel.com> Reviewed-by: Pawel Kaminski <pawelx.kaminski@intel.com> Reviewed-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com> Reviewed-by: Ben Walker <benjamin.walker@intel.com> Chandler-Test-Pool: SPDK Automated Test System <sys_sgsw@intel.com>
2018-06-25 18:57:06 +00:00
#!/usr/bin/env bash
set -xe
ISCSI_JSON_DIR=$(readlink -f $(dirname $0))
. $ISCSI_JSON_DIR/../../json_config/common.sh
. $JSON_DIR/../iscsi_tgt/common.sh
base_iscsi_config=$JSON_DIR/base_iscsi_config.json
last_iscsi_config=$JSON_DIR/last_iscsi_config.json
rpc_py="$spdk_rpc_py"
clear_config_py="$spdk_clear_config_py"
trap 'on_error_exit "${FUNCNAME}" "${LINENO}"; rm -f $base_iscsi_config $last_iscsi_config' ERR
timing_enter iscsi_json_config
run_spdk_tgt
$rpc_py start_subsystem_init
timing_enter iscsi_json_config_create_setup
$rpc_py add_portal_group $PORTAL_TAG 127.0.0.1:$ISCSI_PORT
$rpc_py add_initiator_group $INITIATOR_TAG $INITIATOR_NAME $NETMASK
$rpc_py construct_malloc_bdev 64 4096 --name Malloc0
$rpc_py construct_target_node Target3 Target3_alias 'Malloc0:0' $PORTAL_TAG:$INITIATOR_TAG 64 -d
rpc: remove file parameters from save/load_config in rpc.py User can pipe or redirect data as needed. As features like bdev crypto are added, storing config data in files needs to be carefully scrutinized - don't make it easy by providing ways to write data to files that may not be sufficiently protected. Signed-off-by: Jim Harris <james.r.harris@intel.com> Change-Id: I24dd32f81b965e275e1bac875f6d008d1b68007a Reviewed-on: https://review.gerrithub.io/425165 Chandler-Test-Pool: SPDK Automated Test System <sys_sgsw@intel.com> Tested-by: SPDK CI Jenkins <sys_sgci@intel.com> Reviewed-by: Ben Walker <benjamin.walker@intel.com> Reviewed-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
2018-09-10 18:18:08 +00:00
$rpc_py save_config > $base_iscsi_config
test/json: Tests for iscsi subsystems. Change-Id: I7053dca9cc6f2ef09566ba2bf8338f7f4c92ebf0 Signed-off-by: Pawel Niedzwiecki <pawelx.niedzwiecki@intel.com> Reviewed-on: https://review.gerrithub.io/416745 Tested-by: SPDK CI Jenkins <sys_sgci@intel.com> Reviewed-by: Pawel Kaminski <pawelx.kaminski@intel.com> Reviewed-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com> Reviewed-by: Ben Walker <benjamin.walker@intel.com> Chandler-Test-Pool: SPDK Automated Test System <sys_sgsw@intel.com>
2018-06-25 18:57:06 +00:00
timing_exit iscsi_json_config_create_setup
timing_enter iscsi_json_config_test
test_json_config
timing_exit iscsi_json_config_test
timing_enter iscsi_json_config_restart_spdk
$clear_config_py clear_config
kill_targets
run_spdk_tgt
rpc: remove file parameters from save/load_config in rpc.py User can pipe or redirect data as needed. As features like bdev crypto are added, storing config data in files needs to be carefully scrutinized - don't make it easy by providing ways to write data to files that may not be sufficiently protected. Signed-off-by: Jim Harris <james.r.harris@intel.com> Change-Id: I24dd32f81b965e275e1bac875f6d008d1b68007a Reviewed-on: https://review.gerrithub.io/425165 Chandler-Test-Pool: SPDK Automated Test System <sys_sgsw@intel.com> Tested-by: SPDK CI Jenkins <sys_sgci@intel.com> Reviewed-by: Ben Walker <benjamin.walker@intel.com> Reviewed-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
2018-09-10 18:18:08 +00:00
$rpc_py load_config < $base_iscsi_config
$rpc_py save_config > $last_iscsi_config
test/json: Tests for iscsi subsystems. Change-Id: I7053dca9cc6f2ef09566ba2bf8338f7f4c92ebf0 Signed-off-by: Pawel Niedzwiecki <pawelx.niedzwiecki@intel.com> Reviewed-on: https://review.gerrithub.io/416745 Tested-by: SPDK CI Jenkins <sys_sgci@intel.com> Reviewed-by: Pawel Kaminski <pawelx.kaminski@intel.com> Reviewed-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com> Reviewed-by: Ben Walker <benjamin.walker@intel.com> Chandler-Test-Pool: SPDK Automated Test System <sys_sgsw@intel.com>
2018-06-25 18:57:06 +00:00
timing_exit iscsi_json_config_restart_spdk
test: sort objects in JSON cofniguration tests Python 3 is changing order of objects in JSON object when doing load -> dump. Using OrderedDict solves this issue. Change-Id: I0aa6364de31e871aed36edd918d25c261c66b506 Signed-off-by: Pawel Wodkowski <pawelx.wodkowski@intel.com> Reviewed-on: https://review.gerrithub.io/425494 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>
2018-09-13 16:23:04 +00:00
json_diff $base_iscsi_config $last_iscsi_config
test/json: Tests for iscsi subsystems. Change-Id: I7053dca9cc6f2ef09566ba2bf8338f7f4c92ebf0 Signed-off-by: Pawel Niedzwiecki <pawelx.niedzwiecki@intel.com> Reviewed-on: https://review.gerrithub.io/416745 Tested-by: SPDK CI Jenkins <sys_sgci@intel.com> Reviewed-by: Pawel Kaminski <pawelx.kaminski@intel.com> Reviewed-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com> Reviewed-by: Ben Walker <benjamin.walker@intel.com> Chandler-Test-Pool: SPDK Automated Test System <sys_sgsw@intel.com>
2018-06-25 18:57:06 +00:00
$clear_config_py clear_config
kill_targets
rm -f $base_iscsi_config $last_iscsi_config
timing_exit iscsi_json_config
report_test_completion iscsi_json_config
Reference in New Issue Copy Permalink