Commit 6319ce1c authored by Pawel Kaminski's avatar Pawel Kaminski Committed by Jim Harris
Browse files

test/spdkcli: Reduce execution time for spdkcli tests 



Pass many spdkcli commands to spdkcli_job.py

Change-Id: I0cf5840fdf7183febff1872c7fc8d1cb303a06f1
Signed-off-by: default avatarPawel Kaminski <pawelx.kaminski@intel.com>
Reviewed-on: https://review.gerrithub.io/435891


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
Chandler-Test-Pool: SPDK Automated Test System <sys_sgsw@intel.com>
parent a5380c75

test/spdkcli/iscsi.sh

+38 −36
Original line number Diff line number Diff line
@@ -15,26 +15,27 @@ run_spdk_tgt 
timing_exit run_spdk_tgt



timing_enter spdkcli_create_iscsi_config

$spdkcli_job "/bdevs/malloc create 32 512 Malloc0" "Malloc0" True

$spdkcli_job "/bdevs/malloc create 32 512 Malloc1" "Malloc1" True

$spdkcli_job "/bdevs/malloc create 32 512 Malloc2" "Malloc2" True

$spdkcli_job "/bdevs/malloc create 32 512 Malloc3" "Malloc3" True

$spdkcli_job "/iscsi/portal_groups create 1 \"127.0.0.1:3261 127.0.0.1:3263@0x1\"" "host=127.0.0.1, port=3261" True

$spdkcli_job "/iscsi/portal_groups create 2 127.0.0.1:3262" "host=127.0.0.1, port=3262" True

$spdkcli_job "/iscsi/initiator_groups create 2 ANY 10.0.2.15/32" "hostname=ANY, netmask=10.0.2.15/32" True

$spdkcli_job "/iscsi/initiator_groups create 3 ANZ 10.0.2.15/32" "hostname=ANZ, netmask=10.0.2.15/32" True

$spdkcli_job "/iscsi/initiator_groups add_initiator 2 ANW 10.0.2.16/32" "hostname=ANW, netmask=10.0.2.16" True

$spdkcli_job "/iscsi/target_nodes create Target0 Target0_alias \"Malloc0:0 Malloc1:1\" 1:2 64 g=1" "Target0" True

$spdkcli_job "/iscsi/target_nodes create Target1 Target1_alias Malloc2:0 1:2 64 g=1" "Target1" True

$spdkcli_job "/iscsi/target_nodes/iqn.2016-06.io.spdk:Target0 add_pg_ig_maps \"1:3 2:2\"" "portal_group1 - initiator_group3" True

$spdkcli_job "/iscsi/target_nodes add_lun iqn.2016-06.io.spdk:Target1 Malloc3 2" "Malloc3" True

$spdkcli_job "/iscsi/auth_groups create 1 \"user:test1 secret:test1 muser:mutual_test1 msecret:mutual_test1,\

user:test3 secret:test3 muser:mutual_test3 msecret:mutual_test3\"" "user=test3" True

$spdkcli_job "/iscsi/auth_groups add_secret 1 user=test2 secret=test2 muser=mutual_test2 msecret=mutual_test2" "user=test2" True

$spdkcli_job "/iscsi/auth_groups create 2 \"user:test4 secret:test4 muser:mutual_test4 msecret:mutual_test4\"" "user=test4" True

$spdkcli_job "/iscsi/target_nodes/iqn.2016-06.io.spdk:Target0 set_auth g=1 d=true" "disable_chap: True" True

$spdkcli_job "/iscsi/global_params set_auth g=1 d=true r=false" "disable_chap: True" True

$spdkcli_job "/iscsi ls" "Malloc" True

$spdkcli_job "'/bdevs/malloc create 32 512 Malloc0' 'Malloc0' True

'/bdevs/malloc create 32 512 Malloc1' 'Malloc1' True

'/bdevs/malloc create 32 512 Malloc2' 'Malloc2' True

