mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-11-05 04:41:20 +00:00
676cb4f4e7
Introducing keepalive similarly to Guannan around 2 years ago. Since we want to introduce keepalive for every connection, it makes sense to wrap the connecting function into new virsh one that can deal keepalive as well. Function vshConnect() is now used for connecting and keepalive added in that function (if possible) helps preventing long waits e.g. while nework goes down during migration. This patch also adds the options for keepalive tuning into virsh and fails connecting only when keepalives are explicitly requested and cannot be set (whether it is due to missing support in connected driver or remote server). If not explicitely requested, a debug message is printed (hence the addition to virsh-optparse test). Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1073506 Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=822839 Signed-off-by: Martin Kletzander <mkletzan@redhat.com>
141 lines
3.8 KiB
Bash
Executable File
141 lines
3.8 KiB
Bash
Executable File
#!/bin/sh
|
|
# Ensure that virsh option parsing doesn't regress
|
|
|
|
# Copyright (C) 2011-2012, 2014 Red Hat, Inc.
|
|
|
|
# This program is free software: you can redistribute it and/or modify
|
|
# it under the terms of the GNU General Public License as published by
|
|
# the Free Software Foundation, either version 2 of the License, or
|
|
# (at your option) any later version.
|
|
|
|
# This program is distributed in the hope that it will be useful,
|
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
# GNU General Public License for more details.
|
|
|
|
# You should have received a copy of the GNU General Public License
|
|
# along with this program. If not, see
|
|
# <http://www.gnu.org/licenses/>.
|
|
|
|
: ${srcdir=$(pwd)}
|
|
: ${abs_top_srcdir=$(pwd)/..}
|
|
: ${abs_top_builddir=$(pwd)/..}
|
|
|
|
# If $abs_top_builddir/tools is not early in $PATH, put it there,
|
|
# so that we can safely invoke "virsh" simply with its name.
|
|
case $PATH in
|
|
$abs_top_builddir/tools/src:$abs_top_builddir/tools:*) ;;
|
|
$abs_top_builddir/tools:*) ;;
|
|
*) PATH=$abs_top_builddir/tools:$PATH; export PATH ;;
|
|
esac
|
|
|
|
if test "$VERBOSE" = yes; then
|
|
set -x
|
|
virsh --version
|
|
fi
|
|
|
|
. "$srcdir/test-lib.sh"
|
|
|
|
cat <<\EOF > exp-out || framework_failure
|
|
|
|
setvcpus: <domain> trying as domain NAME
|
|
setvcpus: count(optdata): 2
|
|
setvcpus: domain(optdata): test
|
|
setvcpus: found option <domain>: test
|
|
EOF
|
|
|
|
fail=0
|
|
|
|
test_url=test:///default
|
|
|
|
for args in \
|
|
'test 2' \
|
|
'--domain test 2' \
|
|
'--domain=test 2' \
|
|
'test --count 2' \
|
|
'test --count=2' \
|
|
'--domain test --count 2' \
|
|
'--domain=test --count 2' \
|
|
'--domain test --count=2' \
|
|
'--domain=test --count=2' \
|
|
'--count 2 --domain test' \
|
|
'--count 2 --domain=test' \
|
|
'--count=2 --domain test' \
|
|
'--count=2 --domain=test' \
|
|
'--count 2 test' \
|
|
'--count=2 test' \
|
|
; do
|
|
virsh -k0 -d0 -c $test_url setvcpus $args >out 2>>err || fail=1
|
|
LC_ALL=C sort out | compare exp-out - || fail=1
|
|
done
|
|
|
|
# Another complex parsing example
|
|
cat <<\EOF > exp-out || framework_failure
|
|
<domainsnapshot>
|
|
<description>1<2</description>
|
|
<memory file='d,e'/>
|
|
<disks>
|
|
<disk name='vda' snapshot='external'>
|
|
<source file='a&b,c'/>
|
|
</disk>
|
|
<disk name='vdb'/>
|
|
</disks>
|
|
</domainsnapshot>
|
|
|
|
EOF
|
|
virsh -q -c $test_url snapshot-create-as --print-xml test \
|
|
--diskspec 'vda,file=a&b,,c,snapshot=external' --description '1<2' \
|
|
--diskspec vdb --memspec file=d,,e >out 2>>err || fail=1
|
|
compare exp-out out || fail=1
|
|
|
|
cat <<\EOF > exp-out || framework_failure
|
|
<domainsnapshot>
|
|
<name>name</name>
|
|
<description>vda</description>
|
|
<disks>
|
|
<disk name='vdb'/>
|
|
</disks>
|
|
</domainsnapshot>
|
|
|
|
EOF
|
|
virsh -q -c $test_url snapshot-create-as --print-xml test name vda vdb \
|
|
>out 2>>err || fail=1
|
|
compare exp-out out || fail=1
|
|
|
|
cat <<\EOF > exp-out || framework_failure
|
|
<domainsnapshot>
|
|
<name>name</name>
|
|
<description>desc</description>
|
|
<disks>
|
|
<disk name='vda'/>
|
|
<disk name='vdb'/>
|
|
</disks>
|
|
</domainsnapshot>
|
|
|
|
EOF
|
|
for args in \
|
|
'test name desc vda vdb' \
|
|
'test name desc --diskspec vda vdb' \
|
|
'test name desc --diskspec vda --diskspec vdb' \
|
|
'test name desc vda vdb' \
|
|
'test --diskspec vda name --diskspec vdb desc' \
|
|
'--description desc --name name --domain test vda vdb' \
|
|
'--description desc --diskspec vda --name name --domain test vdb' \
|
|
; do
|
|
virsh -q -c $test_url snapshot-create-as --print-xml $args \
|
|
>out 2>>err || fail=1
|
|
compare exp-out out || fail=1
|
|
done
|
|
|
|
test -s err && fail=1
|
|
|
|
# Test a required argv
|
|
cat <<\EOF > exp-err || framework_failure
|
|
error: this function is not supported by the connection driver: virDomainQemuMonitorCommand
|
|
EOF
|
|
virsh -q -c $test_url qemu-monitor-command test a >out 2>err && fail=1
|
|
test -s out && fail=1
|
|
compare exp-err err || fail=1
|
|
|
|
(exit $fail); exit $fail
|