From cd209dbbafce25b299d66a1e96c9caefaac543ac Mon Sep 17 00:00:00 2001 From: Shuhei Matsumoto Date: Thu, 15 Nov 2018 10:34:03 +0900 Subject: [PATCH] test/iscsi_tgt: Port CHAP to JSON RPC in Calsoft test Use JSON RPC instead of config file to configure CHAP secret. Change-Id: Iecaa3eed00fd1b0c25d46693c4ebc04973970f6f Signed-off-by: Shuhei Matsumoto Reviewed-on: https://review.gerrithub.io/433205 Tested-by: SPDK CI Jenkins Chandler-Test-Pool: SPDK Automated Test System Reviewed-by: Ben Walker Reviewed-by: Jim Harris --- test/iscsi_tgt/calsoft/auth.conf | 3 --- test/iscsi_tgt/calsoft/calsoft.sh | 3 +-- 2 files changed, 1 insertion(+), 5 deletions(-) delete mode 100644 test/iscsi_tgt/calsoft/auth.conf diff --git a/test/iscsi_tgt/calsoft/auth.conf b/test/iscsi_tgt/calsoft/auth.conf deleted file mode 100644 index 303bac310..000000000 --- a/test/iscsi_tgt/calsoft/auth.conf +++ /dev/null @@ -1,3 +0,0 @@ -[AuthGroup1] - Comment "Auth Group1" - Auth "root" "tester" diff --git a/test/iscsi_tgt/calsoft/calsoft.sh b/test/iscsi_tgt/calsoft/calsoft.sh index 1a5c39327..e386c27ee 100755 --- a/test/iscsi_tgt/calsoft/calsoft.sh +++ b/test/iscsi_tgt/calsoft/calsoft.sh @@ -6,7 +6,6 @@ source $rootdir/test/iscsi_tgt/common.sh delete_tmp_conf_files() { rm -f /usr/local/etc/its.conf - rm -f /usr/local/etc/auth.conf } if [ ! -d /usr/local/calsoft ]; then @@ -25,7 +24,6 @@ calsoft_py="$testdir/calsoft.py" # Copy the calsoft config file to /usr/local/etc mkdir -p /usr/local/etc cp $testdir/its.conf /usr/local/etc/ -cp $testdir/auth.conf /usr/local/etc/ # Append target ip to calsoft config echo "IP=$TARGET_IP" >> /usr/local/etc/its.conf @@ -45,6 +43,7 @@ echo "iscsi_tgt is listening. Running tests..." timing_exit start_iscsi_tgt +$rpc_py add_iscsi_auth_group 1 -c 'user:root secret:tester' $rpc_py add_portal_group $PORTAL_TAG $TARGET_IP:$ISCSI_PORT $rpc_py add_initiator_group $INITIATOR_TAG $INITIATOR_NAME $NETMASK $rpc_py construct_malloc_bdev -b MyBdev $MALLOC_BDEV_SIZE $MALLOC_BLOCK_SIZE