Commit 027a8e4b authored by Jim Harris's avatar Jim Harris Committed by Ben Walker
Browse files

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: default avatarJim Harris <james.r.harris@intel.com>
Change-Id: I597b60a7c7e4de9d7e1719b0145ab2b11c6f26b0

Reviewed-on: https://review.gerrithub.io/434265


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
parent d808a62d

test/iscsi_tgt/calsoft/calsoft.sh

+1 −0
Original line number Diff line number Diff line
@@ -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

test/iscsi_tgt/calsoft/iscsi.json

+1 −3
Original line number Diff line number Diff line
@@ -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"

    }