'/bdevs/malloc create 32 512 Malloc3' 'Malloc3' True

'/iscsi/portal_groups create 1 \"127.0.0.1:3261 127.0.0.1:3263@0x1\"' 'host=127.0.0.1, port=3261' True

'/iscsi/portal_groups create 2 127.0.0.1:3262' 'host=127.0.0.1, port=3262' True

'/iscsi/initiator_groups create 2 ANY 10.0.2.15/32' 'hostname=ANY, netmask=10.0.2.15/32' True

'/iscsi/initiator_groups create 3 ANZ 10.0.2.15/32' 'hostname=ANZ, netmask=10.0.2.15/32' True

'/iscsi/initiator_groups add_initiator 2 ANW 10.0.2.16/32' 'hostname=ANW, netmask=10.0.2.16' True

'/iscsi/target_nodes create Target0 Target0_alias \"Malloc0:0 Malloc1:1\" 1:2 64 g=1' 'Target0' True

'/iscsi/target_nodes create Target1 Target1_alias Malloc2:0 1:2 64 g=1' 'Target1' True

'/iscsi/target_nodes/iqn.2016-06.io.spdk:Target0 add_pg_ig_maps \"1:3 2:2\"' 'portal_group1 - initiator_group3' True

'/iscsi/target_nodes add_lun iqn.2016-06.io.spdk:Target1 Malloc3 2' 'Malloc3' True

'/iscsi/auth_groups create 1 \"user:test1 secret:test1 muser:mutual_test1 msecret:mutual_test1,\

user:test3 secret:test3 muser:mutual_test3 msecret:mutual_test3\"' 'user=test3' True

'/iscsi/auth_groups add_secret 1 user=test2 secret=test2 muser=mutual_test2 msecret=mutual_test2' 'user=test2' True

'/iscsi/auth_groups create 2 \"user:test4 secret:test4 muser:mutual_test4 msecret:mutual_test4\"' 'user=test4' True

'/iscsi/target_nodes/iqn.2016-06.io.spdk:Target0 set_auth g=1 d=true' 'disable_chap: True' True

'/iscsi/global_params set_auth g=1 d=true r=false' 'disable_chap: True' True

'/iscsi ls' 'Malloc' True

"

timing_exit spdkcli_create_iscsi_config



timing_enter spdkcli_check_match
@@ -42,22 +43,23 @@ check_match 
timing_exit spdkcli_check_match



timing_enter spdkcli_clear_iscsi_config

$spdkcli_job "/iscsi/auth_groups delete_secret 1 test2" "user=test2"

$spdkcli_job "/iscsi/auth_groups delete_secret_all 1" "user=test1"

$spdkcli_job "/iscsi/auth_groups delete 1" "user=test1"

$spdkcli_job "/iscsi/auth_groups delete_all" "user=test4"

$spdkcli_job "/iscsi/target_nodes/iqn.2016-06.io.spdk:Target0 delete_pg_ig_maps \"1:3 2:2\"" "portal_group1 - initiator_group3"

$spdkcli_job "/iscsi/target_nodes delete iqn.2016-06.io.spdk:Target1" "Target1"

$spdkcli_job "/iscsi/target_nodes delete_all" "Target0"

$spdkcli_job "/iscsi/initiator_groups delete_initiator 2 ANW 10.0.2.16/32" "ANW"

$spdkcli_job "/iscsi/initiator_groups delete 3" "ANZ"

$spdkcli_job "/iscsi/initiator_groups delete_all" "ANY"

$spdkcli_job "/iscsi/portal_groups delete 1" "127.0.0.1:3261"

$spdkcli_job "/iscsi/portal_groups delete_all" "127.0.0.1:3262"

$spdkcli_job "/bdevs/malloc delete Malloc3" "Malloc3"

$spdkcli_job "/bdevs/malloc delete Malloc2" "Malloc2"

$spdkcli_job "/bdevs/malloc delete Malloc1" "Malloc1"

