From c8a5b48c44aef5c4bf0f22092e90f47fe320d7cb Mon Sep 17 00:00:00 2001 From: Ben Walker Date: Thu, 17 Sep 2020 15:53:36 -0700 Subject: [PATCH] test/iscsi: In ip_migration.sh, eliminate rpc_config function Two line function called from one spot. Simpler to inline it. Signed-off-by: Ben Walker Change-Id: I82818945a672b8c5603f45b6f2b4f072ff2098e1 Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/4301 Tested-by: SPDK CI Jenkins Reviewed-by: Tomasz Zawadzki Reviewed-by: Jim Harris Reviewed-by: Shuhei Matsumoto --- test/iscsi_tgt/ip_migration/ip_migration.sh | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/test/iscsi_tgt/ip_migration/ip_migration.sh b/test/iscsi_tgt/ip_migration/ip_migration.sh index e762e6a19..d4b9381b2 100755 --- a/test/iscsi_tgt/ip_migration/ip_migration.sh +++ b/test/iscsi_tgt/ip_migration/ip_migration.sh @@ -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"