From 027a8e4b545ff3bbc7472e195100fcc3a47b9863 Mon Sep 17 00:00:00 2001 From: Jim Harris Date: Wed, 21 Nov 2018 11:07:58 -0700 Subject: [PATCH] test/iscsi: remove reference to auth.conf in calsoft json Also remove the discovery auth group from the json file, and use RPC to set it instead. Signed-off-by: Jim Harris Change-Id: I597b60a7c7e4de9d7e1719b0145ab2b11c6f26b0 Reviewed-on: https://review.gerrithub.io/434265 Tested-by: SPDK CI Jenkins Reviewed-by: Ben Walker --- test/iscsi_tgt/calsoft/calsoft.sh | 1 + test/iscsi_tgt/calsoft/iscsi.json | 4 +--- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/test/iscsi_tgt/calsoft/calsoft.sh b/test/iscsi_tgt/calsoft/calsoft.sh index e386c27ee..84a067a95 100755 --- a/test/iscsi_tgt/calsoft/calsoft.sh +++ b/test/iscsi_tgt/calsoft/calsoft.sh @@ -44,6 +44,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 set_iscsi_discovery_auth -g 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_malloc_bdev -b MyBdev $MALLOC_BDEV_SIZE $MALLOC_BLOCK_SIZE diff --git a/test/iscsi_tgt/calsoft/iscsi.json b/test/iscsi_tgt/calsoft/iscsi.json index 34e44ca0e..6c790125c 100644 --- a/test/iscsi_tgt/calsoft/iscsi.json +++ b/test/iscsi_tgt/calsoft/iscsi.json @@ -6,10 +6,8 @@ "allow_duplicated_isid": true, "nop_timeout": 30, "nop_in_interval": 10, - "discovery_auth_group": 1, "max_sessions": 256, - "error_recovery_level": 2, - "auth_file": "/usr/local/etc/auth.conf" + "error_recovery_level": 2 }, "method": "set_iscsi_options" }