Commit 96681212 authored by Pawel Niedzwiecki's avatar Pawel Niedzwiecki Committed by Ben Walker
Browse files

test/iscsi: replace config files from iscsi tests with json and rpc calls 



fio.sh still uses conf file because hot remove is not yet imlemented
in rpc calls

Change-Id: If9066e6b24e1e3d381876909fb9e00000a302e02
Signed-off-by: default avatarPawel Niedzwiecki <pawelx.niedzwiecki@intel.com>
Reviewed-on: https://review.gerrithub.io/419125


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
parent b86c6b17

test/iscsi_tgt/calsoft/calsoft.sh

+3 −1
Original line number Diff line number Diff line
@@ -32,13 +32,15 @@ echo "IP=$TARGET_IP" >> /usr/local/etc/its.conf 


timing_enter start_iscsi_tgt



$ISCSI_APP -c $testdir/iscsi.conf -m 0x1 &

$ISCSI_APP -m 0x1 -w &

pid=$!

echo "Process pid: $pid"



trap "killprocess $pid; delete_tmp_conf_files; exit 1 " SIGINT SIGTERM EXIT



waitforlisten $pid

$rpc_py load_subsystem_config -f $testdir/iscsi.json

$rpc_py start_subsystem_init

echo "iscsi_tgt is listening. Running tests..."



timing_exit start_iscsi_tgt

test/iscsi_tgt/calsoft/iscsi.conf

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



[iSCSI]

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

  AuthFile /usr/local/etc/auth.conf

  Timeout 30

  DiscoveryAuthMethod Auto

  DiscoveryAuthGroup AuthGroup1

  MaxSessions 256

  MaxR2T 256

  ErrorRecoveryLevel 2

  NopInInterval 10

  AllowDuplicateIsid Yes

test/iscsi_tgt/calsoft/iscsi.json

0 → 100644
+17 −0
Original line number Diff line number Diff line 
{

  "subsystem": "iscsi",

  "config": [

    {

      "params": {

        "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"

      },

      "method": "set_iscsi_options"

    }

  ]

}

test/iscsi_tgt/digests/digests.sh

+3 −1
Original line number Diff line number Diff line
@@ -67,13 +67,15 @@ fio_py="python $rootdir/scripts/fio.py" 


timing_enter start_iscsi_tgt



$ISCSI_APP -c $testdir/iscsi.conf -m $ISCSI_TEST_CORE_MASK &

$ISCSI_APP -m $ISCSI_TEST_CORE_MASK -w &

pid=$!

echo "Process pid: $pid"



trap "killprocess $pid; exit 1" SIGINT SIGTERM EXIT



waitforlisten $pid

$rpc_py set_iscsi_options -o 30 -a 16

$rpc_py start_subsystem_init

echo "iscsi_tgt is listening. Running tests..."



timing_exit start_iscsi_tgt

test/iscsi_tgt/digests/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