From nobody Sun Feb 8 17:03:25 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 149088677873989.5507323418667; Thu, 30 Mar 2017 08:12:58 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 7C39779717; Thu, 30 Mar 2017 15:12:14 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 3F47217246; Thu, 30 Mar 2017 15:12:14 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id E7D9918523CF; Thu, 30 Mar 2017 15:12:13 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id v2UFBuh7004175 for ; Thu, 30 Mar 2017 11:11:56 -0400 Received: by smtp.corp.redhat.com (Postfix) id AA19B7EA37; Thu, 30 Mar 2017 15:11:56 +0000 (UTC) Received: from angien.brq.redhat.com (dhcp129-47.brq.redhat.com [10.34.129.47]) by smtp.corp.redhat.com (Postfix) with ESMTP id DDC0F5B82D; Thu, 30 Mar 2017 15:11:55 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 7C39779717 Authentication-Results: ext-mx01.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx01.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=libvir-list-bounces@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 7C39779717 From: Peter Krempa To: libvir-list@redhat.com Date: Thu, 30 Mar 2017 17:12:47 +0200 Message-Id: <72a9c2fef57eb6fca1d9599341af6d93939ff15f.1490886728.git.pkrempa@redhat.com> In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Cc: Peter Krempa Subject: [libvirt] [PATCH v2 3/5] test: Introduce testing of virStorageUtilGlusterExtractPoolSources 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 Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.25]); Thu, 30 Mar 2017 15:12:15 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Add a test program called virstorageutiltest and test the gluster pool detection code. --- tests/Makefile.am | 15 ++- .../gluster-parse-basic-native.xml | 6 ++ .../gluster-parse-basic-netfs.xml | 7 ++ .../virstorageutildata/gluster-parse-basic-src.xml | 47 +++++++++ tests/virstorageutiltest.c | 112 +++++++++++++++++= ++++ 5 files changed, 184 insertions(+), 3 deletions(-) create mode 100644 tests/virstorageutildata/gluster-parse-basic-native.xml create mode 100644 tests/virstorageutildata/gluster-parse-basic-netfs.xml create mode 100644 tests/virstorageutildata/gluster-parse-basic-src.xml create mode 100644 tests/virstorageutiltest.c diff --git a/tests/Makefile.am b/tests/Makefile.am index a6f189b8b..254c4c0ad 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -160,7 +160,9 @@ EXTRA_DIST =3D \ xlconfigdata \ xmconfigdata \ xml2sexprdata \ - xml2vmxdata + xml2vmxdata \ + virstorageutildata \ + $(NULL) test_helpers =3D commandhelper ssh test_programs =3D virshtest sockettest \ @@ -352,7 +354,7 @@ test_programs +=3D nwfilterxml2firewalltest endif WITH_NWFILTER if WITH_STORAGE -test_programs +=3D storagevolxml2argvtest +test_programs +=3D storagevolxml2argvtest virstorageutiltest endif WITH_STORAGE if WITH_STORAGE_FS @@ -859,6 +861,13 @@ genericxml2xmltest_LDADD =3D $(LDADDS) if WITH_STORAGE +virstorageutiltest_SOURCES =3D \ + virstorageutiltest.c testutils.c testutils.h +virstorageutiltest_LDADD =3D \ + ../src/libvirt_driver_storage_impl.la \ + $(LDADDS) \ + $(NULL) + storagevolxml2argvtest_SOURCES =3D \ storagevolxml2argvtest.c \ testutils.c testutils.h @@ -867,7 +876,7 @@ storagevolxml2argvtest_LDADD =3D \ ../src/libvirt_driver_storage_impl.la $(LDADDS) else ! WITH_STORAGE -EXTRA_DIST +=3D storagevolxml2argvtest.c +EXTRA_DIST +=3D storagevolxml2argvtest.c virstorageutiltest.c endif ! WITH_STORAGE storagevolxml2xmltest_SOURCES =3D \ diff --git a/tests/virstorageutildata/gluster-parse-basic-native.xml b/test= s/virstorageutildata/gluster-parse-basic-native.xml new file mode 100644 index 000000000..fbde06f3b --- /dev/null +++ b/tests/virstorageutildata/gluster-parse-basic-native.xml @@ -0,0 +1,6 @@ + + + + + + diff --git a/tests/virstorageutildata/gluster-parse-basic-netfs.xml b/tests= /virstorageutildata/gluster-parse-basic-netfs.xml new file mode 100644 index 000000000..8aadd50a1 --- /dev/null +++ b/tests/virstorageutildata/gluster-parse-basic-netfs.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/tests/virstorageutildata/gluster-parse-basic-src.xml b/tests/v= irstorageutildata/gluster-parse-basic-src.xml new file mode 100644 index 000000000..08f97cb72 --- /dev/null +++ b/tests/virstorageutildata/gluster-parse-basic-src.xml @@ -0,0 +1,47 @@ + + + 0 + 0 + + + + + vol0 + ac14dfa5-0b98-4593-a2aa-9fe2bb9b9ce3 + 1 + Started + 0 + 2 + 2 + 1 + 2 + 0 + 0 + 0 + 2 + Replicate + 0 + + virt-gluste= r-node1:/bricks/brick1/brickvirt-gluster-node1:/bricks/brick1/bricka6f5ddea-bc6a-44db-ae1d-5aa1db7434900<= /isArbiter> + virt-gluste= r-node2:/bricks/brick1/brickvirt-gluster-node2:/bricks/brick1/brickf4ab9fb1-44ec-443b-8783-e5f70ed78da30<= /isArbiter> + + 3 + + + + + + + 1 + + + diff --git a/tests/virstorageutiltest.c b/tests/virstorageutiltest.c new file mode 100644 index 000000000..b13ecb5ab --- /dev/null +++ b/tests/virstorageutiltest.c @@ -0,0 +1,112 @@ +/* + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library. If not, see + * . + */ + +#include + +#include + +#include "testutils.h" +#include "virerror.h" +#include "virfile.h" +#include "virlog.h" +#include "virstring.h" + +#include "storage/storage_util.h" + +#define VIR_FROM_THIS VIR_FROM_NONE + +VIR_LOG_INIT("tests.storageutiltest"); + + +struct testGlusterLookupParseData { + const char *srcxml; + const char *dstxml; + bool netfs; + int type; +}; + +static int +testGlusterLookupParse(const void *opaque) +{ + const struct testGlusterLookupParseData *data =3D opaque; + virStoragePoolSourceList list =3D { .type =3D data->type, + .nsources =3D 0, + .sources =3D NULL + }; + size_t i; + char *srcxmldata =3D NULL; + char *actual =3D NULL; + int ret =3D -1; + + if (virTestLoadFile(data->srcxml, &srcxmldata) < 0) + goto cleanup; + + if (virStorageUtilGlusterExtractPoolSources("testhost", srcxmldata, + &list, data->netfs) < 0) + goto cleanup; + + if (!(actual =3D virStoragePoolSourceListFormat(&list))) + goto cleanup; + + ret =3D virTestCompareToFile(actual, data->dstxml); + + cleanup: + VIR_FREE(srcxmldata); + VIR_FREE(actual); + + for (i =3D 0; i < list.nsources; i++) + virStoragePoolSourceClear(&list.sources[i]); + VIR_FREE(list.sources); + + return ret; +} + + +static int +mymain(void) +{ + int ret =3D 0; + +#define DO_TEST_GLUSTER_LOOKUP_FULL(testname, sffx, testnetfs, pooltype) = \ + do { = \ + struct testGlusterLookupParseData data; = \ + data.srcxml =3D abs_srcdir "/virstorageutildata/" = \ + "gluster-parse-" testname "-src.xml"; = \ + data.dstxml =3D abs_srcdir "/virstorageutildata/" = \ + "gluster-parse-" testname "-" sffx ".xml"; = \ + data.netfs =3D testnetfs; = \ + data.type =3D pooltype; = \ + if (virTestRun("gluster lookup " sffx " " testname, = \ + testGlusterLookupParse, &data) < 0) = \ + ret =3D -1; = \ + } while (0) + +#define DO_TEST_GLUSTER_LOOKUP_NATIVE(testname) = \ + DO_TEST_GLUSTER_LOOKUP_FULL(testname, "native", false, VIR_STORAGE_POO= L_GLUSTER) +#define DO_TEST_GLUSTER_LOOKUP_NETFS(testname) = \ + DO_TEST_GLUSTER_LOOKUP_FULL(testname, "netfs", true, VIR_STORAGE_POOL_= NETFS) + + DO_TEST_GLUSTER_LOOKUP_NATIVE("basic"); + DO_TEST_GLUSTER_LOOKUP_NETFS("basic"); + +#undef DO_TEST_GLUSTER_LOOKUP_NATIVE +#undef DO_TEST_GLUSTER_LOOKUP_NETFS +#undef DO_TEST_GLUSTER_LOOKUP_FULL + + return ret =3D=3D 0 ? EXIT_SUCCESS : EXIT_FAILURE; +} + +VIRT_TEST_MAIN(mymain) --=20 2.12.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list