From nobody Tue Feb 10 17:14:14 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.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.133.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=1696959402; cv=none; d=zohomail.com; s=zohoarc; b=FYQ09gqecuV0K626fv/CZXKfYQC/867GTf9sfYKBb90vFvTiIwFv241OzFh095K1+puaBS/lU/1ALgYx9j1+RF7/HBxYdXZNWQ1/XqFaG36qUbuYZX4uQD/znBp+Hkc59+/fkE5mdiZN3ImEL6H0hjlzXYZ/pG1clHAa9i62XPw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1696959402; 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=PpxDCxZjuP1cK0tmg2/foOZ8vW8CH7LwAxJe3dM5fWc=; b=WEbUlLsfoQIX4C/WmIuh+pNqxBLg+jEj/WL0pIQKBkbeftmoIw+t+pk7eJP0tsy61XlAiht2xhmOlBetwK7agjYGWj4bAWjdjPsj61tjEm5FhdkPtKAOZJli3CCVlIfWfO+xtw0o8+oelt3WMKdJ0e2sD5/LiOCDjM1I5rXx7fs= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.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.133.124]) by mx.zohomail.com with SMTPS id 1696959402859669.6232194242764; Tue, 10 Oct 2023 10:36:42 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-44-KL0YIEngNrmnJF8KjKF6QQ-1; Tue, 10 Oct 2023 13:36:32 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (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 6676B382135D; Tue, 10 Oct 2023 17:36:25 +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 4F29CC0F788; Tue, 10 Oct 2023 17:36:25 +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 8DBF519466E8; Tue, 10 Oct 2023 17:36:24 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 417431946597 for ; Tue, 10 Oct 2023 17:36:22 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 304821C06533; Tue, 10 Oct 2023 17:36:22 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast07.extmail.prod.ext.rdu2.redhat.com [10.11.55.23]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 2921B1C060DF for ; Tue, 10 Oct 2023 17:36:22 +0000 (UTC) Received: from us-smtp-inbound-delivery-1.mimecast.com (us-smtp-2.mimecast.com [207.211.31.81]) (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 04B4C3C0E65C for ; Tue, 10 Oct 2023 17:36:22 +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-271-tMLwY8roPYm6rKZ7CXg4hA-1; Tue, 10 Oct 2023 13:36:20 -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 4S4jWQ4TvrzDqwH for ; Tue, 10 Oct 2023 17:26:58 +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 4S4jW93Dbbz9t6j for ; Tue, 10 Oct 2023 17:26:45 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) by fews02-sea.riseup.net (Postfix) with ESMTPSA id 4S4jW81pKVzFqjK; Tue, 10 Oct 2023 17:26:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1696959400; 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=PpxDCxZjuP1cK0tmg2/foOZ8vW8CH7LwAxJe3dM5fWc=; b=eY02uH6folC4MWYd/W22tTgicxn70m3ln4+3T/gTBBJjDHRphJPQNAU7YbR8DPjirPdV/l IsuP3HpyrIIhfPOTxcSfguo3k/PnjbHF6rCZJcBFthNdFd0MLX4siBhghR5fb9+2xx4034 rYlv+1uWFB+PdFG1zd6mFVW1GjQum1w= X-MC-Unique: KL0YIEngNrmnJF8KjKF6QQ-1 X-Original-To: libvir-list@listman.corp.redhat.com X-MC-Unique: tMLwY8roPYm6rKZ7CXg4hA-1 X-Riseup-User-ID: E7B18560786DBC38E76951A45386A9F0BB5E7845F39648A9194A5A1EDC27DA1C From: K Shiva Kiran To: libvir-list@redhat.com Subject: [PATCH v2 09/11] test_driver: Implement test driver for network filters Date: Tue, 10 Oct 2023 22:48:41 +0530 Message-ID: <20231010172509.103884-10-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.4.1 on 10.11.54.7 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.8 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: 1696959404417100001 Content-Type: text/plain; charset="utf-8"; x-default="true" Signed-off-by: K Shiva Kiran --- src/conf/nwfilter_conf.c | 5 +- src/conf/nwfilter_conf.h | 3 + src/test/test_driver.c | 240 ++++++++++++++++++++++++++++++++++++++- 3 files changed, 246 insertions(+), 2 deletions(-) diff --git a/src/conf/nwfilter_conf.c b/src/conf/nwfilter_conf.c index d03f78af4d..344bddcd68 100644 --- a/src/conf/nwfilter_conf.c +++ b/src/conf/nwfilter_conf.c @@ -2509,7 +2509,7 @@ virNWFilterIsAllowedChain(const char *chainname) } =20 =20 -static virNWFilterDef * +virNWFilterDef * virNWFilterDefParseXML(xmlXPathContextPtr ctxt) { g_autoptr(virNWFilterDef) ret =3D NULL; @@ -2660,6 +2660,9 @@ virNWFilterSaveConfig(const char *configDir, char uuidstr[VIR_UUID_STRING_BUFLEN]; g_autofree char *configFile =3D NULL; =20 + if (!configDir) + return 0; + if (!(xml =3D virNWFilterDefFormat(def))) return -1; =20 diff --git a/src/conf/nwfilter_conf.h b/src/conf/nwfilter_conf.h index 34de6eab3d..6e13eae262 100644 --- a/src/conf/nwfilter_conf.h +++ b/src/conf/nwfilter_conf.h @@ -552,6 +552,9 @@ virNWFilterDefParse(const char *xmlStr, const char *filename, unsigned int flags); =20 +virNWFilterDef * +virNWFilterDefParseXML(xmlXPathContextPtr ctxt); + typedef int (*virNWFilterTriggerRebuildCallback)(void *opaque); =20 int diff --git a/src/test/test_driver.c b/src/test/test_driver.c index e87d7cfd44..ffcaa07b3e 100644 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -63,6 +63,8 @@ #include "virhostcpu.h" #include "virdomaincheckpointobjlist.h" #include "virdomainsnapshotobjlist.h" +#include "nwfilter_conf.h" +#include "virnwfilterobj.h" #include "virkeycode.h" #include "virutil.h" =20 @@ -114,6 +116,7 @@ struct _testDriver { /* immutable pointer, self-locking APIs */ virDomainObjList *domains; virNetworkObjList *networks; + virNWFilterObjList *nwfilters; virObjectEventState *eventState; }; typedef struct _testDriver testDriver; @@ -158,6 +161,7 @@ testDriverDispose(void *obj) virObjectUnref(driver->domains); virNodeDeviceObjListFree(driver->devs); virObjectUnref(driver->networks); + virObjectUnref(driver->nwfilters); virObjectUnref(driver->ifaces); virObjectUnref(driver->pools); virObjectUnref(driver->eventState); @@ -465,6 +469,7 @@ testDriverNew(void) !(ret->ifaces =3D virInterfaceObjListNew()) || !(ret->domains =3D virDomainObjListNew()) || !(ret->networks =3D virNetworkObjListNew()) || + !(ret->nwfilters =3D virNWFilterObjListNew()) || !(ret->devs =3D virNodeDeviceObjListNew()) || !(ret->pools =3D virStoragePoolObjListNew())) goto error; @@ -519,6 +524,10 @@ static const char *defaultConnXML =3D " " "" "" +"" +" aafaaaaf-7aca-7007-bbca-dda97dd1adfc" +"" +"" "" " " " " @@ -1113,6 +1122,40 @@ testParseNetworks(testDriver *privconn, } =20 =20 +static int +testParseNWFilters(testDriver *privconn, + const char *file, + xmlXPathContextPtr ctxt) +{ + VIR_XPATH_NODE_AUTORESTORE(ctxt) + int num; + size_t i; + virNWFilterObj *obj; + g_autofree xmlNodePtr *nodes =3D NULL; + + num =3D virXPathNodeSet("/node/filter", ctxt, &nodes); + if (num < 0) + return -1; + + for (i =3D 0; i < num; i++) { + g_autoptr(virNWFilterDef) def =3D NULL; + + if (!(ctxt->node =3D testParseXMLDocFromFile(nodes[i], file))) + return -1; + + if (!(def =3D virNWFilterDefParseXML(ctxt))) + return -1; + + if (!(obj =3D virNWFilterObjListAssignDef(privconn->nwfilters, def= ))) + return -1; + def =3D NULL; + + virNWFilterObjUnlock(obj); + } + return 0; +} + + static int testParseInterfaces(testDriver *privconn, const char *file, @@ -1320,6 +1363,8 @@ testOpenParse(testDriver *privconn, return -1; if (testParseNetworks(privconn, file, ctxt) < 0) return -1; + if (testParseNWFilters(privconn, file, ctxt) < 0) + return -1; if (testParseInterfaces(privconn, file, ctxt) < 0) return -1; if (testParseStorage(privconn, file, ctxt) < 0) @@ -10036,6 +10081,187 @@ testConnectGetDomainCapabilities(virConnectPtr co= nn G_GNUC_UNUSED, } =20 =20 +static virNWFilterObj * +testNWFilterObjFromNWFilter(testDriver *driver, + const unsigned char *uuid) +{ + virNWFilterObj *obj; + char uuidstr[VIR_UUID_STRING_BUFLEN]; + + if (!(obj =3D virNWFilterObjListFindByUUID(driver->nwfilters, uuid))) { + virUUIDFormat(uuid, uuidstr); + virReportError(VIR_ERR_NO_NWFILTER, + _("no nwfilter with matching uuid '%1$s'"), uuidstr= ); + } + return obj; +} + +static virNWFilterPtr +testNWFilterLookupByUUID(virConnectPtr conn, + const unsigned char *uuid) +{ + testDriver *driver =3D conn->privateData; + virNWFilterObj *obj =3D NULL; + virNWFilterDef *def; + virNWFilterPtr nwfilter =3D NULL; + + if (!(obj =3D testNWFilterObjFromNWFilter(driver, uuid))) + return NULL; + + def =3D virNWFilterObjGetDef(obj); + nwfilter =3D virGetNWFilter(conn, def->name, def->uuid); + + virNWFilterObjUnlock(obj); + return nwfilter; +} + + +static virNWFilterPtr +testNWFilterLookupByName(virConnectPtr conn, + const char *name) +{ + testDriver *driver =3D conn->privateData; + virNWFilterObj *obj =3D NULL; + virNWFilterDef *def; + virNWFilterPtr nwfilter =3D NULL; + + if (!(obj =3D virNWFilterObjListFindByName(driver->nwfilters, name))) { + virReportError(VIR_ERR_NO_NWFILTER, + _("no nwfilter with matching name '%1$s'"), + name); + return NULL; + } + def =3D virNWFilterObjGetDef(obj); + nwfilter =3D virGetNWFilter(conn, def->name, def->uuid); + + virNWFilterObjUnlock(obj); + return nwfilter; +} + +static int +testNWFilterConnectNumOfNWFilters(virConnectPtr conn) +{ + testDriver *driver =3D conn->privateData; + return virNWFilterObjListNumOfNWFilters(driver->nwfilters, + conn, NULL); +} + + +static int +testNWFilterConnectListNWFilters(virConnectPtr conn, + char **const names, + int maxnames) +{ + testDriver *driver =3D conn->privateData; + return virNWFilterObjListGetNames(driver->nwfilters, conn, + NULL, names, maxnames); +} + + +static int +testNWFilterConnectListAllNWFilters(virConnectPtr conn, + virNWFilterPtr **nwfilters, + unsigned int flags) +{ + testDriver *driver =3D conn->privateData; + virCheckFlags(0, -1); + return virNWFilterObjListExport(conn, driver->nwfilters, + nwfilters, NULL); +} + + +static virNWFilterPtr +testNWFilterDefineXMLFlags(virConnectPtr conn, + const char *xml, + unsigned int flags) +{ + testDriver *driver =3D conn->privateData; + virNWFilterDef *def; + virNWFilterObj *obj =3D NULL; + virNWFilterDef *objdef; + virNWFilterPtr nwfilter =3D NULL; + + virCheckFlags(VIR_NWFILTER_DEFINE_VALIDATE, NULL); + + if (!(def =3D virNWFilterDefParse(xml, NULL, flags))) + goto cleanup; + + + if (!(obj =3D virNWFilterObjListAssignDef(driver->nwfilters, def))) + goto cleanup; + + def =3D NULL; + objdef =3D virNWFilterObjGetDef(obj); + + nwfilter =3D virGetNWFilter(conn, objdef->name, objdef->uuid); + + cleanup: + virNWFilterDefFree(def); + if (obj) + virNWFilterObjUnlock(obj); + return nwfilter; +} + + +static virNWFilterPtr +testNWFilterDefineXML(virConnectPtr conn, + const char *xml) +{ + return testNWFilterDefineXMLFlags(conn, xml, 0); +} + + +static int +testNWFilterUndefine(virNWFilterPtr nwfilter) +{ + testDriver *driver =3D nwfilter->conn->privateData; + virNWFilterObj *obj; + int ret =3D -1; + + if (!(obj =3D testNWFilterObjFromNWFilter(driver, nwfilter->uuid))) + goto cleanup; + + if (virNWFilterObjTestUnassignDef(obj) < 0) { + virReportError(VIR_ERR_OPERATION_INVALID, + "%s", + _("nwfilter is in use")); + goto cleanup; + } + + virNWFilterObjListRemove(driver->nwfilters, obj); + obj =3D NULL; + ret =3D 0; + + cleanup: + if (obj) + virNWFilterObjUnlock(obj); + + return ret; +} + + +static char * +testNWFilterGetXMLDesc(virNWFilterPtr nwfilter, + unsigned int flags) +{ + testDriver *driver =3D nwfilter->conn->privateData; + virNWFilterObj *obj =3D NULL; + virNWFilterDef *def =3D NULL; + char *ret =3D NULL; + + virCheckFlags(0, NULL); + + if (!(obj =3D testNWFilterObjFromNWFilter(driver, nwfilter->uuid))) + return NULL; + + def =3D virNWFilterObjGetDef(obj); + + ret =3D virNWFilterDefFormat(def); + + virNWFilterObjUnlock(obj); + return ret; +} + /* * Test driver */ @@ -10310,6 +10536,18 @@ static virNodeDeviceDriver testNodeDeviceDriver = =3D { .nodeDeviceDestroy =3D testNodeDeviceDestroy, /* 0.7.3 */ }; =20 +static virNWFilterDriver testNWFilterDriver =3D { + .connectNumOfNWFilters =3D testNWFilterConnectNumOfNWFilters, /* 9.9.0= */ + .connectListNWFilters =3D testNWFilterConnectListNWFilters, /* 9.9.0 */ + .connectListAllNWFilters =3D testNWFilterConnectListAllNWFilters, /* 9= .9.0 */ + .nwfilterLookupByName =3D testNWFilterLookupByName, /* 9.9.0 */ + .nwfilterLookupByUUID =3D testNWFilterLookupByUUID, /* 9.9.0 */ + .nwfilterDefineXML =3D testNWFilterDefineXML, /* 9.9.0 */ + .nwfilterDefineXMLFlags =3D testNWFilterDefineXMLFlags, /* 9.9.0 */ + .nwfilterUndefine =3D testNWFilterUndefine, /* 9.9.0 */ + .nwfilterGetXMLDesc =3D testNWFilterGetXMLDesc, /* 9.9.0 */ +}; + static virConnectDriver testConnectDriver =3D { .localOnly =3D true, .uriSchemes =3D (const char *[]){ "test", NULL }, @@ -10317,7 +10555,7 @@ static virConnectDriver testConnectDriver =3D { .interfaceDriver =3D &testInterfaceDriver, .networkDriver =3D &testNetworkDriver, .nodeDeviceDriver =3D &testNodeDeviceDriver, - .nwfilterDriver =3D NULL, + .nwfilterDriver =3D &testNWFilterDriver, .secretDriver =3D NULL, .storageDriver =3D &testStorageDriver, }; --=20 2.42.0