From patchwork Sat Jan 9 00:13:24 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cole Robinson X-Patchwork-Id: 59421 Delivered-To: patch@linaro.org Received: by 10.112.130.2 with SMTP id oa2csp860991lbb; Fri, 8 Jan 2016 16:16:43 -0800 (PST) X-Received: by 10.194.156.199 with SMTP id wg7mr120171764wjb.114.1452298603195; Fri, 08 Jan 2016 16:16:43 -0800 (PST) Return-Path: Received: from mx6-phx2.redhat.com (mx6-phx2.redhat.com. [209.132.183.39]) by mx.google.com with ESMTPS id ey9si7392968wjc.234.2016.01.08.16.16.42 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 08 Jan 2016 16:16:43 -0800 (PST) Received-SPF: pass (google.com: domain of libvir-list-bounces@redhat.com designates 209.132.183.39 as permitted sender) client-ip=209.132.183.39; Authentication-Results: mx.google.com; spf=pass (google.com: domain of libvir-list-bounces@redhat.com designates 209.132.183.39 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by mx6-phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u090EGko015849; Fri, 8 Jan 2016 19:14:16 -0500 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id u090DWhx002886 for ; Fri, 8 Jan 2016 19:13:32 -0500 Received: from colepc.redhat.com (ovpn-113-33.phx2.redhat.com [10.3.113.33]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u090DSuE014481; Fri, 8 Jan 2016 19:13:32 -0500 From: Cole Robinson To: libvirt-list@redhat.com Date: Fri, 8 Jan 2016 19:13:24 -0500 Message-Id: <1889b392f5533b96d85c69f48700aa5d0b66c9dd.1452298382.git.crobinso@redhat.com> In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 5/6] tests: add genericxml2xmltest X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com For testing hypervisor independent XML handling. Right now it's just populated with an example test case. --- tests/Makefile.am | 9 +++ tests/domainschematest | 2 +- tests/genericxml2xmlindata/generic-disk-virtio.xml | 45 ++++++++++++ .../genericxml2xmloutdata/generic-disk-virtio.xml | 45 ++++++++++++ tests/genericxml2xmltest.c | 83 ++++++++++++++++++++++ 5 files changed, 183 insertions(+), 1 deletion(-) create mode 100644 tests/genericxml2xmlindata/generic-disk-virtio.xml create mode 100644 tests/genericxml2xmloutdata/generic-disk-virtio.xml create mode 100644 tests/genericxml2xmltest.c -- 2.5.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list diff --git a/tests/Makefile.am b/tests/Makefile.am index 1d57b39..ee16666 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -89,6 +89,8 @@ EXTRA_DIST = \ domainsnapshotxml2xmlin \ domainsnapshotxml2xmlout \ fchostdata \ + genericxml2xmlindata \ + genericxml2xmloutdata \ interfaceschemadata \ lxcconf2xmldata \ lxcxml2xmldata \ @@ -334,6 +336,8 @@ test_programs += metadatatest test_programs += secretxml2xmltest +test_programs += genericxml2xmltest + if WITH_LINUX test_programs += virusbtest \ virnetdevbandwidthtest \ @@ -800,6 +804,11 @@ secretxml2xmltest_SOURCES = \ testutils.c testutils.h secretxml2xmltest_LDADD = $(LDADDS) +genericxml2xmltest_SOURCES = \ + genericxml2xmltest.c \ + testutils.c testutils.h +genericxml2xmltest_LDADD = $(LDADDS) + if WITH_STORAGE storagevolxml2argvtest_SOURCES = \ diff --git a/tests/domainschematest b/tests/domainschematest index 31ee536..479fd23 100755 --- a/tests/domainschematest +++ b/tests/domainschematest @@ -8,7 +8,7 @@ DIRS="" DIRS="$DIRS domainschemadata qemuxml2argvdata sexpr2xmldata" DIRS="$DIRS xmconfigdata xml2sexprdata qemuxml2xmloutdata" DIRS="$DIRS lxcxml2xmldata lxcxml2xmloutdata" -DIRS="$DIRS bhyvexml2argvdata" +DIRS="$DIRS bhyvexml2argvdata genericxml2xmlindata genericxml2xmloutdata" SCHEMA="domain.rng" check_schema "$DIRS" "$SCHEMA" diff --git a/tests/genericxml2xmlindata/generic-disk-virtio.xml b/tests/genericxml2xmlindata/generic-disk-virtio.xml new file mode 100644 index 0000000..458c55d --- /dev/null +++ b/tests/genericxml2xmlindata/generic-disk-virtio.xml @@ -0,0 +1,45 @@ + + QEMUGuest1 + c7a5fdbd-edaf-9455-926a-d65c16db1809 + 219136 + 219136 + 1 + + hvm + + + + destroy + restart + destroy + + /usr/bin/qemu + + + + +
+ + + + + + +
+ + + + + + + + + + + + + + + + + diff --git a/tests/genericxml2xmloutdata/generic-disk-virtio.xml b/tests/genericxml2xmloutdata/generic-disk-virtio.xml new file mode 100644 index 0000000..458c55d --- /dev/null +++ b/tests/genericxml2xmloutdata/generic-disk-virtio.xml @@ -0,0 +1,45 @@ + + QEMUGuest1 + c7a5fdbd-edaf-9455-926a-d65c16db1809 + 219136 + 219136 + 1 + + hvm + + + + destroy + restart + destroy + + /usr/bin/qemu + + + + +
+ + + + + + +
+ + + + + + + + + + + + + + + + + diff --git a/tests/genericxml2xmltest.c b/tests/genericxml2xmltest.c new file mode 100644 index 0000000..7f79896 --- /dev/null +++ b/tests/genericxml2xmltest.c @@ -0,0 +1,83 @@ +#include + +#include +#include +#include +#include + +#include +#include + +#include "testutils.h" +#include "internal.h" +#include "virstring.h" + +#define VIR_FROM_THIS VIR_FROM_NONE + +static virCapsPtr caps; +static virDomainXMLOptionPtr xmlopt; + +struct testInfo { + const char *name; + int different; + bool inactive_only; +}; + +static int +testCompareXMLToXMLHelper(const void *data) +{ + const struct testInfo *info = data; + char *xml_in = NULL; + char *xml_out = NULL; + int ret = -1; + + if (virAsprintf(&xml_in, "%s/genericxml2xmlindata/generic-%s.xml", + abs_srcdir, info->name) < 0 || + virAsprintf(&xml_out, "%s/genericxml2xmloutdata/generic-%s.xml", + abs_srcdir, info->name) < 0) + goto cleanup; + + ret = testCompareDomXML2XMLFiles(caps, xmlopt, xml_in, + info->different ? xml_out : xml_in, + !info->inactive_only); + cleanup: + VIR_FREE(xml_in); + VIR_FREE(xml_out); + return ret; +} + + +static int +mymain(void) +{ + int ret = 0; + + if (!(caps = virTestGenericCapsInit())) + return EXIT_FAILURE; + + if (!(xmlopt = virTestGenericDomainXMLConfInit())) + return EXIT_FAILURE; + +#define DO_TEST_FULL(name, is_different, inactive) \ + do { \ + const struct testInfo info = {name, is_different, inactive}; \ + if (virtTestRun("GENERIC XML-2-XML " name, \ + testCompareXMLToXMLHelper, &info) < 0) \ + ret = -1; \ + } while (0) + +#define DO_TEST(name) \ + DO_TEST_FULL(name, 0, false) + +#define DO_TEST_DIFFERENT(name) \ + DO_TEST_FULL(name, 1, false) + + DO_TEST_DIFFERENT("disk-virtio"); + + virObjectUnref(caps); + virObjectUnref(xmlopt); + + return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; +} + +VIRT_TEST_MAIN(mymain)