From: Alexey Kirillov <lekiravi@yandex-team.ru> To: Eric Blake <eblake@redhat.com>, Thomas Huth <huth@tuxfamily.org>, Markus Armbruster <armbru@redhat.com> Cc: "Peter Maydell" <peter.maydell@linaro.org>, "Dmitry Fleytman" <dmitry.fleytman@gmail.com>, "Michael S. Tsirkin" <mst@redhat.com>, "Jason Wang" <jasowang@redhat.com>, qemu-devel@nongnu.org, "Vincenzo Maffione" <v.maffione@gmail.com>, "Gerd Hoffmann" <kraxel@redhat.com>, "Edgar E. Iglesias" <edgar.iglesias@gmail.com>, "Sven Schnelle" <svens@stackframe.org>, "Rob Herring" <robh@kernel.org>, "Stefano Stabellini" <sstabellini@kernel.org>, "Paul Durrant" <paul@xen.org>, "Joel Stanley" <joel@jms.id.au>, "Anthony Perard" <anthony.perard@citrix.com>, "Samuel Thibault" <samuel.thibault@ens-lyon.org>, "Aleksandar Rikalo" <aleksandar.rikalo@rt-rk.com>, "David Gibson" <david@gibson.dropbear.id.au>, "Laurent Vivier" <lvivier@redhat.com>, "Jiri Pirko" <jiri@resnulli.us>, yc-core@yandex-team.ru, "Stefan Weil" <sw@weilnetz.de>, "Alistair Francis" <alistair@alistair23.me>, "Beniamino Galvani" <b.galvani@gmail.com>, qemu-arm@nongnu.org, "Peter Chubb" <peter.chubb@nicta.com.au>, "Cédric Le Goater" <clg@kaod.org>, xen-devel@lists.xenproject.org, "Giuseppe Lettieri" <g.lettieri@iet.unipi.it>, "Luigi Rizzo" <rizzo@iet.unipi.it>, "Richard Henderson" <rth@twiddle.net>, "Andrew Jeffery" <andrew@aj.id.au>, "Michael Walle" <michael@walle.cc>, qemu-ppc@nongnu.org, "Aleksandar Markovic" <amarkovic@wavecomp.com>, "Alexey Kirillov" <lekiravi@yandex-team.ru>, "Paolo Bonzini" <pbonzini@redhat.com> Subject: [PATCH v2 2/4] tests: Add tests for query-netdevs command Date: Wed, 4 Mar 2020 16:06:54 +0300 [thread overview] Message-ID: <20200304130656.16859-3-lekiravi@yandex-team.ru> (raw) In-Reply-To: <20200304130656.16859-1-lekiravi@yandex-team.ru> Signed-off-by: Alexey Kirillov <lekiravi@yandex-team.ru> --- tests/qtest/Makefile.include | 2 + tests/qtest/test-query-netdevs.c | 120 +++++++++++++++++++++++++++++++ 2 files changed, 122 insertions(+) create mode 100644 tests/qtest/test-query-netdevs.c diff --git a/tests/qtest/Makefile.include b/tests/qtest/Makefile.include index e769c1ad70..6924843ef9 100644 --- a/tests/qtest/Makefile.include +++ b/tests/qtest/Makefile.include @@ -9,6 +9,7 @@ check-qtest-generic-y += qmp-cmd-test check-qtest-generic-y += qom-test check-qtest-generic-$(CONFIG_MODULES) += modules-test check-qtest-generic-y += test-hmp +check-qtest-generic-$(CONFIG_SLIRP) += test-query-netdevs check-qtest-pci-$(CONFIG_RTL8139_PCI) += rtl8139-test check-qtest-pci-$(CONFIG_VGA) += display-vga-test @@ -303,6 +304,7 @@ tests/qtest/tpm-crb-test$(EXESUF): tests/qtest/tpm-crb-test.o tests/qtest/tpm-em tests/qtest/tpm-tis-swtpm-test$(EXESUF): tests/qtest/tpm-tis-swtpm-test.o tests/qtest/tpm-emu.o \ tests/qtest/tpm-util.o tests/qtest/tpm-tests.o $(test-io-obj-y) tests/qtest/tpm-tis-test$(EXESUF): tests/qtest/tpm-tis-test.o tests/qtest/tpm-emu.o $(test-io-obj-y) +tests/qtest/test-query-netdevs$(EXESUF): tests/qtest/test-query-netdevs.o # QTest rules diff --git a/tests/qtest/test-query-netdevs.c b/tests/qtest/test-query-netdevs.c new file mode 100644 index 0000000000..e077358a50 --- /dev/null +++ b/tests/qtest/test-query-netdevs.c @@ -0,0 +1,120 @@ +/* + * QTest testcase for the query-netdevs + * + * Copyright Yandex N.V., 2019 + * + * This work is licensed under the terms of the GNU GPL, version 2 or later. + * See the COPYING file in the top-level directory. + * + */ + +#include "qemu/osdep.h" + +#include "libqtest.h" +#include "qapi/qmp/qdict.h" +#include "qapi/qmp/qlist.h" + +/* + * Events can get in the way of responses we are actually waiting for. + */ +GCC_FMT_ATTR(2, 3) +static QObject *wait_command(QTestState *who, const char *command, ...) +{ + va_list ap; + QDict *response; + QObject *result; + + va_start(ap, command); + qtest_qmp_vsend(who, command, ap); + va_end(ap); + + response = qtest_qmp_receive(who); + + result = qdict_get(response, "return"); + g_assert(result); + qobject_ref(result); + qobject_unref(response); + + return result; +} + +static void qmp_query_netdevs_no_error(QTestState *qts, + size_t netdevs_count) +{ + QObject *resp; + QList *netdevs; + + resp = wait_command(qts, "{'execute': 'query-netdevs'}"); + + netdevs = qobject_to(QList, resp); + g_assert(netdevs); + g_assert(qlist_size(netdevs) == netdevs_count); + + qobject_unref(resp); +} + +static void test_query_netdevs(void) +{ + const char *arch = qtest_get_arch(); + size_t correction = 0; + QObject *resp; + QTestState *state; + + /* Archs which still have a netdev despite of -nodefaults */ + if (g_str_equal(arch, "cris") || + g_str_equal(arch, "microblaze") || + g_str_equal(arch, "microblazeel") || + g_str_equal(arch, "sparc")) { + correction = 1; + } + + if (g_str_equal(arch, "arm") || + g_str_equal(arch, "aarch64")) { + state = qtest_init( + "-nodefaults " + "-M virt " + "-netdev user,id=slirp0"); + } else if (g_str_equal(arch, "tricore")) { + state = qtest_init( + "-nodefaults " + "-M tricore_testboard " + "-netdev user,id=slirp0"); + } else { + state = qtest_init( + "-nodefaults " + "-netdev user,id=slirp0"); + } + g_assert(state); + + qmp_query_netdevs_no_error(state, 1 + correction); + + resp = wait_command(state, + "{'execute': 'netdev_add', 'arguments': {" + " 'id': 'slirp1'," + " 'type': 'user'}}"); + qobject_unref(resp); + + qmp_query_netdevs_no_error(state, 2 + correction); + + resp = wait_command(state, + "{'execute': 'netdev_del', 'arguments': {" + " 'id': 'slirp1'}}"); + qobject_unref(resp); + + qmp_query_netdevs_no_error(state, 1 + correction); + + qtest_quit(state); +} + +int main(int argc, char **argv) +{ + int ret = 0; + g_test_init(&argc, &argv, NULL); + + qtest_add_func("/net/qapi/query_netdevs", + test_query_netdevs); + + ret = g_test_run(); + + return ret; +} -- 2.17.1
WARNING: multiple messages have this Message-ID (diff)
From: Alexey Kirillov <lekiravi@yandex-team.ru> To: Eric Blake <eblake@redhat.com>, Thomas Huth <huth@tuxfamily.org>, Markus Armbruster <armbru@redhat.com> Cc: "Peter Maydell" <peter.maydell@linaro.org>, "Dmitry Fleytman" <dmitry.fleytman@gmail.com>, "Michael S. Tsirkin" <mst@redhat.com>, "Jason Wang" <jasowang@redhat.com>, qemu-devel@nongnu.org, "Vincenzo Maffione" <v.maffione@gmail.com>, "Gerd Hoffmann" <kraxel@redhat.com>, "Edgar E. Iglesias" <edgar.iglesias@gmail.com>, "Sven Schnelle" <svens@stackframe.org>, "Rob Herring" <robh@kernel.org>, "Stefano Stabellini" <sstabellini@kernel.org>, "Paul Durrant" <paul@xen.org>, "Joel Stanley" <joel@jms.id.au>, "Anthony Perard" <anthony.perard@citrix.com>, "Samuel Thibault" <samuel.thibault@ens-lyon.org>, "Aleksandar Rikalo" <aleksandar.rikalo@rt-rk.com>, "David Gibson" <david@gibson.dropbear.id.au>, "Laurent Vivier" <lvivier@redhat.com>, "Jiri Pirko" <jiri@resnulli.us>, yc-core@yandex-team.ru, "Stefan Weil" <sw@weilnetz.de>, "Alistair Francis" <alistair@alistair23.me>, "Beniamino Galvani" <b.galvani@gmail.com>, qemu-arm@nongnu.org, "Peter Chubb" <peter.chubb@nicta.com.au>, "Cédric Le Goater" <clg@kaod.org>, xen-devel@lists.xenproject.org, "Giuseppe Lettieri" <g.lettieri@iet.unipi.it>, "Luigi Rizzo" <rizzo@iet.unipi.it>, "Richard Henderson" <rth@twiddle.net>, "Andrew Jeffery" <andrew@aj.id.au>, "Michael Walle" <michael@walle.cc>, qemu-ppc@nongnu.org, "Aleksandar Markovic" <amarkovic@wavecomp.com>, "Alexey Kirillov" <lekiravi@yandex-team.ru>, "Paolo Bonzini" <pbonzini@redhat.com> Subject: [Xen-devel] [PATCH v2 2/4] tests: Add tests for query-netdevs command Date: Wed, 4 Mar 2020 16:06:54 +0300 [thread overview] Message-ID: <20200304130656.16859-3-lekiravi@yandex-team.ru> (raw) In-Reply-To: <20200304130656.16859-1-lekiravi@yandex-team.ru> Signed-off-by: Alexey Kirillov <lekiravi@yandex-team.ru> --- tests/qtest/Makefile.include | 2 + tests/qtest/test-query-netdevs.c | 120 +++++++++++++++++++++++++++++++ 2 files changed, 122 insertions(+) create mode 100644 tests/qtest/test-query-netdevs.c diff --git a/tests/qtest/Makefile.include b/tests/qtest/Makefile.include index e769c1ad70..6924843ef9 100644 --- a/tests/qtest/Makefile.include +++ b/tests/qtest/Makefile.include @@ -9,6 +9,7 @@ check-qtest-generic-y += qmp-cmd-test check-qtest-generic-y += qom-test check-qtest-generic-$(CONFIG_MODULES) += modules-test check-qtest-generic-y += test-hmp +check-qtest-generic-$(CONFIG_SLIRP) += test-query-netdevs check-qtest-pci-$(CONFIG_RTL8139_PCI) += rtl8139-test check-qtest-pci-$(CONFIG_VGA) += display-vga-test @@ -303,6 +304,7 @@ tests/qtest/tpm-crb-test$(EXESUF): tests/qtest/tpm-crb-test.o tests/qtest/tpm-em tests/qtest/tpm-tis-swtpm-test$(EXESUF): tests/qtest/tpm-tis-swtpm-test.o tests/qtest/tpm-emu.o \ tests/qtest/tpm-util.o tests/qtest/tpm-tests.o $(test-io-obj-y) tests/qtest/tpm-tis-test$(EXESUF): tests/qtest/tpm-tis-test.o tests/qtest/tpm-emu.o $(test-io-obj-y) +tests/qtest/test-query-netdevs$(EXESUF): tests/qtest/test-query-netdevs.o # QTest rules diff --git a/tests/qtest/test-query-netdevs.c b/tests/qtest/test-query-netdevs.c new file mode 100644 index 0000000000..e077358a50 --- /dev/null +++ b/tests/qtest/test-query-netdevs.c @@ -0,0 +1,120 @@ +/* + * QTest testcase for the query-netdevs + * + * Copyright Yandex N.V., 2019 + * + * This work is licensed under the terms of the GNU GPL, version 2 or later. + * See the COPYING file in the top-level directory. + * + */ + +#include "qemu/osdep.h" + +#include "libqtest.h" +#include "qapi/qmp/qdict.h" +#include "qapi/qmp/qlist.h" + +/* + * Events can get in the way of responses we are actually waiting for. + */ +GCC_FMT_ATTR(2, 3) +static QObject *wait_command(QTestState *who, const char *command, ...) +{ + va_list ap; + QDict *response; + QObject *result; + + va_start(ap, command); + qtest_qmp_vsend(who, command, ap); + va_end(ap); + + response = qtest_qmp_receive(who); + + result = qdict_get(response, "return"); + g_assert(result); + qobject_ref(result); + qobject_unref(response); + + return result; +} + +static void qmp_query_netdevs_no_error(QTestState *qts, + size_t netdevs_count) +{ + QObject *resp; + QList *netdevs; + + resp = wait_command(qts, "{'execute': 'query-netdevs'}"); + + netdevs = qobject_to(QList, resp); + g_assert(netdevs); + g_assert(qlist_size(netdevs) == netdevs_count); + + qobject_unref(resp); +} + +static void test_query_netdevs(void) +{ + const char *arch = qtest_get_arch(); + size_t correction = 0; + QObject *resp; + QTestState *state; + + /* Archs which still have a netdev despite of -nodefaults */ + if (g_str_equal(arch, "cris") || + g_str_equal(arch, "microblaze") || + g_str_equal(arch, "microblazeel") || + g_str_equal(arch, "sparc")) { + correction = 1; + } + + if (g_str_equal(arch, "arm") || + g_str_equal(arch, "aarch64")) { + state = qtest_init( + "-nodefaults " + "-M virt " + "-netdev user,id=slirp0"); + } else if (g_str_equal(arch, "tricore")) { + state = qtest_init( + "-nodefaults " + "-M tricore_testboard " + "-netdev user,id=slirp0"); + } else { + state = qtest_init( + "-nodefaults " + "-netdev user,id=slirp0"); + } + g_assert(state); + + qmp_query_netdevs_no_error(state, 1 + correction); + + resp = wait_command(state, + "{'execute': 'netdev_add', 'arguments': {" + " 'id': 'slirp1'," + " 'type': 'user'}}"); + qobject_unref(resp); + + qmp_query_netdevs_no_error(state, 2 + correction); + + resp = wait_command(state, + "{'execute': 'netdev_del', 'arguments': {" + " 'id': 'slirp1'}}"); + qobject_unref(resp); + + qmp_query_netdevs_no_error(state, 1 + correction); + + qtest_quit(state); +} + +int main(int argc, char **argv) +{ + int ret = 0; + g_test_init(&argc, &argv, NULL); + + qtest_add_func("/net/qapi/query_netdevs", + test_query_netdevs); + + ret = g_test_run(); + + return ret; +} -- 2.17.1 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xenproject.org https://lists.xenproject.org/mailman/listinfo/xen-devel
next prev parent reply other threads:[~2020-03-04 13:08 UTC|newest] Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-03-04 13:06 [PATCH v2 0/4] Introducing QMP query-netdevs command Alexey Kirillov 2020-03-04 13:06 ` [Xen-devel] " Alexey Kirillov 2020-03-04 13:06 ` [PATCH v2 1/4] qapi: net: Add " Alexey Kirillov 2020-03-04 13:06 ` [Xen-devel] " Alexey Kirillov 2020-03-04 15:57 ` Laurent Vivier 2020-03-04 15:57 ` [Xen-devel] " Laurent Vivier 2020-03-05 14:25 ` Alexey Kirillov 2020-03-05 14:25 ` [Xen-devel] " Alexey Kirillov 2020-03-05 12:02 ` Markus Armbruster 2020-03-05 12:02 ` [Xen-devel] " Markus Armbruster 2020-03-05 14:26 ` Alexey Kirillov 2020-03-05 14:26 ` [Xen-devel] " Alexey Kirillov 2020-06-23 9:59 ` Alexey Kirillov 2020-06-23 9:59 ` Alexey Kirillov 2020-03-04 13:06 ` Alexey Kirillov [this message] 2020-03-04 13:06 ` [Xen-devel] [PATCH v2 2/4] tests: Add tests for " Alexey Kirillov 2020-03-04 13:06 ` [PATCH v2 3/4] hmp: Use QMP query-netdevs in hmp_info_network Alexey Kirillov 2020-03-04 13:06 ` [Xen-devel] " Alexey Kirillov 2020-03-04 13:06 ` [PATCH v2 4/4] net: Remove field info_str of NetClientState Alexey Kirillov 2020-03-04 13:06 ` [Xen-devel] " Alexey Kirillov 2020-03-04 15:41 ` Laurent Vivier 2020-03-04 15:41 ` [Xen-devel] " Laurent Vivier
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20200304130656.16859-3-lekiravi@yandex-team.ru \ --to=lekiravi@yandex-team.ru \ --cc=aleksandar.rikalo@rt-rk.com \ --cc=alistair@alistair23.me \ --cc=amarkovic@wavecomp.com \ --cc=andrew@aj.id.au \ --cc=anthony.perard@citrix.com \ --cc=armbru@redhat.com \ --cc=b.galvani@gmail.com \ --cc=clg@kaod.org \ --cc=david@gibson.dropbear.id.au \ --cc=dmitry.fleytman@gmail.com \ --cc=eblake@redhat.com \ --cc=edgar.iglesias@gmail.com \ --cc=g.lettieri@iet.unipi.it \ --cc=huth@tuxfamily.org \ --cc=jasowang@redhat.com \ --cc=jiri@resnulli.us \ --cc=joel@jms.id.au \ --cc=kraxel@redhat.com \ --cc=lvivier@redhat.com \ --cc=michael@walle.cc \ --cc=mst@redhat.com \ --cc=paul@xen.org \ --cc=pbonzini@redhat.com \ --cc=peter.chubb@nicta.com.au \ --cc=peter.maydell@linaro.org \ --cc=qemu-arm@nongnu.org \ --cc=qemu-devel@nongnu.org \ --cc=qemu-ppc@nongnu.org \ --cc=rizzo@iet.unipi.it \ --cc=robh@kernel.org \ --cc=rth@twiddle.net \ --cc=samuel.thibault@ens-lyon.org \ --cc=sstabellini@kernel.org \ --cc=svens@stackframe.org \ --cc=sw@weilnetz.de \ --cc=v.maffione@gmail.com \ --cc=xen-devel@lists.xenproject.org \ --cc=yc-core@yandex-team.ru \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.