$spdkcli_job "/bdevs/malloc delete Malloc0" "Malloc0"

$spdkcli_job "'/iscsi/auth_groups delete_secret 1 test2' 'user=test2'

'/iscsi/auth_groups delete_secret_all 1' 'user=test1'

'/iscsi/auth_groups delete 1' 'user=test1'

'/iscsi/auth_groups delete_all' 'user=test4'

'/iscsi/target_nodes/iqn.2016-06.io.spdk:Target0 delete_pg_ig_maps \"1:3 2:2\"' 'portal_group1 - initiator_group3'

'/iscsi/target_nodes delete iqn.2016-06.io.spdk:Target1' 'Target1'

'/iscsi/target_nodes delete_all' 'Target0'

'/iscsi/initiator_groups delete_initiator 2 ANW 10.0.2.16/32' 'ANW'

'/iscsi/initiator_groups delete 3' 'ANZ'

'/iscsi/initiator_groups delete_all' 'ANY'

'/iscsi/portal_groups delete 1' '127.0.0.1:3261'

'/iscsi/portal_groups delete_all' '127.0.0.1:3262'

'/bdevs/malloc delete Malloc3' 'Malloc3'

'/bdevs/malloc delete Malloc2' 'Malloc2'

'/bdevs/malloc delete Malloc1' 'Malloc1'

'/bdevs/malloc delete Malloc0' 'Malloc0'

"

timing_exit spdkcli_clear_iscsi_config



killprocess $spdk_tgt_pid

test/spdkcli/nvmf.sh

+52 −50
Original line number Diff line number Diff line
@@ -19,42 +19,43 @@ RDMA_IP_LIST=$(get_available_rdma_ips) 
NVMF_TARGET_IP=$(echo "$RDMA_IP_LIST" | head -n 1)



timing_enter spdkcli_create_nvmf_config

$spdkcli_job "/bdevs/malloc create 32 512 Malloc1" "Malloc1" True

$spdkcli_job "/bdevs/malloc create 32 512 Malloc2" "Malloc2" True

$spdkcli_job "/bdevs/malloc create 32 512 Malloc3" "Malloc3" True

$spdkcli_job "/bdevs/malloc create 32 512 Malloc4" "Malloc4" True

$spdkcli_job "/bdevs/malloc create 32 512 Malloc5" "Malloc5" True

$spdkcli_job "/bdevs/malloc create 32 512 Malloc6" "Malloc6" True

$spdkcli_job "nvmf/transport create RDMA max_qpairs_per_ctrlr=4 io_unit_size=8192" True

$spdkcli_job "/nvmf/subsystem create nqn.2014-08.org.spdk:cnode1 N37SXV509SRW\

  max_namespaces=4 allow_any_host=True" "nqn.2014-08.org.spdk:cnode1" True

$spdkcli_job "/nvmf/subsystem/nqn.2014-08.org.spdk:cnode1/namespaces create Malloc3 1" "Malloc3" True

$spdkcli_job "/nvmf/subsystem/nqn.2014-08.org.spdk:cnode1/namespaces create Malloc4 2" "Malloc4" True

$spdkcli_job "/nvmf/subsystem/nqn.2014-08.org.spdk:cnode1/listen_addresses create \

 RDMA $NVMF_TARGET_IP 4260 IPv4" "$NVMF_TARGET_IP:4260" True

$spdkcli_job "/nvmf/subsystem create nqn.2014-08.org.spdk:cnode2 N37SXV509SRD\

 max_namespaces=2 allow_any_host=True" "nqn.2014-08.org.spdk:cnode2" True

$spdkcli_job "/nvmf/subsystem/nqn.2014-08.org.spdk:cnode2/namespaces create Malloc2" "Malloc2" True

$spdkcli_job "/nvmf/subsystem/nqn.2014-08.org.spdk:cnode2/listen_addresses create \

 RDMA $NVMF_TARGET_IP 4260 IPv4" "$NVMF_TARGET_IP:4260" True

