ivampiresp/Spdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

test/vhost: don't call vm_run.sh helper script to start VM

Browse Source 
vm_run.sh is a proxy script for vm_run function which should
be called directly.

Change-Id: Ia7ac242fe8c24b9ce76e6d5483bd52f84225b0bb
Signed-off-by: Pawel Wodkowski <pawelx.wodkowski@intel.com>
Reviewed-on: https://review.gerrithub.io/393159
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
Reviewed-by: Dariusz Stojaczyk <dariuszx.stojaczyk@intel.com>
Reviewed-by: Karol Latecki <karol.latecki@intel.com>
Tested-by: SPDK Automated Test System <sys_sgsw@intel.com>
This commit is contained in:
Pawel Wodkowski 2017-12-28 16:24:44 +01:00 committed by Jim Harris
parent aa0f44b53b
commit 61ba62bdae
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test/vhost/fiotest/autotest.sh
View File

@ -195,7 +195,7 @@ for vm_conf in ${vms[@]}; do
done done
# Run everything # Run everything
$COMMON_DIR/vm_run.sh $x --work-dir=$TEST_DIR $used_vms vm_run $used_vms
vm_wait_for_boot 600 $used_vms vm_wait_for_boot 600 $used_vms
if [[ $test_type == "spdk_vhost_scsi" ]]; then if [[ $test_type == "spdk_vhost_scsi" ]]; then

2
test/vhost/hotplug/common.sh
View File

@ -114,7 +114,7 @@ function vms_setup() {
function vms_setup_and_run() { function vms_setup_and_run() {
vms_setup vms_setup
# Run everything # Run everything
$BASE_DIR/../common/vm_run.sh $x --work-dir=$TEST_DIR $used_vms vm_run $used_vms
vm_wait_for_boot 600 $used_vms vm_wait_for_boot 600 $used_vms
} }

2
test/vhost/lvol/lvol_test.sh
View File

@ -219,7 +219,7 @@ $rpc_py get_vhost_controllers
$rpc_py get_luns $rpc_py get_luns
# Run VMs # Run VMs
$COMMON_DIR/vm_run.sh $x --work-dir=$TEST_DIR $used_vms vm_run $used_vms
vm_wait_for_boot 600 $used_vms vm_wait_for_boot 600 $used_vms
# Get disk names from VMs and run FIO traffic # Get disk names from VMs and run FIO traffic

6
test/vhost/readonly/readonly.sh
View File

@ -92,7 +92,7 @@ function blk_ro_tc1()
setup_cmd+=" --disk=$disk" setup_cmd+=" --disk=$disk"
$setup_cmd $setup_cmd
$COMMON_DIR/vm_run.sh $x --work-dir=$TEST_DIR $vm_no vm_run $vm_no
vm_wait_for_boot 600 $vm_no vm_wait_for_boot 600 $vm_no
notice "Prepearing partition and file on guest VM" notice "Prepearing partition and file on guest VM"
vm_ssh $vm_no "bash -s" < $BASE_DIR/disabled_readonly_vm.sh vm_ssh $vm_no "bash -s" < $BASE_DIR/disabled_readonly_vm.sh
@ -104,7 +104,7 @@ function blk_ro_tc1()
$rpc_py remove_vhost_controller $vhost_blk_name $rpc_py remove_vhost_controller $vhost_blk_name
$rpc_py construct_vhost_blk_controller -r $vhost_blk_name $disk_name $rpc_py construct_vhost_blk_controller -r $vhost_blk_name $disk_name
$COMMON_DIR/vm_run.sh $x --work-dir=$TEST_DIR $vm_no vm_run $vm_no
vm_wait_for_boot 600 $vm_no vm_wait_for_boot 600 $vm_no
notice "Testing readonly feature on guest VM" notice "Testing readonly feature on guest VM"
vm_ssh $vm_no "bash -s" < $BASE_DIR/enabled_readonly_vm.sh vm_ssh $vm_no "bash -s" < $BASE_DIR/enabled_readonly_vm.sh
@ -116,7 +116,7 @@ function blk_ro_tc1()
$rpc_py remove_vhost_controller $vhost_blk_name $rpc_py remove_vhost_controller $vhost_blk_name
$rpc_py construct_vhost_blk_controller $vhost_blk_name $disk_name $rpc_py construct_vhost_blk_controller $vhost_blk_name $disk_name
$COMMON_DIR/vm_run.sh $x --work-dir=$TEST_DIR $vm_no vm_run $vm_no
vm_wait_for_boot 600 $vm_no vm_wait_for_boot 600 $vm_no
notice "removing partition and file from test disk on guest VM" notice "removing partition and file from test disk on guest VM"
vm_ssh $vm_no "bash -s" < $BASE_DIR/delete_partition_vm.sh vm_ssh $vm_no "bash -s" < $BASE_DIR/delete_partition_vm.sh