From nobody Mon Dec 15 23:51:48 2025 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 1495199162735935.6922650683183; Fri, 19 May 2017 06:06:02 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 2DEC8883B1; Fri, 19 May 2017 13:05:59 +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 F266B80E8F; Fri, 19 May 2017 13:05:58 +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 B1762180BAF4; Fri, 19 May 2017 13:05:58 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id v4JD3Xds003745 for ; Fri, 19 May 2017 09:03:33 -0400 Received: by smtp.corp.redhat.com (Postfix) id 35E2E18C5F; Fri, 19 May 2017 13:03:33 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-116-18.phx2.redhat.com [10.3.116.18]) by smtp.corp.redhat.com (Postfix) with ESMTP id E73D618C5E for ; Fri, 19 May 2017 13:03:30 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 2DEC8883B1 Authentication-Results: ext-mx02.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx02.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 2DEC8883B1 From: John Ferlan To: libvir-list@redhat.com Date: Fri, 19 May 2017 09:03:10 -0400 Message-Id: <20170519130324.4624-3-jferlan@redhat.com> In-Reply-To: <20170519130324.4624-1-jferlan@redhat.com> References: <20170519130324.4624-1-jferlan@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 02/16] test: Use consistent variable names for network test driver APIs 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.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.26]); Fri, 19 May 2017 13:05:59 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" A virNetworkObjPtr will be an 'obj'. A virNetworkPtr will be a 'net'. Signed-off-by: John Ferlan --- src/test/test_driver.c | 182 ++++++++++++++++++++++++---------------------= ---- 1 file changed, 91 insertions(+), 91 deletions(-) diff --git a/src/test/test_driver.c b/src/test/test_driver.c index 5f0a170..46f0a9a 100644 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -3210,17 +3210,17 @@ static virNetworkObjPtr testNetworkObjFindByUUID(testDriverPtr privconn, const unsigned char *uuid) { - virNetworkObjPtr net; + virNetworkObjPtr obj; char uuidstr[VIR_UUID_STRING_BUFLEN]; =20 - if (!(net =3D virNetworkObjFindByUUID(privconn->networks, uuid))) { + if (!(obj =3D virNetworkObjFindByUUID(privconn->networks, uuid))) { virUUIDFormat(uuid, uuidstr); virReportError(VIR_ERR_NO_NETWORK, _("no network with matching uuid '%s'"), uuidstr); } =20 - return net; + return obj; } =20 =20 @@ -3229,17 +3229,17 @@ testNetworkLookupByUUID(virConnectPtr conn, const unsigned char *uuid) { testDriverPtr privconn =3D conn->privateData; - virNetworkObjPtr net; - virNetworkPtr ret =3D NULL; + virNetworkObjPtr obj; + virNetworkPtr net =3D NULL; =20 - if (!(net =3D testNetworkObjFindByUUID(privconn, uuid))) + if (!(obj =3D testNetworkObjFindByUUID(privconn, uuid))) goto cleanup; =20 - ret =3D virGetNetwork(conn, net->def->name, net->def->uuid); + net =3D virGetNetwork(conn, obj->def->name, obj->def->uuid); =20 cleanup: - virNetworkObjEndAPI(&net); - return ret; + virNetworkObjEndAPI(&obj); + return net; } =20 =20 @@ -3247,14 +3247,14 @@ static virNetworkObjPtr testNetworkObjFindByName(testDriverPtr privconn, const char *name) { - virNetworkObjPtr net; + virNetworkObjPtr obj; =20 - if (!(net =3D virNetworkObjFindByName(privconn->networks, name))) + if (!(obj =3D virNetworkObjFindByName(privconn->networks, name))) virReportError(VIR_ERR_NO_NETWORK, _("no network with matching name '%s'"), name); =20 - return net; + return obj; } =20 =20 @@ -3263,17 +3263,17 @@ testNetworkLookupByName(virConnectPtr conn, const char *name) { testDriverPtr privconn =3D conn->privateData; - virNetworkObjPtr net; - virNetworkPtr ret =3D NULL; + virNetworkObjPtr obj; + virNetworkPtr net =3D NULL; =20 - if (!(net =3D testNetworkObjFindByName(privconn, name))) + if (!(obj =3D testNetworkObjFindByName(privconn, name))) goto cleanup; =20 - ret =3D virGetNetwork(conn, net->def->name, net->def->uuid); + net =3D virGetNetwork(conn, obj->def->name, obj->def->uuid); =20 cleanup: - virNetworkObjEndAPI(&net); - return ret; + virNetworkObjEndAPI(&obj); + return net; } =20 =20 @@ -3383,31 +3383,31 @@ testNetworkCreateXML(virConnectPtr conn, const char= *xml) { testDriverPtr privconn =3D conn->privateData; virNetworkDefPtr def; - virNetworkObjPtr net =3D NULL; - virNetworkPtr ret =3D NULL; + virNetworkObjPtr obj =3D NULL; + virNetworkPtr net =3D NULL; virObjectEventPtr event =3D NULL; =20 if ((def =3D virNetworkDefParseString(xml)) =3D=3D NULL) goto cleanup; =20 - if (!(net =3D virNetworkObjAssignDef(privconn->networks, def, + if (!(obj =3D virNetworkObjAssignDef(privconn->networks, def, VIR_NETWORK_OBJ_LIST_ADD_LIVE | VIR_NETWORK_OBJ_LIST_ADD_CHECK_LIVE= ))) goto cleanup; def =3D NULL; - net->active =3D 1; + obj->active =3D 1; =20 - event =3D virNetworkEventLifecycleNew(net->def->name, net->def->uuid, + event =3D virNetworkEventLifecycleNew(obj->def->name, obj->def->uuid, VIR_NETWORK_EVENT_STARTED, 0); =20 - ret =3D virGetNetwork(conn, net->def->name, net->def->uuid); + net =3D virGetNetwork(conn, obj->def->name, obj->def->uuid); =20 cleanup: virNetworkDefFree(def); testObjectEventQueue(privconn, event); - virNetworkObjEndAPI(&net); - return ret; + virNetworkObjEndAPI(&obj); + return net; } =20 =20 @@ -3417,58 +3417,58 @@ testNetworkDefineXML(virConnectPtr conn, { testDriverPtr privconn =3D conn->privateData; virNetworkDefPtr def; - virNetworkObjPtr net =3D NULL; - virNetworkPtr ret =3D NULL; + virNetworkObjPtr obj =3D NULL; + virNetworkPtr net =3D NULL; virObjectEventPtr event =3D NULL; =20 if ((def =3D virNetworkDefParseString(xml)) =3D=3D NULL) goto cleanup; =20 - if (!(net =3D virNetworkObjAssignDef(privconn->networks, def, 0))) + if (!(obj =3D virNetworkObjAssignDef(privconn->networks, def, 0))) goto cleanup; def =3D NULL; =20 - event =3D virNetworkEventLifecycleNew(net->def->name, net->def->uuid, + event =3D virNetworkEventLifecycleNew(obj->def->name, obj->def->uuid, VIR_NETWORK_EVENT_DEFINED, 0); =20 - ret =3D virGetNetwork(conn, net->def->name, net->def->uuid); + net =3D virGetNetwork(conn, obj->def->name, obj->def->uuid); =20 cleanup: virNetworkDefFree(def); testObjectEventQueue(privconn, event); - virNetworkObjEndAPI(&net); - return ret; + virNetworkObjEndAPI(&obj); + return net; } =20 =20 static int -testNetworkUndefine(virNetworkPtr network) +testNetworkUndefine(virNetworkPtr net) { - testDriverPtr privconn =3D network->conn->privateData; - virNetworkObjPtr privnet; + testDriverPtr privconn =3D net->conn->privateData; + virNetworkObjPtr obj; int ret =3D -1; virObjectEventPtr event =3D NULL; =20 - if (!(privnet =3D testNetworkObjFindByName(privconn, network->name))) + if (!(obj =3D testNetworkObjFindByName(privconn, net->name))) goto cleanup; =20 - if (virNetworkObjIsActive(privnet)) { + if (virNetworkObjIsActive(obj)) { virReportError(VIR_ERR_OPERATION_INVALID, - _("Network '%s' is still running"), network->name); + _("Network '%s' is still running"), net->name); goto cleanup; } =20 - event =3D virNetworkEventLifecycleNew(network->name, network->uuid, + event =3D virNetworkEventLifecycleNew(net->name, net->uuid, VIR_NETWORK_EVENT_UNDEFINED, 0); =20 - virNetworkObjRemoveInactive(privconn->networks, privnet); + virNetworkObjRemoveInactive(privconn->networks, obj); ret =3D 0; =20 cleanup: testObjectEventQueue(privconn, event); - virNetworkObjEndAPI(&privnet); + virNetworkObjEndAPI(&obj); return ret; } =20 @@ -3482,20 +3482,20 @@ testNetworkUpdate(virNetworkPtr net, unsigned int flags) { testDriverPtr privconn =3D net->conn->privateData; - virNetworkObjPtr network =3D NULL; + virNetworkObjPtr obj =3D NULL; int isActive, ret =3D -1; =20 virCheckFlags(VIR_NETWORK_UPDATE_AFFECT_LIVE | VIR_NETWORK_UPDATE_AFFECT_CONFIG, -1); =20 - if (!(network =3D testNetworkObjFindByUUID(privconn, net->uuid))) + if (!(obj =3D testNetworkObjFindByUUID(privconn, net->uuid))) goto cleanup; =20 /* VIR_NETWORK_UPDATE_AFFECT_CURRENT means "change LIVE if network * is active, else change CONFIG */ - isActive =3D virNetworkObjIsActive(network); + isActive =3D virNetworkObjIsActive(obj); if ((flags & (VIR_NETWORK_UPDATE_AFFECT_LIVE | VIR_NETWORK_UPDATE_AFFECT_CONFIG)) =3D=3D VIR_NETWORK_UPDATE_AFFECT_CURRENT) { @@ -3506,155 +3506,155 @@ testNetworkUpdate(virNetworkPtr net, } =20 /* update the network config in memory/on disk */ - if (virNetworkObjUpdate(network, command, section, parentIndex, xml, f= lags) < 0) + if (virNetworkObjUpdate(obj, command, section, parentIndex, xml, flags= ) < 0) goto cleanup; =20 ret =3D 0; cleanup: - virNetworkObjEndAPI(&network); + virNetworkObjEndAPI(&obj); return ret; } =20 =20 static int -testNetworkCreate(virNetworkPtr network) +testNetworkCreate(virNetworkPtr net) { - testDriverPtr privconn =3D network->conn->privateData; - virNetworkObjPtr privnet; + testDriverPtr privconn =3D net->conn->privateData; + virNetworkObjPtr obj; int ret =3D -1; virObjectEventPtr event =3D NULL; =20 - if (!(privnet =3D testNetworkObjFindByName(privconn, network->name))) + if (!(obj =3D testNetworkObjFindByName(privconn, net->name))) goto cleanup; =20 - if (virNetworkObjIsActive(privnet)) { + if (virNetworkObjIsActive(obj)) { virReportError(VIR_ERR_OPERATION_INVALID, - _("Network '%s' is already running"), network->name= ); + _("Network '%s' is already running"), net->name); goto cleanup; } =20 - privnet->active =3D 1; - event =3D virNetworkEventLifecycleNew(privnet->def->name, privnet->def= ->uuid, + obj->active =3D 1; + event =3D virNetworkEventLifecycleNew(obj->def->name, obj->def->uuid, VIR_NETWORK_EVENT_STARTED, 0); ret =3D 0; =20 cleanup: testObjectEventQueue(privconn, event); - virNetworkObjEndAPI(&privnet); + virNetworkObjEndAPI(&obj); return ret; } =20 =20 static int -testNetworkDestroy(virNetworkPtr network) +testNetworkDestroy(virNetworkPtr net) { - testDriverPtr privconn =3D network->conn->privateData; - virNetworkObjPtr privnet; + testDriverPtr privconn =3D net->conn->privateData; + virNetworkObjPtr obj; int ret =3D -1; virObjectEventPtr event =3D NULL; =20 - if (!(privnet =3D testNetworkObjFindByName(privconn, network->name))) + if (!(obj =3D testNetworkObjFindByName(privconn, net->name))) goto cleanup; =20 - privnet->active =3D 0; - event =3D virNetworkEventLifecycleNew(privnet->def->name, privnet->def= ->uuid, + obj->active =3D 0; + event =3D virNetworkEventLifecycleNew(obj->def->name, obj->def->uuid, VIR_NETWORK_EVENT_STOPPED, 0); - if (!privnet->persistent) - virNetworkObjRemoveInactive(privconn->networks, privnet); + if (!obj->persistent) + virNetworkObjRemoveInactive(privconn->networks, obj); =20 ret =3D 0; =20 cleanup: testObjectEventQueue(privconn, event); - virNetworkObjEndAPI(&privnet); + virNetworkObjEndAPI(&obj); return ret; } =20 =20 static char * -testNetworkGetXMLDesc(virNetworkPtr network, +testNetworkGetXMLDesc(virNetworkPtr net, unsigned int flags) { - testDriverPtr privconn =3D network->conn->privateData; - virNetworkObjPtr privnet; + testDriverPtr privconn =3D net->conn->privateData; + virNetworkObjPtr obj; char *ret =3D NULL; =20 virCheckFlags(0, NULL); =20 - if (!(privnet =3D testNetworkObjFindByName(privconn, network->name))) + if (!(obj =3D testNetworkObjFindByName(privconn, net->name))) goto cleanup; =20 - ret =3D virNetworkDefFormat(privnet->def, flags); + ret =3D virNetworkDefFormat(obj->def, flags); =20 cleanup: - virNetworkObjEndAPI(&privnet); + virNetworkObjEndAPI(&obj); return ret; } =20 =20 static char * -testNetworkGetBridgeName(virNetworkPtr network) +testNetworkGetBridgeName(virNetworkPtr net) { - testDriverPtr privconn =3D network->conn->privateData; + testDriverPtr privconn =3D net->conn->privateData; char *bridge =3D NULL; - virNetworkObjPtr privnet; + virNetworkObjPtr obj; =20 - if (!(privnet =3D testNetworkObjFindByName(privconn, network->name))) + if (!(obj =3D testNetworkObjFindByName(privconn, net->name))) goto cleanup; =20 - if (!(privnet->def->bridge)) { + if (!(obj->def->bridge)) { virReportError(VIR_ERR_INTERNAL_ERROR, _("network '%s' does not have a bridge name."), - privnet->def->name); + obj->def->name); goto cleanup; } =20 - ignore_value(VIR_STRDUP(bridge, privnet->def->bridge)); + ignore_value(VIR_STRDUP(bridge, obj->def->bridge)); =20 cleanup: - virNetworkObjEndAPI(&privnet); + virNetworkObjEndAPI(&obj); return bridge; } =20 =20 static int -testNetworkGetAutostart(virNetworkPtr network, +testNetworkGetAutostart(virNetworkPtr net, int *autostart) { - testDriverPtr privconn =3D network->conn->privateData; - virNetworkObjPtr privnet; + testDriverPtr privconn =3D net->conn->privateData; + virNetworkObjPtr obj; int ret =3D -1; =20 - if (!(privnet =3D testNetworkObjFindByName(privconn, network->name))) + if (!(obj =3D testNetworkObjFindByName(privconn, net->name))) goto cleanup; =20 - *autostart =3D privnet->autostart; + *autostart =3D obj->autostart; ret =3D 0; =20 cleanup: - virNetworkObjEndAPI(&privnet); + virNetworkObjEndAPI(&obj); return ret; } =20 =20 static int -testNetworkSetAutostart(virNetworkPtr network, +testNetworkSetAutostart(virNetworkPtr net, int autostart) { - testDriverPtr privconn =3D network->conn->privateData; - virNetworkObjPtr privnet; + testDriverPtr privconn =3D net->conn->privateData; + virNetworkObjPtr obj; int ret =3D -1; =20 - if (!(privnet =3D testNetworkObjFindByName(privconn, network->name))) + if (!(obj =3D testNetworkObjFindByName(privconn, net->name))) goto cleanup; =20 - privnet->autostart =3D autostart ? 1 : 0; + obj->autostart =3D autostart ? 1 : 0; ret =3D 0; =20 cleanup: - virNetworkObjEndAPI(&privnet); + virNetworkObjEndAPI(&obj); return ret; } =20 --=20 2.9.3 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list