Commit 61ba62bd authored by Pawel Wodkowski's avatar Pawel Wodkowski Committed by Jim Harris
Browse files

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



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

Change-Id: Ia7ac242fe8c24b9ce76e6d5483bd52f84225b0bb
Signed-off-by: default avatarPawel Wodkowski <pawelx.wodkowski@intel.com>
Reviewed-on: https://review.gerrithub.io/393159


Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
Reviewed-by: default avatarDariusz Stojaczyk <dariuszx.stojaczyk@intel.com>
Reviewed-by: default avatarKarol Latecki <karol.latecki@intel.com>
Tested-by: default avatarSPDK Automated Test System <sys_sgsw@intel.com>
parent aa0f44b5

test/vhost/fiotest/autotest.sh

+1 −1
Original line number Diff line number Diff line
@@ -195,7 +195,7 @@ for vm_conf in ${vms[@]}; do 
done



# 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



if [[ $test_type == "spdk_vhost_scsi" ]]; then

test/vhost/hotplug/common.sh

+1 −1
Original line number Diff line number Diff line
@@ -114,7 +114,7 @@ function vms_setup() { 
function vms_setup_and_run() {

    vms_setup

    # 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

}

test/vhost/lvol/lvol_test.sh

+1 −1
Original line number Diff line number Diff line
@@ -219,7 +219,7 @@ $rpc_py get_vhost_controllers 
$rpc_py get_luns



# 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



# Get disk names from VMs and run FIO traffic

test/vhost/readonly/readonly.sh

+3 −3
Original line number Diff line number Diff line
@@ -92,7 +92,7 @@ function blk_ro_tc1() 
	setup_cmd+=" --disk=$disk"

	$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

	notice "Prepearing partition and file on guest VM"

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

	notice "Testing readonly feature on guest VM"

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

	notice "removing partition and file from test disk on guest VM"

	vm_ssh $vm_no "bash -s" < $BASE_DIR/delete_partition_vm.sh