From nobody Tue Feb 10 23:32:51 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail(p=none dis=none) header.from=riseup.net ARC-Seal: i=1; a=rsa-sha256; t=1696959409; cv=none; d=zohomail.com; s=zohoarc; b=ccvEB6n/HHHiaD32X+dWWE0tmcrSN7eBxX4NV5kpJ7HUdv18gomGCpGaf+nhPJcgCliQvrADhBWWaUzDzVbXr29NpoW3snRLQQSnAbYFOGhAQZZRg79QX+FW/0YfIAJLrX3P/T6SWpTfR0cS/aE7ozLhZWzUZwMi1WW7P0cnCvM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1696959409; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=vT38JOtKxyIAw8CezA6EyFQoZ60cuZFy9yJIaUxns1E=; b=FV8BOvUAsWCQBrfMeFxWJyK8g1YFxRHjc9chOxWsiLS6t+etM0Eap5AU16PtEyueT8Wcj/ZzFyCRqLkgO4bfV7LDhGTuDHVsy7EomurVeQeFmCgEGrhdYr6C7AKXD34ndKV5MIrZEgQhD9w9+B9E72bfR5VYlfYrCTt7nCgmjh0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mx.zohomail.com with SMTPS id 1696959408957512.9252165742987; Tue, 10 Oct 2023 10:36:48 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-549-ujpmWAzWN0GeWILl9KJYbg-1; Tue, 10 Oct 2023 13:36:34 -0400 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 127E8887E6E; Tue, 10 Oct 2023 17:36:24 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id F07FD492B07; Tue, 10 Oct 2023 17:36:23 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id ECC1719466DF; Tue, 10 Oct 2023 17:36:22 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 7A49F19465BB for ; Tue, 10 Oct 2023 17:36:21 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 4C3E9492B00; Tue, 10 Oct 2023 17:36:21 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast10.extmail.prod.ext.rdu2.redhat.com [10.11.55.26]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 44CD3492C3E for ; Tue, 10 Oct 2023 17:36:21 +0000 (UTC) Received: from us-smtp-inbound-delivery-1.mimecast.com (us-smtp-1.mimecast.com [205.139.110.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 201441C0759D for ; Tue, 10 Oct 2023 17:36:21 +0000 (UTC) Received: from mx1.riseup.net (mx1.riseup.net [198.252.153.129]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-322-ImwhUqhoMLeIvyfcKG4QOA-1; Tue, 10 Oct 2023 13:36:18 -0400 Received: from mx0.riseup.net (mx0-pn.riseup.net [10.0.1.42]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx1.riseup.net (Postfix) with ESMTPS id 4S4jWF1WpKzDqtG for ; Tue, 10 Oct 2023 17:26:49 +0000 (UTC) Received: from fews02-sea.riseup.net (fews02-sea-pn.riseup.net [10.0.1.112]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx0.riseup.net (Postfix) with ESMTPS id 4S4jWC0fR3z9tPx for ; Tue, 10 Oct 2023 17:26:47 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) by fews02-sea.riseup.net (Postfix) with ESMTPSA id 4S4jW96RZ9zFs1M; Tue, 10 Oct 2023 17:26:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1696959407; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=vT38JOtKxyIAw8CezA6EyFQoZ60cuZFy9yJIaUxns1E=; b=YgpV3IPBXNg0FDBv/Sja3Hd8iWYTTxnEOWHDxaR0CZld1g4XLcE/8hxf29DeuUoOy6EUHQ 0m1ifeEACZ6vJOrtLXdh3yZui5lvlXlQLmJyrGdAYyZLf4XpD/0hbN2xowSlX8JDVc49YQ uTgDMnTLOr4Yrt1SH+VpAHrRehYSDl8= X-MC-Unique: ujpmWAzWN0GeWILl9KJYbg-1 X-Original-To: libvir-list@listman.corp.redhat.com X-MC-Unique: ImwhUqhoMLeIvyfcKG4QOA-1 X-Riseup-User-ID: 08CA1ABAC8525E2FE1EF338665CF1D73FC94BBC90ECC2AF986324A56172A465C From: K Shiva Kiran To: libvir-list@redhat.com Subject: [PATCH v2 10/11] test_driver: Implement test driver for metadata APIs Date: Tue, 10 Oct 2023 22:48:42 +0530 Message-ID: <20231010172509.103884-11-shiva_kr@riseup.net> In-Reply-To: <20231010172509.103884-1-shiva_kr@riseup.net> References: <20231010172509.103884-1-shiva_kr@riseup.net> MIME-Version: 1.0 X-Mimecast-Impersonation-Protect: Policy=CLT - Impersonation Protection Definition; Similar Internal Domain=false; Similar Monitored External Domain=false; Custom External Domain=false; Mimecast External Domain=false; Newly Observed Domain=false; Internal User Name=false; Custom Display Name List=false; Reply-to Address Mismatch=false; Targeted Threat Dictionary=false; Mimecast Threat Dictionary=false; Custom Threat Dictionary=false X-Scanned-By: MIMEDefang 3.1 on 10.11.54.10 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: K Shiva Kiran Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: riseup.net Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1696959410445100005 Content-Type: text/plain; charset="utf-8"; x-default="true" Signed-off-by: K Shiva Kiran --- src/test/test_driver.c | 49 +++++- tests/meson.build | 1 + tests/nwfiltermetadatatest.c | 297 +++++++++++++++++++++++++++++++++++ 3 files changed, 346 insertions(+), 1 deletion(-) create mode 100644 tests/nwfiltermetadatatest.c diff --git a/src/test/test_driver.c b/src/test/test_driver.c index ffcaa07b3e..14baa82e52 100644 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -10080,7 +10080,6 @@ testConnectGetDomainCapabilities(virConnectPtr conn= G_GNUC_UNUSED, return virDomainCapsFormat(domCaps); } =20 - static virNWFilterObj * testNWFilterObjFromNWFilter(testDriver *driver, const unsigned char *uuid) @@ -10262,6 +10261,52 @@ testNWFilterGetXMLDesc(virNWFilterPtr nwfilter, return ret; } =20 +static int +testNWFilterSetMetadata(virNWFilterPtr nwfilter, + int type, + const char *metadata, + const char *key, + const char *uri, + unsigned int flags) +{ + testDriver *driver =3D nwfilter->conn->privateData; + virNWFilterObj *obj =3D NULL; + int ret =3D -1; + + virCheckFlags(0, -1); + + if (!(obj =3D testNWFilterObjFromNWFilter(driver, nwfilter->uuid))) + return -1; + + ret =3D virNWFilterObjSetMetadata(obj, type, metadata, + key, uri, NULL); + + virNWFilterObjUnlock(obj); + return ret; +} + +static char * +testNWFilterGetMetadata(virNWFilterPtr nwfilter, + int type, + const char *uri, + unsigned int flags) +{ + testDriver *driver =3D nwfilter->conn->privateData; + virNWFilterObj *obj =3D NULL; + char *ret =3D NULL; + + virCheckFlags(0, NULL); + + if (!(obj =3D testNWFilterObjFromNWFilter(driver, nwfilter->uuid))) + return NULL; + + ret =3D virNWFilterObjGetMetadata(obj, type, uri); + + virNWFilterObjUnlock(obj); + return ret; +} + + /* * Test driver */ @@ -10546,6 +10591,8 @@ static virNWFilterDriver testNWFilterDriver =3D { .nwfilterDefineXMLFlags =3D testNWFilterDefineXMLFlags, /* 9.9.0 */ .nwfilterUndefine =3D testNWFilterUndefine, /* 9.9.0 */ .nwfilterGetXMLDesc =3D testNWFilterGetXMLDesc, /* 9.9.0 */ + .nwfilterGetMetadata =3D testNWFilterGetMetadata, /* 9.9.0 */ + .nwfilterSetMetadata =3D testNWFilterSetMetadata, /* 9.9.0 */ }; =20 static virConnectDriver testConnectDriver =3D { diff --git a/tests/meson.build b/tests/meson.build index b235c5f4dd..d3055a9988 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -259,6 +259,7 @@ tests +=3D [ { 'name': 'interfacexml2xmltest' }, { 'name': 'metadatatest' }, { 'name': 'networkmetadatatest' }, + { 'name': 'nwfiltermetadatatest' }, { 'name': 'networkxml2xmlupdatetest' }, { 'name': 'nodedevxml2xmltest' }, { 'name': 'nwfilterxml2xmltest' }, diff --git a/tests/nwfiltermetadatatest.c b/tests/nwfiltermetadatatest.c new file mode 100644 index 0000000000..6f2754aa25 --- /dev/null +++ b/tests/nwfiltermetadatatest.c @@ -0,0 +1,297 @@ +/* + * Copyright (C) 2013 Red Hat, Inc. + * + * 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 "testutils.h" + +#include "virerror.h" +#include "virxml.h" + +#define VIR_FROM_THIS VIR_FROM_NONE + +static const char metadata1[] =3D +"\n" +" foobar\n" +" foofoo\n" +" zomg\n" +""; + + +static const char metadata1_ns[] =3D +"\n" +" foobar\n" +" foofoo\n" +" zomg\n" +""; + + +static const char metadata2[] =3D +"\n" +" baz\n" +""; + + +static const char metadata2_ns[] =3D +"\n" +" baz\n" +""; + + +static char * +getMetadataFromXML(virNWFilterPtr nwfilter) +{ + g_autoptr(xmlDoc) doc =3D NULL; + g_autoptr(xmlXPathContext) ctxt =3D NULL; + xmlNodePtr node; + + g_autofree char *xml =3D NULL; + + if (!(xml =3D virNWFilterGetXMLDesc(nwfilter, 0))) + return NULL; + + if (!(doc =3D virXMLParseStringCtxt(xml, "(nwfilter_definition)", &ctx= t))) + return NULL; + + if (!(node =3D virXPathNode("//metadata/*", ctxt))) + return NULL; + + return virXMLNodeToString(node->doc, node); +} + + +static void +metadataXMLConvertApostrophe(char *str) +{ + do { + if (*str =3D=3D '\"') + *str =3D '\''; + } while ((*++str) !=3D '\0'); +} + + +static bool +verifyMetadata(virNWFilterPtr nwfilter, + const char *expectXML, + const char *expectAPI, + const char *uri) +{ + g_autofree char *metadataXML =3D NULL; + g_autofree char *metadataAPI =3D NULL; + + if (!expectAPI) { + if ((metadataAPI =3D virNWFilterGetMetadata(nwfilter, + VIR_NWFILTER_METADATA_EL= EMENT, + uri, 0))) { + virReportError(VIR_ERR_INTERNAL_ERROR, + "expected no metadata in API, but got:\n[%s]", + metadataAPI); + return false; + } + } else { + if (!(metadataAPI =3D virNWFilterGetMetadata(nwfilter, + VIR_NWFILTER_METADATA_E= LEMENT, + uri, 0))) + return false; + + metadataXMLConvertApostrophe(metadataAPI); + + if (STRNEQ(metadataAPI, expectAPI)) { + virReportError(VIR_ERR_INTERNAL_ERROR, + "XML metadata in API doesn't match expected met= adata: " + "expected:\n[%s]\ngot:\n[%s]", + expectAPI, metadataAPI); + return false; + } + + } + + if (!expectXML) { + if ((metadataXML =3D getMetadataFromXML(nwfilter))) { + virReportError(VIR_ERR_INTERNAL_ERROR, + "expected no metadata in XML, but got:\n[%s]", + metadataXML); + return false; + } + } else { + if (!(metadataXML =3D getMetadataFromXML(nwfilter))) + return false; + + metadataXMLConvertApostrophe(metadataXML); + + if (STRNEQ(metadataXML, expectXML)) { + virReportError(VIR_ERR_INTERNAL_ERROR, + "XML in dump doesn't match expected metadata: " + "expected:\n[%s]\ngot:\n[%s]", + expectXML, metadataXML); + return false; + } + } + + return true; +} + + +struct metadataTest { + virConnectPtr conn; + virNWFilterPtr nwfilter; + + const char *data; + const char *expect; + int type; + bool fail; +}; + + +static int +testAssignMetadata(const void *data) +{ + const struct metadataTest *test =3D data; + + if (virNWFilterSetMetadata(test->nwfilter, VIR_NWFILTER_METADATA_ELEME= NT, + metadata1, "herp", "http://herp.derp/", 0) = < 0) + return -1; + + if (!verifyMetadata(test->nwfilter, metadata1_ns, metadata1, "http://h= erp.derp/")) + return -1; + + return 0; +} + +static int +testRewriteMetadata(const void *data) +{ + const struct metadataTest *test =3D data; + + if (virNWFilterSetMetadata(test->nwfilter, VIR_NWFILTER_METADATA_ELEME= NT, + metadata2, "blurb", "http://herp.derp/", 0)= < 0) + return -1; + + if (!verifyMetadata(test->nwfilter, metadata2_ns, metadata2, "http://h= erp.derp/")) + return -1; + + return 0; +} + +static int +testEraseMetadata(const void *data) +{ + const struct metadataTest *test =3D data; + + if (virNWFilterSetMetadata(test->nwfilter, VIR_NWFILTER_METADATA_ELEME= NT, + NULL, NULL, "http://herp.derp/", 0) < 0) + return -1; + + if (!verifyMetadata(test->nwfilter, NULL, NULL, "http://herp.derp/")) + return -1; + + return 0; +} + +static int +testTextMetadata(const void *data) +{ + const struct metadataTest *test =3D data; + g_autofree char *actual =3D NULL; + + if (virNWFilterSetMetadata(test->nwfilter, test->type, test->data, NUL= L, NULL, 0) < 0) { + if (test->fail) + return 0; + return -1; + } + + actual =3D virNWFilterGetMetadata(test->nwfilter, test->type, NULL, 0); + + if (STRNEQ_NULLABLE(test->expect, actual)) { + virReportError(VIR_ERR_INTERNAL_ERROR, + "expected metadata doesn't match actual: " + "expected:'%s'\ngot: '%s'", + NULLSTR(test->data), NULLSTR(actual)); + return -1; + } + + return 0; +} + +#define TEST_TEXT_METADATA(INDEX, TYPE, DATA, EXPECT, FAIL) \ + do { \ + test.type =3D VIR_NWFILTER_METADATA_ ## TYPE; \ + test.data =3D DATA; \ + test.expect =3D EXPECT; \ + test.fail =3D FAIL; \ + \ + if (virTestRun("text metadata: " #TYPE " " INDEX " ", \ + testTextMetadata, &test) < 0) \ + ret =3D EXIT_FAILURE; \ + } while (0) + +#define TEST_TITLE(INDEX, DATA) \ + TEST_TEXT_METADATA(INDEX, TITLE, DATA, DATA, false) +#define TEST_TITLE_EXPECT(INDEX, DATA, EXPECT) \ + TEST_TEXT_METADATA(INDEX, TITLE, DATA, EXPECT, false) +#define TEST_TITLE_FAIL(INDEX, DATA) \ + TEST_TEXT_METADATA(INDEX, TITLE, DATA, DATA, true) +#define TEST_DESCR(INDEX, DATA) \ + TEST_TEXT_METADATA(INDEX, DESCRIPTION, DATA, DATA, false) +#define TEST_DESCR_EXPECT(INDEX, DATA, EXPECT) \ + TEST_TEXT_METADATA(INDEX, DESCRIPTION, DATA, EXPECT, false) + +static int +mymain(void) +{ + struct metadataTest test =3D { 0 }; + int ret =3D EXIT_SUCCESS; + + if (!(test.conn =3D virConnectOpen("test:///default"))) + return EXIT_FAILURE; + + if (!(test.nwfilter =3D virNWFilterLookupByName(test.conn, "test-filte= r"))) { + virConnectClose(test.conn); + return EXIT_FAILURE; + } + + virTestQuiesceLibvirtErrors(false); + + if (virTestRun("Assign metadata ", testAssignMetadata, &test) < 0) + ret =3D EXIT_FAILURE; + if (virTestRun("Rewrite Metadata ", testRewriteMetadata, &test) < 0) + ret =3D EXIT_FAILURE; + if (virTestRun("Erase metadata ", testEraseMetadata, &test) < 0) + ret =3D EXIT_FAILURE; + + TEST_TITLE("1", "qwert"); + TEST_TITLE("2", NULL); + TEST_TITLE("3", "blah"); + TEST_TITLE_FAIL("4", "qwe\nrt"); + TEST_TITLE_EXPECT("5", "", NULL); + TEST_TITLE_FAIL("6", "qwert\n"); + TEST_TITLE_FAIL("7", "\n"); + + TEST_DESCR("1", "qwert\nqwert"); + TEST_DESCR("2", NULL); + TEST_DESCR("3", "qwert"); + TEST_DESCR("4", "\n"); + TEST_DESCR_EXPECT("5", "", NULL); + + virNWFilterFree(test.nwfilter); + virConnectClose(test.conn); + + return ret; +} + +VIR_TEST_MAIN(mymain) --=20 2.42.0