Commit 89236d8f authored May 18, 2018 by Pawel Niedzwiecki Committed by Jim Harris May 30, 2018

test/vhost:Remove vhost configuration file from live migration test.



Change-Id: I78d6ddf008a9f1e3fefdaa3de4a47a46d0c654d7
Signed-off-by: Pawel Niedzwiecki <pawelx.niedzwiecki@intel.com>
Reviewed-on: https://review.gerrithub.io/411715


Tested-by: SPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: Daniel Verkamp <daniel.verkamp@intel.com>
Reviewed-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>

parent fbf06aca

test/vhost/migration/migration-tc1.sh

+1 −1

Original line number	Diff line number	Diff line
		@@ -57,7 +57,7 @@ function migration_tc1()
		local job_file="$MIGRATION_DIR/migration-tc1.job"

		# Run vhost
		spdk_vhost_run --conf-path=$MIGRATION_DIR
		spdk_vhost_run
		migration_tc1_configure_vhost

		notice "Setting up VMs"

test/vhost/migration/migration-tc2.sh

+2 −2

Original line number	Diff line number	Diff line
		@@ -101,11 +101,11 @@ function migration_tc2_configure_vhost()
		waitforlisten "$nvmf_tgt_pid" "$nvmf_dir/rpc.sock"
		timing_exit start_nvmf_tgt

		spdk_vhost_run --conf-path=$MIGRATION_DIR --memory=512 --vhost-num=0
		spdk_vhost_run --memory=512 --vhost-num=0
		# Those are global intentionaly
		vhost_1_reactor_mask=0x2
		vhost_1_master_core=1
		spdk_vhost_run --conf-path=$MIGRATION_DIR --memory=512 --vhost-num=1
		spdk_vhost_run --memory=512 --vhost-num=1

		local rdma_ip_list=$(get_available_rdma_ips)
		local nvmf_target_ip=$(echo "$rdma_ip_list" \| head -n 1)

test/vhost/migration/migration-tc3a.sh

+1 −1

Original line number	Diff line number	Diff line
		@@ -118,7 +118,7 @@ function host1_start_vhost()

		notice "Starting vhost0 instance on local server"
		trap 'host1_cleanup_vhost; error_exit "${FUNCNAME}" "${LINENO}"' INT ERR EXIT
		spdk_vhost_run --conf-path=$MIGRATION_DIR --vhost-num=0
		spdk_vhost_run --vhost-num=0
		$rpc_0 construct_nvme_bdev -b Nvme0 -t rdma -f ipv4 -a $RDMA_TARGET_IP -s 4420 -n "nqn.2018-02.io.spdk:cnode1"
		$rpc_0 construct_vhost_scsi_controller $incoming_vm_ctrlr
		$rpc_0 add_vhost_scsi_lun $incoming_vm_ctrlr 0 Nvme0n1

test/vhost/migration/migration-tc3b.sh

+1 −1

Original line number	Diff line number	Diff line
		@@ -33,7 +33,7 @@ function host_2_start_vhost()

		notice "Starting vhost 1 instance on remote server"
		trap 'host_2_cleanup_vhost; error_exit "${FUNCNAME}" "${LINENO}"' INT ERR EXIT
		spdk_vhost_run --conf-path=$MIGRATION_DIR --vhost-num=1
		spdk_vhost_run --vhost-num=1

		$rpc construct_nvme_bdev -b Nvme0 -t rdma -f ipv4 -a $RDMA_TARGET_IP -s 4420 -n "nqn.2018-02.io.spdk:cnode1"
		$rpc construct_vhost_scsi_controller $target_vm_ctrl

test/vhost/migration/vhost.conf.in

deleted100644 → 0

+0 −5

Original line number	Diff line number	Diff line
		[Global]
		NoPci Yes

		[Ioat]
		Disable Yes