Commit 51f411c2 authored by Pawel Kaminski's avatar Pawel Kaminski Committed by Jim Harris
Browse files

test/iscsi_tgt: Use rpc instead of config file. 



Remove unnecessary rm commands.

Change-Id: I2bf0da376c8ea492a74deb8c523773e30e199bdc
Signed-off-by: default avatarPawel Kaminski <pawelx.kaminski@intel.com>
Reviewed-on: https://review.gerrithub.io/c/445304


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarKarol Latecki <karol.latecki@intel.com>
Reviewed-by: default avatarDarek Stojaczyk <dariusz.stojaczyk@intel.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
parent 30bbf3d9

test/iscsi_tgt/ext4test/ext4test.sh

+2 −2
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ $ISCSI_APP --wait-for-rpc & 
pid=$!

echo "Process pid: $pid"



trap "$rpc_py destruct_split_vbdev Name0n1 || true; killprocess $pid; rm -f $testdir/iscsi.conf; exit 1" SIGINT SIGTERM EXIT

trap "$rpc_py destruct_split_vbdev Name0n1 || true; killprocess $pid; exit 1" SIGINT SIGTERM EXIT



waitforlisten $pid

$rpc_py set_iscsi_options -o 30 -a 4 -b $node_base
@@ -44,7 +44,7 @@ iscsiadm -m discovery -t sendtargets -p $TARGET_IP:$ISCSI_PORT 
iscsiadm -m node --login -p $TARGET_IP:$ISCSI_PORT



trap 'for new_dir in `dir -d /mnt/*dir`; do umount $new_dir; rm -rf $new_dir; done; \

	iscsicleanup; killprocess $pid; rm -f $testdir/iscsi.conf; exit 1' SIGINT SIGTERM EXIT

	iscsicleanup; killprocess $pid; exit 1' SIGINT SIGTERM EXIT



sleep 1

test/iscsi_tgt/perf/iscsi.conf

deleted100644 → 0
+0 −10
Original line number Diff line number Diff line 
[Global]



[iSCSI]

  NodeBase "iqn.2016-06.io.spdk"

  AuthFile /usr/local/etc/spdk/auth.conf

  Timeout 30

  DiscoveryAuthMethod Auto

  MaxSessions 16

  ImmediateData Yes

  ErrorRecoveryLevel 0

test/iscsi_tgt/perf/iscsi_target.sh

+3 −1
Original line number Diff line number Diff line
@@ -80,10 +80,12 @@ mkdir -p $testdir/perf_output 
touch $iscsi_fio_results



timing_enter run_iscsi_app

$rootdir/app/iscsi_tgt/iscsi_tgt -m $ISCSI_TGT_CM -r $testdir/rpc_iscsi.sock -c $testdir/iscsi.conf &

$rootdir/app/iscsi_tgt/iscsi_tgt -m $ISCSI_TGT_CM -r $testdir/rpc_iscsi.sock --wait-for-rpc &

pid=$!

trap "rm -f $testdir/perf.job; killprocess $pid; print_backtrace; exit 1" ERR SIGTERM SIGABRT

waitforlisten "$pid" "$testdir/rpc_iscsi.sock"

$rpc_py set_iscsi_options -b "iqn.2016-06.io.spdk" -f "/usr/local/etc/spdk/auth.conf" -o 30 -i -l 0 -a 16

$rpc_py start_subsystem_init

$rootdir/scripts/gen_nvme.sh --json | $rpc_py load_subsystem_config

sleep 1

timing_exit run_iscsi_app