Commit 62209642 authored by chenlo2x's avatar chenlo2x Committed by Jim Harris
Browse files

Autotest: revise coding-style of all script under the test/iscsi_tgt directory. 



These changes were modified by the shfmt tool that supports Google's Style guide.

Change-Id: I27dd8ba91afc0043b3ce5f0eb6121a3c11789fab
Signed-off-by: default avatarchenlo2x <longx.o.chen@intel.com>
Reviewed-on: https://review.gerrithub.io/408147


Reviewed-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Chandler-Test-Pool: SPDK Automated Test System <sys_sgsw@intel.com>
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
parent cf903807

test/iscsi_tgt/digests/digests.sh

+5 −9
Original line number Diff line number Diff line
@@ -5,10 +5,8 @@ rootdir=$(readlink -f $testdir/../../..) 
source $rootdir/test/common/autotest_common.sh

source $rootdir/test/iscsi_tgt/common.sh



function node_login_fio_logout()

{

	for arg in "$@"

	do

function node_login_fio_logout() {

	for arg in "$@"; do

		iscsiadm -m node -p $TARGET_IP:$ISCSI_PORT -o update -n node.conn[0].iscsi.$arg

	done

	iscsiadm -m node --login -p $TARGET_IP:$ISCSI_PORT
@@ -19,8 +17,7 @@ function node_login_fio_logout() 
	sleep 1

}



function iscsi_header_digest_test()

{

function iscsi_header_digest_test() {

	# Enable HeaderDigest to CRC32C

	timing_enter HeaderDigest_enabled

	node_login_fio_logout "HeaderDigest -v CRC32C"
@@ -33,8 +30,7 @@ function iscsi_header_digest_test() 
	timing_exit preferred

}



function iscsi_header_data_digest_test()

{

function iscsi_header_data_digest_test() {

	# Only enable HeaderDigest to CRC32C

	timing_enter HeaderDigest_enabled

	node_login_fio_logout "HeaderDigest -v CRC32C" "DataDigest -v None"
@@ -94,7 +90,7 @@ iscsiadm -m discovery -t sendtargets -p $TARGET_IP:$ISCSI_PORT 


# iscsiadm installed by some Fedora releases loses DataDigest parameter.

# Check and avoid setting DataDigest.

DataDigestAbility=`iscsiadm -m node -p $TARGET_IP:$ISCSI_PORT | grep DataDigest || true`

DataDigestAbility=$(iscsiadm -m node -p $TARGET_IP:$ISCSI_PORT | grep DataDigest || true)

if [ "$DataDigestAbility"x = x ]; then

	iscsi_header_digest_test

else

test/iscsi_tgt/filesystem/filesystem.sh

+5 −6
Original line number Diff line number Diff line
@@ -10,8 +10,7 @@ timing_enter filesystem 


rpc_py="python $rootdir/scripts/rpc.py"

# Remove lvol bdevs and stores.

function remove_backends()

{

function remove_backends() {

	echo "INFO: Removing lvol bdev"

	$rpc_py destroy_lvol_bdev "lvs_0/lbd_0"
@@ -39,7 +38,7 @@ echo "iscsi_tgt is listening. Running tests..." 


timing_exit start_iscsi_tgt



bdf=`iter_pci_class_code 01 08 02 | head -1`

bdf=$(iter_pci_class_code 01 08 02 | head -1)

$rpc_py add_portal_group $PORTAL_TAG $TARGET_IP:$ISCSI_PORT

$rpc_py add_initiator_group $INITIATOR_TAG $INITIATOR_NAME $NETMASK

$rpc_py construct_nvme_bdev -b "Nvme0" -t "pcie" -a $bdf

test/iscsi_tgt/fio/running_config.sh

+2 −2
Original line number Diff line number Diff line
@@ -14,9 +14,9 @@ rm -f /tmp/iscsi.conf* 


kill -USR1 "$pid"



if [ ! -f `ls /tmp/iscsi.conf.*` ]; then

if [ ! -f $(ls /tmp/iscsi.conf.*) ]; then

	echo "iscsi_tgt did not generate config file"

	exit 1

fi



mv `ls /tmp/iscsi.conf.*` /tmp/iscsi.conf
 
mv $(ls /tmp/iscsi.conf.*) /tmp/iscsi.conf

test/iscsi_tgt/ip_migration/ip_migration.sh

+3 −6
Original line number Diff line number Diff line
@@ -15,8 +15,7 @@ NETMASK=127.0.0.0/24 
MIGRATION_ADDRESS=127.0.0.2



function kill_all_iscsi_target() {

	for ((i=0; i<2; i++))

	do

	for ((i = 0; i < 2; i++)); do

		rpc_addr="/var/tmp/spdk${i}.sock"

		$rpc_py -s $rpc_addr kill_instance SIGTERM

	done
@@ -37,10 +36,8 @@ function rpc_add_target_node() { 


timing_enter ip_migration





echo "Running ip migration tests"

for ((i=0; i<2; i++))

do

for ((i = 0; i < 2; i++)); do

	timing_enter start_iscsi_tgt_$i



	rpc_addr="/var/tmp/spdk${i}.sock"

test/iscsi_tgt/lvol/iscsi_lvol.sh

+11 −11
Original line number Diff line number Diff line
@@ -37,13 +37,13 @@ timing_exit start_iscsi_tgt 


timing_enter setup

$rpc_py add_portal_group $PORTAL_TAG $TARGET_IP:$ISCSI_PORT

for i in `seq 1 $NUM_MALLOC`; do

for i in $(seq 1 $NUM_MALLOC); do

	INITIATOR_TAG=$((i + 2))

	$rpc_py add_initiator_group $INITIATOR_TAG $INITIATOR_NAME $NETMASK

	bdev=$($rpc_py construct_malloc_bdev $MALLOC_BDEV_SIZE $MALLOC_BLOCK_SIZE)

	ls_guid=$($rpc_py construct_lvol_store $bdev lvs_$i -c 1048576)

	LUNs=""

    for j in `seq 1 $NUM_LVOL`; do

	for j in $(seq 1 $NUM_LVOL); do

		lb_name=$($rpc_py construct_lvol_bdev -u $ls_guid lbd_$j 10)

		LUNs+="$lb_name:$((j - 1)) "

	done