ivampiresp/Spdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

test/iscsi_tgt: remove duplicated lines from ip_migration.sh

Browse Source 
Change-Id: Ia1310c136fbfef608590326edc9f7dae8f2e5fe9
Signed-off-by: Liang Yan <liang.z.yan@intel.com>
Reviewed-on: https://review.gerrithub.io/403912
Tested-by: SPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: Changpeng Liu <changpeng.liu@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
This commit is contained in:
Liang Yan 2018-03-15 14:44:53 +08:00 committed by Jim Harris
parent 7fd3a82561
commit e213502e77
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
test/iscsi_tgt/ip_migration/ip_migration.sh
View File

@ -26,8 +26,11 @@ function rpc_config() {
$rpc_py -s $1 add_initiator_group 1 ANY $2 $rpc_py -s $1 add_initiator_group 1 ANY $2
$rpc_py -s $1 construct_malloc_bdev 64 512 $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 timing_enter ip_migration
@ -59,9 +62,7 @@ do
done done
rpc_first_addr="/var/tmp/spdk0.sock" rpc_first_addr="/var/tmp/spdk0.sock"
rpc_add_ip $rpc_first_addr $MIGRATION_ADDRESS rpc_add_target_node $rpc_first_addr
$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
sleep 1 sleep 1
iscsiadm -m discovery -t sendtargets -p $MIGRATION_ADDRESS:$PORT 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_py -s $rpc_first_addr kill_instance SIGTERM
rpc_second_addr="/var/tmp/spdk1.sock" rpc_second_addr="/var/tmp/spdk1.sock"
rpc_add_ip $rpc_second_addr $MIGRATION_ADDRESS rpc_add_target_node $rpc_second_addr
$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
wait $fiopid wait $fiopid