$spdkcli_job "/nvmf/subsystem create nqn.2014-08.org.spdk:cnode3 N37SXV509SRR\

 max_namespaces=2 allow_any_host=True" "nqn.2014-08.org.spdk:cnode2" True

$spdkcli_job "/nvmf/subsystem/nqn.2014-08.org.spdk:cnode3/namespaces create Malloc1" "Malloc1" True

$spdkcli_job "/nvmf/subsystem/nqn.2014-08.org.spdk:cnode3/listen_addresses create \

 RDMA $NVMF_TARGET_IP 4260 IPv4" "$NVMF_TARGET_IP:4260" True

$spdkcli_job "/nvmf/subsystem/nqn.2014-08.org.spdk:cnode3/listen_addresses create \

 RDMA $NVMF_TARGET_IP 4261 IPv4" "$NVMF_TARGET_IP:4261" True

$spdkcli_job "/nvmf/subsystem/nqn.2014-08.org.spdk:cnode3/hosts create \

 nqn.2014-08.org.spdk:cnode1" "nqn.2014-08.org.spdk:cnode1" True

$spdkcli_job "/nvmf/subsystem/nqn.2014-08.org.spdk:cnode3/hosts create \

 nqn.2014-08.org.spdk:cnode2" "nqn.2014-08.org.spdk:cnode2" True

$spdkcli_job "/nvmf/subsystem/nqn.2014-08.org.spdk:cnode1 allow_any_host True" "Allow any host"

$spdkcli_job "/nvmf/subsystem/nqn.2014-08.org.spdk:cnode1 allow_any_host False" "Allow any host" True

$spdkcli_job "/nvmf/subsystem/nqn.2014-08.org.spdk:cnode1/listen_addresses create RDMA $NVMF_TARGET_IP 4261 IPv4" "$NVMF_TARGET_IP:4261" True

$spdkcli_job "/nvmf/subsystem/nqn.2014-08.org.spdk:cnode1/listen_addresses create RDMA $NVMF_TARGET_IP 4262 IPv4" "$NVMF_TARGET_IP:4262" True

$spdkcli_job "/nvmf/subsystem/nqn.2014-08.org.spdk:cnode1/hosts create nqn.2014-08.org.spdk:cnode2" "nqn.2014-08.org.spdk:cnode2" True

$spdkcli_job "/nvmf/subsystem/nqn.2014-08.org.spdk:cnode1/namespaces create Malloc5" "Malloc5" True

$spdkcli_job "/nvmf/subsystem/nqn.2014-08.org.spdk:cnode1/namespaces create Malloc6" "Malloc6" True

$spdkcli_job "'/bdevs/malloc create 32 512 Malloc1' 'Malloc1' True

'/bdevs/malloc create 32 512 Malloc2' 'Malloc2' True

'/bdevs/malloc create 32 512 Malloc3' 'Malloc3' True

'/bdevs/malloc create 32 512 Malloc4' 'Malloc4' True

'/bdevs/malloc create 32 512 Malloc5' 'Malloc5' True

'/bdevs/malloc create 32 512 Malloc6' 'Malloc6' True

'nvmf/transport create RDMA max_qpairs_per_ctrlr=4 io_unit_size=8192' '' True

'/nvmf/subsystem create nqn.2014-08.org.spdk:cnode1 N37SXV509SRW\

  max_namespaces=4 allow_any_host=True' 'nqn.2014-08.org.spdk:cnode1' True

'/nvmf/subsystem/nqn.2014-08.org.spdk:cnode1/namespaces create Malloc3 1' 'Malloc3' True

'/nvmf/subsystem/nqn.2014-08.org.spdk:cnode1/namespaces create Malloc4 2' 'Malloc4' True

'/nvmf/subsystem/nqn.2014-08.org.spdk:cnode1/listen_addresses create \

 RDMA $NVMF_TARGET_IP 4260 IPv4' '$NVMF_TARGET_IP:4260' True

