From e213502e7759f5ac3aac6305c4f5266178870009 Mon Sep 17 00:00:00 2001 From: Liang Yan Date: Thu, 15 Mar 2018 14:44:53 +0800 Subject: [PATCH] test/iscsi_tgt: remove duplicated lines from ip_migration.sh Change-Id: Ia1310c136fbfef608590326edc9f7dae8f2e5fe9 Signed-off-by: Liang Yan Reviewed-on: https://review.gerrithub.io/403912 Tested-by: SPDK Automated Test System Reviewed-by: Changpeng Liu Reviewed-by: Jim Harris --- test/iscsi_tgt/ip_migration/ip_migration.sh | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/test/iscsi_tgt/ip_migration/ip_migration.sh b/test/iscsi_tgt/ip_migration/ip_migration.sh index 24f5a09b7..e1dea1467 100755 --- a/test/iscsi_tgt/ip_migration/ip_migration.sh +++ b/test/iscsi_tgt/ip_migration/ip_migration.sh @@ -26,8 +26,11 @@ function rpc_config() { $rpc_py -s $1 add_initiator_group 1 ANY $2 $rpc_py -s $1 construct_malloc_bdev 64 512 } -function rpc_add_ip() { - $rpc_py -s $1 add_ip_address 1 $2 + +function rpc_add_target_node() { + $rpc_py -s $1 add_ip_address 1 $MIGRATION_ADDRESS + $rpc_py -s $1 add_portal_group 1 $MIGRATION_ADDRESS:$PORT + $rpc_py -s $1 construct_target_node target1 target1_alias 'Malloc0:0' '1:1' 64 -d } timing_enter ip_migration @@ -59,9 +62,7 @@ do done rpc_first_addr="/var/tmp/spdk0.sock" -rpc_add_ip $rpc_first_addr $MIGRATION_ADDRESS -$rpc_py -s $rpc_first_addr add_portal_group 1 $MIGRATION_ADDRESS:$PORT -$rpc_py -s $rpc_first_addr construct_target_node target1 target1_alias 'Malloc0:0' '1:1' 64 -d +rpc_add_target_node $rpc_first_addr sleep 1 iscsiadm -m discovery -t sendtargets -p $MIGRATION_ADDRESS:$PORT @@ -77,9 +78,7 @@ sleep 5 $rpc_py -s $rpc_first_addr kill_instance SIGTERM rpc_second_addr="/var/tmp/spdk1.sock" -rpc_add_ip $rpc_second_addr $MIGRATION_ADDRESS -$rpc_py -s $rpc_second_addr add_portal_group 1 $MIGRATION_ADDRESS:$PORT -$rpc_py -s $rpc_second_addr construct_target_node target1 target1_alias 'Malloc0:0' '1:1' 64 -d +rpc_add_target_node $rpc_second_addr wait $fiopid