mirror of
https://github.com/openvswitch/ovs
synced 2025-08-22 01:51:26 +00:00
3c572af65e
With the '--pretty' option, appctl.py will now print JSON output in a more readable fashion, i.e. with additional line breaks, spaces and sorted dictionary keys. The pretty-printed output from appctl.py is not strictly the same as with ovs-appctl because of both use different pretty-printing implementations. Signed-off-by: Jakob Meng <code@jakobmeng.de> Signed-off-by: Ilya Maximets <i.maximets@ovn.org>
174 lines
5.6 KiB
Plaintext
174 lines
5.6 KiB
Plaintext
AT_BANNER([unixctl])
|
|
|
|
m4_define([APPCTL], [ovs-appctl --timeout 20])
|
|
m4_define([PYAPPCTL_PY], [$PYTHON3 $srcdir/appctl.py --timeout 20])
|
|
|
|
AT_SETUP([unixctl ovs-vswitchd exit - Python3])
|
|
AT_KEYWORDS([python unixctl])
|
|
OVS_VSWITCHD_START
|
|
|
|
AT_CHECK([PYAPPCTL_PY -t ovs-vswitchd exit], [0], [])
|
|
OVS_WAIT_WHILE([test -s ovs-vswitchd.pid])
|
|
|
|
AT_CHECK([PYAPPCTL_PY -t ovsdb-server exit], [0], [])
|
|
OVS_WAIT_WHILE([test -s ovsdb-server.pid])
|
|
AT_CLEANUP
|
|
|
|
AT_SETUP([unixctl ovs-vswitchd list-commands - Python3])
|
|
OVS_VSWITCHD_START
|
|
|
|
AT_CHECK([APPCTL list-commands], [0], [stdout])
|
|
AT_CHECK([head -1 stdout], [0], [dnl
|
|
The available commands are:
|
|
])
|
|
mv stdout expout
|
|
AT_CHECK([PYAPPCTL_PY list-commands], [0], [expout])
|
|
|
|
OVS_VSWITCHD_STOP
|
|
AT_CLEANUP]
|
|
|
|
AT_SETUP([unixctl ovs-vswitchd arguments - Python3])
|
|
OVS_VSWITCHD_START
|
|
|
|
AT_CHECK([APPCTL bond/hash], [2], [], [stderr])
|
|
AT_CHECK([head -1 stderr], [0], [dnl
|
|
"bond/hash" command requires at least 1 arguments
|
|
])
|
|
sed 's/ovs-appctl/appctl.py/' stderr > experr
|
|
AT_CHECK([PYAPPCTL_PY bond/hash], [2], [], [experr])
|
|
|
|
AT_CHECK([APPCTL bond/hash mac], [2], [], [stderr])
|
|
AT_CHECK([head -1 stderr], [0], [dnl
|
|
invalid mac
|
|
])
|
|
sed 's/ovs-appctl/appctl.py/' stderr > experr
|
|
AT_CHECK([PYAPPCTL_PY bond/hash mac], [2], [], [experr])
|
|
|
|
AT_CHECK([APPCTL bond/hash mac vlan], [2], [], [stderr])
|
|
AT_CHECK([head -1 stderr], [0], [dnl
|
|
invalid vlan
|
|
])
|
|
sed 's/ovs-appctl/appctl.py/' stderr > experr
|
|
AT_CHECK([PYAPPCTL_PY bond/hash mac vlan], [2], [], [experr])
|
|
|
|
AT_CHECK([APPCTL bond/hash mac vlan basis], [2], [], [stderr])
|
|
AT_CHECK([head -1 stderr], [0], [dnl
|
|
invalid vlan
|
|
])
|
|
sed 's/ovs-appctl/appctl.py/' stderr > experr
|
|
AT_CHECK([PYAPPCTL_PY bond/hash vlan basis], [2], [], [experr])
|
|
|
|
AT_CHECK([APPCTL bond/hash mac vlan basis extra], [2], [], [stderr])
|
|
AT_CHECK([head -1 stderr], [0], [dnl
|
|
"bond/hash" command takes at most 3 arguments
|
|
])
|
|
sed 's/ovs-appctl/appctl.py/' stderr > experr
|
|
AT_CHECK([PYAPPCTL_PY bond/hash mac vlan basis extra], [2], [], [experr])
|
|
|
|
OVS_VSWITCHD_STOP
|
|
AT_CLEANUP
|
|
|
|
AT_SETUP([unixctl bad target - Python3])
|
|
AT_CHECK([PYAPPCTL_PY -t bogus doit], [1], [], [stderr])
|
|
AT_CHECK_UNQUOTED([tail -1 stderr], [0], [dnl
|
|
appctl.py: cannot read pidfile "`pwd`/bogus.pid" (No such file or directory)
|
|
])
|
|
if test "$IS_WIN32" = "no"; then
|
|
AT_CHECK([PYAPPCTL_PY -t /bogus/path.pid doit], [1], [], [stderr])
|
|
AT_CHECK([tail -1 stderr], [0], [dnl
|
|
appctl.py: cannot connect to "/bogus/path.pid" (No such file or directory)
|
|
])
|
|
else
|
|
AT_CHECK([PYAPPCTL_PY -t c:/bogus/path.pid doit], [1], [], [stderr])
|
|
AT_CHECK([tail -1 stderr], [0], [dnl
|
|
appctl.py: cannot connect to "c:/bogus/path.pid" (No such file or directory)
|
|
])
|
|
fi
|
|
AT_CLEANUP
|
|
|
|
AT_SETUP([unixctl server - Python3])
|
|
on_exit 'kill `cat test-unixctl.py.pid`'
|
|
AT_CAPTURE_FILE([`pwd`/test-unixctl.py.log])
|
|
AT_CHECK([$PYTHON3 $srcdir/test-unixctl.py --log-file --pidfile --detach --no-chdir])
|
|
|
|
AT_CHECK([APPCTL -t test-unixctl.py help], [0], [stdout])
|
|
AT_CHECK([cat stdout], [0], [dnl
|
|
The available commands are:
|
|
block
|
|
echo [[arg ...]]
|
|
echo_error [[arg ...]]
|
|
exit
|
|
help
|
|
log [[arg ...]]
|
|
set-options [[--format text|json]]
|
|
version
|
|
vlog/close
|
|
vlog/list
|
|
vlog/reopen
|
|
vlog/set spec
|
|
])
|
|
mv stdout expout
|
|
AT_CHECK([PYAPPCTL_PY -t test-unixctl.py help], [0], [expout])
|
|
|
|
AT_CHECK([ovs-vsctl --version | sed 's/ovs-vsctl/test-unixctl.py/' | head -1 > expout])
|
|
AT_CHECK([APPCTL -t test-unixctl.py version], [0], [expout])
|
|
AT_CHECK([PYAPPCTL_PY -t test-unixctl.py version], [0], [expout])
|
|
AT_CHECK_UNQUOTED([PYAPPCTL_PY -t test-unixctl.py --format json version], [0], [dnl
|
|
{"reply":"$(cat expout)","reply-format":"plain"}
|
|
])
|
|
AT_CHECK_UNQUOTED([PYAPPCTL_PY -t test-unixctl.py --format JSON version], [0], [dnl
|
|
{"reply":"$(cat expout)","reply-format":"plain"}
|
|
])
|
|
AT_CHECK_UNQUOTED([PYAPPCTL_PY -t test-unixctl.py --format json --pretty version], [0], [dnl
|
|
{
|
|
"reply":"$(cat expout)",
|
|
"reply-format":"plain"
|
|
}
|
|
])
|
|
|
|
AT_CHECK([APPCTL -t test-unixctl.py echo robot ninja], [0], [stdout])
|
|
AT_CHECK([cat stdout | sed -e "s/u'/'/g"], [0], [dnl
|
|
[['robot', 'ninja']]
|
|
])
|
|
mv stdout expout
|
|
AT_CHECK([PYAPPCTL_PY -t test-unixctl.py echo robot ninja], [0], [expout])
|
|
|
|
AT_CHECK([APPCTL -t test-unixctl.py echo_error robot ninja], [2], [], [stderr])
|
|
AT_CHECK([cat stderr | sed -e "s/u'/'/g"], [0], [dnl
|
|
[['robot', 'ninja']]
|
|
ovs-appctl: test-unixctl.py: server returned an error
|
|
])
|
|
sed 's/ovs-appctl/appctl.py/' stderr > experr
|
|
AT_CHECK([PYAPPCTL_PY -t test-unixctl.py echo_error robot ninja], [2], [], [experr])
|
|
|
|
AT_CHECK([APPCTL -t test-unixctl.py echo], [2], [], [stderr])
|
|
AT_CHECK([cat stderr], [0], [dnl
|
|
"echo" command requires at least 1 arguments
|
|
ovs-appctl: test-unixctl.py: server returned an error
|
|
])
|
|
sed 's/ovs-appctl/appctl.py/' stderr > experr
|
|
AT_CHECK([PYAPPCTL_PY -t test-unixctl.py echo], [2], [], [experr])
|
|
|
|
AT_CHECK([APPCTL -t test-unixctl.py echo robot ninja pirates], [2], [], [stderr])
|
|
AT_CHECK([cat stderr], [0], [dnl
|
|
"echo" command takes at most 2 arguments
|
|
ovs-appctl: test-unixctl.py: server returned an error
|
|
])
|
|
sed 's/ovs-appctl/appctl.py/' stderr > experr
|
|
AT_CHECK([PYAPPCTL_PY -t test-unixctl.py echo robot ninja pirates], [2], [], [experr])
|
|
|
|
AT_CHECK([APPCTL -t test-unixctl.py bogus], [2], [], [stderr])
|
|
AT_CHECK([cat stderr], [0], [dnl
|
|
"bogus" is not a valid command
|
|
ovs-appctl: test-unixctl.py: server returned an error
|
|
])
|
|
sed 's/ovs-appctl/appctl.py/' stderr > experr
|
|
AT_CHECK([PYAPPCTL_PY -t test-unixctl.py bogus], [2], [], [experr])
|
|
|
|
AT_CHECK([APPCTL -t test-unixctl.py exit])
|
|
AT_CLEANUP
|
|
|
|
AT_SETUP([unixctl server errors - Python3])
|
|
AT_CHECK($PYTHON3 $srcdir/test-unixctl.py --unixctl "`pwd`"/bogus/path, [1], [], [ignore])
|
|
AT_CLEANUP
|