'/nvmf/subsystem create nqn.2014-08.org.spdk:cnode2 N37SXV509SRD\

 max_namespaces=2 allow_any_host=True' 'nqn.2014-08.org.spdk:cnode2' True

'/nvmf/subsystem/nqn.2014-08.org.spdk:cnode2/namespaces create Malloc2' 'Malloc2' True

'/nvmf/subsystem/nqn.2014-08.org.spdk:cnode2/listen_addresses create \

 RDMA $NVMF_TARGET_IP 4260 IPv4' '$NVMF_TARGET_IP:4260' True

'/nvmf/subsystem create nqn.2014-08.org.spdk:cnode3 N37SXV509SRR\

 max_namespaces=2 allow_any_host=True' 'nqn.2014-08.org.spdk:cnode2' True

'/nvmf/subsystem/nqn.2014-08.org.spdk:cnode3/namespaces create Malloc1' 'Malloc1' True

'/nvmf/subsystem/nqn.2014-08.org.spdk:cnode3/listen_addresses create \

 RDMA $NVMF_TARGET_IP 4260 IPv4' '$NVMF_TARGET_IP:4260' True

'/nvmf/subsystem/nqn.2014-08.org.spdk:cnode3/listen_addresses create \

 RDMA $NVMF_TARGET_IP 4261 IPv4' '$NVMF_TARGET_IP:4261' True

'/nvmf/subsystem/nqn.2014-08.org.spdk:cnode3/hosts create \

 nqn.2014-08.org.spdk:cnode1' 'nqn.2014-08.org.spdk:cnode1' True

'/nvmf/subsystem/nqn.2014-08.org.spdk:cnode3/hosts create \

 nqn.2014-08.org.spdk:cnode2' 'nqn.2014-08.org.spdk:cnode2' True

'/nvmf/subsystem/nqn.2014-08.org.spdk:cnode1 allow_any_host True' 'Allow any host'

'/nvmf/subsystem/nqn.2014-08.org.spdk:cnode1 allow_any_host False' 'Allow any host' True

'/nvmf/subsystem/nqn.2014-08.org.spdk:cnode1/listen_addresses create RDMA $NVMF_TARGET_IP 4261 IPv4' '$NVMF_TARGET_IP:4261' True

'/nvmf/subsystem/nqn.2014-08.org.spdk:cnode1/listen_addresses create RDMA $NVMF_TARGET_IP 4262 IPv4' '$NVMF_TARGET_IP:4262' True

'/nvmf/subsystem/nqn.2014-08.org.spdk:cnode1/hosts create nqn.2014-08.org.spdk:cnode2' 'nqn.2014-08.org.spdk:cnode2' True

'/nvmf/subsystem/nqn.2014-08.org.spdk:cnode1/namespaces create Malloc5' 'Malloc5' True

'/nvmf/subsystem/nqn.2014-08.org.spdk:cnode1/namespaces create Malloc6' 'Malloc6' True

"

timing_exit spdkcli_create_nvmf_config



timing_enter spdkcli_check_match
@@ -62,20 +63,21 @@ check_match 
timing_exit spdkcli_check_match



timing_enter spdkcli_clear_nvmf_config

$spdkcli_job "/nvmf/subsystem/nqn.2014-08.org.spdk:cnode1/namespaces delete nsid=1" "Malloc3"

$spdkcli_job "/nvmf/subsystem/nqn.2014-08.org.spdk:cnode1/namespaces delete_all" "Malloc4"

$spdkcli_job "/nvmf/subsystem/nqn.2014-08.org.spdk:cnode1/hosts delete nqn.2014-08.org.spdk:cnode2" "nqn.2014-08.org.spdk:cnode2"

$spdkcli_job "/nvmf/subsystem/nqn.2014-08.org.spdk:cnode3/hosts delete_all" "nqn.2014-08.org.spdk:cnode1"

