6bef902ca5
RPC is a default feature required for almost all usages, so enable RPC by default, but with a UNIX domain socket for security reasons. -r can now be used from the command line to specify an alternative RPC listen address from the default /var/tmp/spdk.sock. Remove the Enable parameter from the Rpc config section but still allow specifying an alternative listen address using the Listen parameter as an alternative to the command line option. This keeps backward compatibility for this release for anyone using the configuration file still. Remove the Rpc sections from all configuration files that were using them, except for those that specified alternate TCP ports for multi-process test cases. We can fix these later to use an alternate UNIX domain socket and to use the command line instead. Signed-off-by: Jim Harris <james.r.harris@intel.com> Change-Id: Ife0d03fcab638c67b659f1eb85348ddc2b55c4c4 Reviewed-on: https://review.gerrithub.io/386561 Reviewed-by: Daniel Verkamp <daniel.verkamp@intel.com> Tested-by: SPDK Automated Test System <sys_sgsw@intel.com> Reviewed-by: Ben Walker <benjamin.walker@intel.com>
161 lines
4.3 KiB
Bash
Executable File
161 lines
4.3 KiB
Bash
Executable File
#!/usr/bin/env bash
|
|
|
|
set -xe
|
|
|
|
basedir=$(readlink -f $(dirname $0))
|
|
rootdir=$(readlink -f $basedir/../../..)
|
|
testdir=$(readlink -f $rootdir/..)
|
|
qemu_install_dir="$testdir/root"
|
|
MAKE="make -j$(( $(nproc) * 2 ))"
|
|
|
|
rpc_py="python $rootdir/scripts/rpc.py "
|
|
HOST_IP=192.200.200.1
|
|
VM_IP=192.200.200.254
|
|
VM_UNAME="root"
|
|
VM_PASS="root"
|
|
VM_NAME="int_test_vm"
|
|
VM_NET_NAME="int_test_net"
|
|
VM_MAC="02:de:ad:de:ad:01"
|
|
VM_BAK_IMG="/tmp/int_test_backing.img"
|
|
TIMEO=60
|
|
SSHCMD="sshpass -p $VM_PASS ssh"
|
|
SCPCMD="sshpass -p $VM_PASS scp"
|
|
|
|
while getopts 'i:m:f:' optchar; do
|
|
case $optchar in
|
|
i) VM_IMG="${OPTARG#*=}" ;;
|
|
m) VHOST_MODE="${OPTARG#*=}" ;;
|
|
f) VM_FS="${OPTARG#*=}" ;;
|
|
esac
|
|
done
|
|
|
|
source $rootdir/scripts/autotest_common.sh
|
|
|
|
if [ -z "$VM_IMG" ]; then
|
|
echo "ERROR: VM_IMG: path to qcow2 image not provided - not running"
|
|
exit 1
|
|
fi
|
|
|
|
if [ -z "$VHOST_MODE" ]; then
|
|
echo "ERROR: VHOST_MODE: please specify Vhost mode - scsi or blk"
|
|
fi
|
|
|
|
if [ -z "$VM_FS" ]; then
|
|
VM_FS="ext4"
|
|
echo "INFO: Using default value for filesystem: $VM_FS"
|
|
fi
|
|
|
|
# Check if Qemu binary is present
|
|
if [[ -z $VM_QEMU ]]; then
|
|
VM_QEMU="$qemu_install_dir/bin/qemu-system-x86_64"
|
|
fi
|
|
|
|
if [[ ! -x $VM_QEMU ]]; then
|
|
echo "ERROR: QEMU binary not present in $VM_QEMU"
|
|
fi
|
|
|
|
echo "Running test with filesystem: $VM_FS"
|
|
|
|
function cleanup_virsh() {
|
|
if virsh domstate $VM_NAME; then
|
|
virsh shutdown $VM_NAME
|
|
for timeo in `seq 0 10`; do
|
|
if ! virsh domstate $VM_NAME; then
|
|
break
|
|
fi
|
|
if [[ $timeo -eq 10 ]]; then
|
|
echo "ERROR: VM did not shutdown, killing!"
|
|
virsh destroy $VM_NAME
|
|
fi
|
|
sleep 1
|
|
done
|
|
fi
|
|
|
|
if virsh net-info $VM_NET_NAME; then
|
|
virsh net-destroy $VM_NET_NAME
|
|
fi
|
|
rm $VM_BAK_IMG || true
|
|
}
|
|
|
|
timing_enter integrity_test
|
|
|
|
# Backing image for VM
|
|
qemu-img create -f qcow2 -o backing_file=$VM_IMG $VM_BAK_IMG
|
|
|
|
# Prepare vhost config
|
|
cp $basedir/vhost.conf.in $basedir/vhost.conf
|
|
$rootdir/scripts/gen_nvme.sh >> $basedir/vhost.conf
|
|
|
|
# Prepare .xml files for Virsh
|
|
cp $basedir/base_vm.xml $basedir/vm_conf.xml
|
|
cp $basedir/base_vnet.xml $basedir/vnet_conf.xml
|
|
sed -i "s@<name></name>@<name>$VM_NAME</name>@g" $basedir/vm_conf.xml
|
|
sed -i "s@source file=''@source file='$VM_BAK_IMG'@g" $basedir/vm_conf.xml
|
|
sed -i "s@<emulator></emulator>@<emulator>$VM_QEMU</emulator>@g" $basedir/vm_conf.xml
|
|
sed -i "s@mac address=''@mac address='$VM_MAC'@g" $basedir/vm_conf.xml
|
|
sed -i "s@source network=''@source network='$VM_NET_NAME'@g" $basedir/vm_conf.xml
|
|
sed -i "s@<name></name>@<name>$VM_NET_NAME</name>@g" $basedir/vnet_conf.xml
|
|
if [[ "$VHOST_MODE" == "scsi" ]]; then
|
|
sed -i "s@vhost_dev_args@vhost-user-scsi-pci,id=scsi0@g" $basedir/vm_conf.xml
|
|
else
|
|
sed -i "s@vhost_dev_args@vhost-user-blk-pci,size=30G,logical_block_size=4096@g" $basedir/vm_conf.xml
|
|
fi
|
|
|
|
trap "cleanup_virsh; killprocess $pid; exit 1" SIGINT SIGTERM EXIT
|
|
|
|
virsh net-create $basedir/vnet_conf.xml
|
|
|
|
# Change directory and ownership because virsh has issues with
|
|
# paths that are in /root tree
|
|
cd /tmp
|
|
$rootdir/app/vhost/vhost -c $basedir/vhost.conf &
|
|
pid=$!
|
|
echo "Process pid: $pid"
|
|
waitforlisten "$pid"
|
|
if [[ "$VHOST_MODE" == "scsi" ]]; then
|
|
$rpc_py construct_vhost_scsi_controller naa.0
|
|
$rpc_py add_vhost_scsi_lun naa.0 0 Nvme0n1
|
|
else
|
|
$rpc_py construct_vhost_blk_controller naa.0 Nvme0n1
|
|
fi
|
|
chmod 777 /tmp/naa.0
|
|
|
|
virsh create $basedir/vm_conf.xml
|
|
virsh net-update $VM_NET_NAME add ip-dhcp-host "<host mac='$VM_MAC' name='$VM_NAME' ip='$VM_IP'/>"
|
|
|
|
# Wait for VM to boot
|
|
echo "INFO: Trying to connect to virtual machine..."
|
|
while ! $SSHCMD root@$VM_IP -q -oStrictHostKeyChecking=no 'echo Hello'; do
|
|
sleep 1
|
|
if ! (( TIMEO-=1 ));then
|
|
echo "ERROR: VM did not boot properly, exiting"
|
|
exit 1
|
|
fi
|
|
done
|
|
|
|
# Run test on Virtual Machine
|
|
$SCPCMD -r $basedir/integrity_vm.sh root@$VM_IP:~
|
|
$SSHCMD root@$VM_IP "fs=$VM_FS ~/integrity_vm.sh $VHOST_MODE"
|
|
|
|
# Kill VM, cleanup config files
|
|
cleanup_virsh
|
|
rm $basedir/vm_conf.xml || true
|
|
rm $basedir/vnet_conf.xml || true
|
|
rm $basedir/vhost.conf || true
|
|
|
|
# Try to gracefully stop spdk vhost
|
|
if /bin/kill -INT $pid; then
|
|
while /bin/kill -0 $pid; do
|
|
sleep 1
|
|
done
|
|
elif /bin/kill -0 $pid; then
|
|
killprocess $pid
|
|
echo "ERROR: Vhost was not closed gracefully..."
|
|
exit 1
|
|
else
|
|
exit 1
|
|
fi
|
|
|
|
trap - SIGINT SIGTERM EXIT
|
|
timing_exit integrity_test
|