From nobody Wed Apr 1 08:42:46 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.24 as permitted sender) client-ip=209.132.183.24; envelope-from=libvir-list-bounces@redhat.com; helo=mx3-phx2.redhat.com; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.24 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; Return-Path: Received: from mx3-phx2.redhat.com (mx3-phx2.redhat.com [209.132.183.24]) by mx.zohomail.com with SMTPS id 1488639843875887.7340181518516; Sat, 4 Mar 2017 07:04:03 -0800 (PST) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by mx3-phx2.redhat.com (8.13.8/8.13.8) with ESMTP id v24F0Tpc021988; Sat, 4 Mar 2017 10:00:29 -0500 Received: from smtp.corp.redhat.com (int-mx16.intmail.prod.int.phx2.redhat.com [10.5.11.28]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id v24F0SbK009863 for ; Sat, 4 Mar 2017 10:00:28 -0500 Received: by smtp.corp.redhat.com (Postfix) id 61F822D654; Sat, 4 Mar 2017 15:00:28 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-116-78.phx2.redhat.com [10.3.116.78]) by smtp.corp.redhat.com (Postfix) with ESMTP id 218BF2D653 for ; Sat, 4 Mar 2017 15:00:28 +0000 (UTC) From: John Ferlan To: libvir-list@redhat.com Date: Sat, 4 Mar 2017 10:00:23 -0500 Message-Id: <20170304150024.30063-3-jferlan@redhat.com> In-Reply-To: <20170304150024.30063-1-jferlan@redhat.com> References: <20170304150024.30063-1-jferlan@redhat.com> X-Scanned-By: MIMEDefang 2.74 on 10.5.11.28 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 2/3] test: Make a common testNetworkObjFindByName 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-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Rather than have multiple places using the same pattern to find a network by name using virNetworkObjFindByName, create a common helper which will provide a consistent error message as well. Signed-off-by: John Ferlan --- src/test/test_driver.c | 57 +++++++++++++++++++++-------------------------= ---- 1 file changed, 24 insertions(+), 33 deletions(-) diff --git a/src/test/test_driver.c b/src/test/test_driver.c index c2536c9..e4402cc 100644 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -3236,6 +3236,22 @@ static virNetworkPtr testNetworkLookupByUUID(virConn= ectPtr conn, return ret; } =20 + +static virNetworkObjPtr +testNetworkObjFindByName(testDriverPtr privconn, + const char *name) +{ + virNetworkObjPtr net; + + if (!(net =3D virNetworkObjFindByName(privconn->networks, name))) + virReportError(VIR_ERR_NO_NETWORK, + _("no network with matching name '%s'"), + name); + + return net; +} + + static virNetworkPtr testNetworkLookupByName(virConnectPtr conn, const char *name) { @@ -3243,11 +3259,8 @@ static virNetworkPtr testNetworkLookupByName(virConn= ectPtr conn, virNetworkObjPtr net; virNetworkPtr ret =3D NULL; =20 - net =3D virNetworkObjFindByName(privconn->networks, name); - if (net =3D=3D NULL) { - virReportError(VIR_ERR_NO_NETWORK, NULL); + if (!(net =3D testNetworkObjFindByName(privconn, name))) goto cleanup; - } =20 ret =3D virGetNetwork(conn, net->def->name, net->def->uuid); =20 @@ -3411,12 +3424,8 @@ static int testNetworkUndefine(virNetworkPtr network) int ret =3D -1; virObjectEventPtr event =3D NULL; =20 - privnet =3D virNetworkObjFindByName(privconn->networks, network->name); - - if (privnet =3D=3D NULL) { - virReportError(VIR_ERR_INVALID_ARG, __FUNCTION__); + if (!(privnet =3D testNetworkObjFindByName(privconn, network->name))) goto cleanup; - } =20 if (virNetworkObjIsActive(privnet)) { virReportError(VIR_ERR_OPERATION_INVALID, @@ -3490,11 +3499,8 @@ static int testNetworkCreate(virNetworkPtr network) int ret =3D -1; virObjectEventPtr event =3D NULL; =20 - privnet =3D virNetworkObjFindByName(privconn->networks, network->name); - if (privnet =3D=3D NULL) { - virReportError(VIR_ERR_INVALID_ARG, __FUNCTION__); + if (!(privnet =3D testNetworkObjFindByName(privconn, network->name))) goto cleanup; - } =20 if (virNetworkObjIsActive(privnet)) { virReportError(VIR_ERR_OPERATION_INVALID, @@ -3521,11 +3527,8 @@ static int testNetworkDestroy(virNetworkPtr network) int ret =3D -1; virObjectEventPtr event =3D NULL; =20 - privnet =3D virNetworkObjFindByName(privconn->networks, network->name); - if (privnet =3D=3D NULL) { - virReportError(VIR_ERR_INVALID_ARG, __FUNCTION__); + if (!(privnet =3D testNetworkObjFindByName(privconn, network->name))) goto cleanup; - } =20 privnet->active =3D 0; event =3D virNetworkEventLifecycleNew(privnet->def->name, privnet->def= ->uuid, @@ -3551,11 +3554,8 @@ static char *testNetworkGetXMLDesc(virNetworkPtr net= work, =20 virCheckFlags(0, NULL); =20 - privnet =3D virNetworkObjFindByName(privconn->networks, network->name); - if (privnet =3D=3D NULL) { - virReportError(VIR_ERR_INVALID_ARG, __FUNCTION__); + if (!(privnet =3D testNetworkObjFindByName(privconn, network->name))) goto cleanup; - } =20 ret =3D virNetworkDefFormat(privnet->def, flags); =20 @@ -3569,11 +3569,8 @@ static char *testNetworkGetBridgeName(virNetworkPtr = network) { char *bridge =3D NULL; virNetworkObjPtr privnet; =20 - privnet =3D virNetworkObjFindByName(privconn->networks, network->name); - if (privnet =3D=3D NULL) { - virReportError(VIR_ERR_INVALID_ARG, __FUNCTION__); + if (!(privnet =3D testNetworkObjFindByName(privconn, network->name))) goto cleanup; - } =20 if (!(privnet->def->bridge)) { virReportError(VIR_ERR_INTERNAL_ERROR, @@ -3596,11 +3593,8 @@ static int testNetworkGetAutostart(virNetworkPtr net= work, virNetworkObjPtr privnet; int ret =3D -1; =20 - privnet =3D virNetworkObjFindByName(privconn->networks, network->name); - if (privnet =3D=3D NULL) { - virReportError(VIR_ERR_INVALID_ARG, __FUNCTION__); + if (!(privnet =3D testNetworkObjFindByName(privconn, network->name))) goto cleanup; - } =20 *autostart =3D privnet->autostart; ret =3D 0; @@ -3617,11 +3611,8 @@ static int testNetworkSetAutostart(virNetworkPtr net= work, virNetworkObjPtr privnet; int ret =3D -1; =20 - privnet =3D virNetworkObjFindByName(privconn->networks, network->name); - if (privnet =3D=3D NULL) { - virReportError(VIR_ERR_INVALID_ARG, __FUNCTION__); + if (!(privnet =3D testNetworkObjFindByName(privconn, network->name))) goto cleanup; - } =20 privnet->autostart =3D autostart ? 1 : 0; ret =3D 0; --=20 2.9.3 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list