$spdkcli_job "/nvmf/subsystem/nqn.2014-08.org.spdk:cnode1/listen_addresses delete RDMA $NVMF_TARGET_IP 4262" "$NVMF_TARGET_IP:4262"

$spdkcli_job "/nvmf/subsystem/nqn.2014-08.org.spdk:cnode1/listen_addresses delete_all" "$NVMF_TARGET_IP:4261"

$spdkcli_job "/nvmf/subsystem delete nqn.2014-08.org.spdk:cnode3" "nqn.2014-08.org.spdk:cnode3"

$spdkcli_job "/nvmf/subsystem delete_all" "nqn.2014-08.org.spdk:cnode2"

$spdkcli_job "/bdevs/malloc delete Malloc6" "Malloc6"

$spdkcli_job "/bdevs/malloc delete Malloc5" "Malloc5"

$spdkcli_job "/bdevs/malloc delete Malloc4" "Malloc4"

$spdkcli_job "/bdevs/malloc delete Malloc3" "Malloc3"

$spdkcli_job "/bdevs/malloc delete Malloc2" "Malloc2"

$spdkcli_job "/bdevs/malloc delete Malloc1" "Malloc1"

$spdkcli_job "'/nvmf/subsystem/nqn.2014-08.org.spdk:cnode1/namespaces delete nsid=1' 'Malloc3'

'/nvmf/subsystem/nqn.2014-08.org.spdk:cnode1/namespaces delete_all' 'Malloc4'

'/nvmf/subsystem/nqn.2014-08.org.spdk:cnode1/hosts delete nqn.2014-08.org.spdk:cnode2' 'nqn.2014-08.org.spdk:cnode2'

'/nvmf/subsystem/nqn.2014-08.org.spdk:cnode3/hosts delete_all' 'nqn.2014-08.org.spdk:cnode1'

'/nvmf/subsystem/nqn.2014-08.org.spdk:cnode1/listen_addresses delete RDMA $NVMF_TARGET_IP 4262' '$NVMF_TARGET_IP:4262'

'/nvmf/subsystem/nqn.2014-08.org.spdk:cnode1/listen_addresses delete_all' '$NVMF_TARGET_IP:4261'

'/nvmf/subsystem delete nqn.2014-08.org.spdk:cnode3' 'nqn.2014-08.org.spdk:cnode3'

'/nvmf/subsystem delete_all' 'nqn.2014-08.org.spdk:cnode2'

'/bdevs/malloc delete Malloc6' 'Malloc6'

'/bdevs/malloc delete Malloc5' 'Malloc5'

'/bdevs/malloc delete Malloc4' 'Malloc4'

'/bdevs/malloc delete Malloc3' 'Malloc3'

'/bdevs/malloc delete Malloc2' 'Malloc2'

'/bdevs/malloc delete Malloc1' 'Malloc1'

"

timing_exit spdkcli_clear_nvmf_config



killprocess $spdk_tgt_pid

test/spdkcli/pmem.sh

+10 −8
Original line number Diff line number Diff line
@@ -14,10 +14,11 @@ run_spdk_tgt 
timing_exit run_spdk_tgt



timing_enter spdkcli_create_pmem_config

$spdkcli_job "/bdevs/pmemblk create_pmem_pool /tmp/sample_pmem0 32 512" "" True

$spdkcli_job "/bdevs/pmemblk create /tmp/sample_pmem0 pmem_bdev0" "pmem_bdev0" True

$spdkcli_job "/bdevs/pmemblk create_pmem_pool /tmp/sample_pmem1 32 512" "" True

$spdkcli_job "/bdevs/pmemblk create /tmp/sample_pmem1 pmem_bdev1" "pmem_bdev1" True

$spdkcli_job "'/bdevs/pmemblk create_pmem_pool /tmp/sample_pmem0 32 512' '' True

'/bdevs/pmemblk create /tmp/sample_pmem0 pmem_bdev0' 'pmem_bdev0' True

