Commit 4eec3651 authored by Ben Walker's avatar Ben Walker Committed by Tomasz Zawadzki
Browse files

test/iscsi: In ip_migration.sh, put starting the target into a function 



This makes it a bit clearer.

Change-Id: I3e9bcc8d5cff3c4cf85ec774114f84a59a9c0f16
Signed-off-by: default avatarBen Walker <benjamin.walker@intel.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/4299


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: default avatarTomasz Zawadzki <tomasz.zawadzki@intel.com>
parent 3a214821

test/iscsi_tgt/ip_migration/ip_migration.sh

+18 −12
Original line number Diff line number Diff line
@@ -74,29 +74,35 @@ function rpc_add_target_node() { 
	$rpc_py -s $1 net_interface_delete_ip_address 1 $MIGRATION_ADDRESS

}



echo "Running ip migration tests"

for ((i = 0; i < 2; i++)); do

	timing_enter start_iscsi_tgt_$i



	rpc_addr="/var/tmp/spdk${i}.sock"

function iscsi_tgt_start() {

	# $1 = RPC server address



	# TODO: run the different iSCSI instances on non-overlapping CPU masks

	"${ISCSI_APP[@]}" -r $rpc_addr -m $ISCSI_TEST_CORE_MASK --wait-for-rpc &

	"${ISCSI_APP[@]}" -r $1 -m $ISCSI_TEST_CORE_MASK --wait-for-rpc &

	pid=$!

	echo "Process pid: $pid"



	trap 'kill_all_iscsi_target; exit 1' SIGINT SIGTERM EXIT



	waitforlisten $pid $rpc_addr

	$rpc_py -s $rpc_addr iscsi_set_options -o 30 -a 64

	$rpc_py -s $rpc_addr framework_start_init

	waitforlisten $pid $1

	$rpc_py -s $1 iscsi_set_options -o 30 -a 64

	$rpc_py -s $1 framework_start_init

	echo "iscsi_tgt is listening. Running tests..."



	timing_exit start_iscsi_tgt_$i



	rpc_config $rpc_addr $NETMASK

	rpc_config $1 $NETMASK

	trap 'kill_all_iscsi_target;  iscsitestfini; exit 1' \

		SIGINT SIGTERM EXIT

}



echo "Running ip migration tests"

for ((i = 0; i < 2; i++)); do

	timing_enter start_iscsi_tgt_$i



	rpc_addr="/var/tmp/spdk${i}.sock"



	iscsi_tgt_start $rpc_addr



	timing_exit start_iscsi_tgt_$i

done



rpc_first_addr="/var/tmp/spdk0.sock"