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

test/iscsi: In ip_migration.sh, eliminate rpc_config function 



Two line function called from one spot. Simpler to inline it.

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


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarTomasz Zawadzki <tomasz.zawadzki@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
parent e8c73275

test/iscsi_tgt/ip_migration/ip_migration.sh

+4 −10
Original line number Diff line number Diff line
@@ -24,13 +24,6 @@ function kill_all_iscsi_target() { 
	done

}



function rpc_config() {

	# $1 = RPC server address

	# $2 = Netmask

	$rpc_py -s $1 iscsi_create_initiator_group $INITIATOR_TAG $INITIATOR_NAME $2

	$rpc_py -s $1 bdev_malloc_create 64 512

}



function rpc_validate_ip() {

	# Always delete the IP first in case it is there already

	cmd="$rpc_py -s $1 net_interface_delete_ip_address 1 $MIGRATION_ADDRESS"
@@ -89,9 +82,10 @@ function iscsi_tgt_start() { 
	$rpc_py -s $1 framework_start_init

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



	rpc_config $1 $NETMASK

	trap 'kill_all_iscsi_target;  iscsitestfini; exit 1' \

		SIGINT SIGTERM EXIT

	$rpc_py -s $1 iscsi_create_initiator_group $INITIATOR_TAG $INITIATOR_NAME $NETMASK

	$rpc_py -s $1 bdev_malloc_create 64 512



	trap 'kill_all_iscsi_target;  iscsitestfini; exit 1' SIGINT SIGTERM EXIT

}



echo "Running ip migration tests"