'/bdevs/pmemblk create_pmem_pool /tmp/sample_pmem1 32 512' '' True

'/bdevs/pmemblk create /tmp/sample_pmem1 pmem_bdev1' 'pmem_bdev1' True

"

timing_exit spdkcli_create_pmem_config



timing_enter spdkcli_check_match
@@ -25,10 +26,11 @@ check_match 
timing_exit spdkcli_check_match



timing_enter spdkcli_clear_pmem_config

$spdkcli_job "/bdevs/pmemblk delete pmem_bdev0" "pmem_bdev0"

$spdkcli_job "/bdevs/pmemblk delete_pmem_pool /tmp/sample_pmem0" ""

$spdkcli_job "/bdevs/pmemblk delete_all" "pmem_bdev1"

$spdkcli_job "/bdevs/pmemblk delete_pmem_pool /tmp/sample_pmem1" ""

$spdkcli_job "'/bdevs/pmemblk delete pmem_bdev0' 'pmem_bdev0'

'/bdevs/pmemblk delete_pmem_pool /tmp/sample_pmem0' ''

'/bdevs/pmemblk delete_all' 'pmem_bdev1'

'/bdevs/pmemblk delete_pmem_pool /tmp/sample_pmem1' ''

"

rm -f /tmp/sample_pmem

timing_exit spdkcli_clear_pmem_config

test/spdkcli/rbd.sh

+6 −4
Original line number Diff line number Diff line
@@ -17,8 +17,9 @@ trap 'rbd_cleanup; on_error_exit' ERR 
rootdir=$(readlink -f $SPDKCLI_BUILD_DIR)

rbd_cleanup

rbd_setup 127.0.0.1

$spdkcli_job "/bdevs/rbd create rbd foo 512" "Ceph0" True

$spdkcli_job "/bdevs/rbd create rbd foo 512" "Ceph1" True

$spdkcli_job "'/bdevs/rbd create rbd foo 512' 'Ceph0' True

'/bdevs/rbd create rbd foo 512' 'Ceph1' True

"

timing_exit spdkcli_create_rbd_config



timing_enter spdkcli_check_match
@@ -26,8 +27,9 @@ check_match 
timing_exit spdkcli_check_match



timing_enter spdkcli_clear_rbd_config

$spdkcli_job "/bdevs/rbd delete Ceph0" "Ceph0"

$spdkcli_job "/bdevs/rbd delete_all" "Ceph1"

$spdkcli_job "\"/bdevs/rbd delete Ceph0' 'Ceph0'

'/bdevs/rbd delete_all' 'Ceph1'

"

rbd_cleanup

timing_exit spdkcli_clear_rbd_config

test/spdkcli/spdkcli_job.py

+18 −3
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
import pexpect

import os

import sys

import re





def execute_command(cmd, element=None, element_exists=False):
@@ -27,12 +28,26 @@ def execute_command(cmd, element=None, element_exists=False): 


if __name__ == "__main__":

    socket = "/var/tmp/spdk.sock"

    if len(sys.argv) == 5:

        socket = sys.argv[4]

    if len(sys.argv) == 3:

        socket = sys.argv[2]

    testdir = os.path.dirname(os.path.realpath(sys.argv[0]))

    child = pexpect.spawn(os.path.join(testdir, "../../scripts/spdkcli.py") + " -s %s" % socket)

    child.expect(">")

    child.sendline("cd /")

    child.expect("/>")



    execute_command(*sys.argv[1:4])
 
    cmd_lines = sys.argv[1].strip().split("\n")

    for line in cmd_lines:

        data = line.strip()

        p = re.compile('\'(.*?)\'')

        cmd = p.findall(data)

        if data[-1] != "\'":

            cmd.append(data.rsplit(" ", 1)[1].strip())

            if cmd[-1] == "False":

                cmd[-1] = False

            else:

                cmd[-1] = True

        else:

            cmd.append(False)

        print("Executing command: %s" % cmd)

        execute_command(*cmd[0:3])