From nobody Tue Mar 24 01:07:53 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass(p=reject dis=none) header.from=lists.libvirt.org ARC-Seal: i=1; a=rsa-sha256; t=1773764045; cv=none; d=zohomail.com; s=zohoarc; b=PWJR1H2eujXig53MoBKanNZEIcZnGqk0xtRmOLiPTkHb3KSiLvRqR5vS+0+bt/LfjOeFO7Pn99Pga6XZsjhNA8feWLMeRGwUb68EAVO9BDDfU1bDcAwMVjP3Nd+aVQg9COHNfhiS8EArNkHdsuAvKn6wHnZWCDsc/9ypPvWjTyU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773764045; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Owner:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Reply-To:References:Subject:Subject:To:To:Message-Id:Cc; bh=/mzWOwZ/at4MAluqnK1L0NkcqGeuowxHksgjbI1UbYU=; b=MV1NDy2hU5IvVyqxbJeLMwx0NpNbW5xsn4yh6CmB8mJvM6AatrlnbPoqMu5JYz7OZ6jLUV2GuVxV7cFEf+0CMQIopXG7UtxgWxLTa7DJTQ2LdnEXkoBmrDxYYr0pZf9o99tQT9uJnqpA4J/+JGSte8sBBJFm0EzN1QivwneT3Go= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1773764045055245.12473972186956; Tue, 17 Mar 2026 09:14:05 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 993) id 6A33941967; Tue, 17 Mar 2026 12:14:04 -0400 (EDT) Received: from [172.19.199.12] (lists.libvirt.org [8.43.85.245]) by lists.libvirt.org (Postfix) with ESMTP id 1A1F341B5A; Tue, 17 Mar 2026 12:10:21 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 993) id 40C1D418AB; Tue, 17 Mar 2026 12:10:15 -0400 (EDT) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (3072 bits) server-digest SHA256) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 84D653F8A7 for ; Tue, 17 Mar 2026 12:10:13 -0400 (EDT) Received: from mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-562-lLRxbcSPMuCSGMePi9oNHQ-1; Tue, 17 Mar 2026 12:10:11 -0400 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (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 mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id C134619560A1 for ; Tue, 17 Mar 2026 16:10:10 +0000 (UTC) Received: from moe (unknown [10.43.3.236]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id B42191955F19 for ; Tue, 17 Mar 2026 16:10:09 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-26) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HELO_MISC_IP,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_PASS autolearn=unavailable autolearn_force=no version=4.0.1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1773763813; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=/mzWOwZ/at4MAluqnK1L0NkcqGeuowxHksgjbI1UbYU=; b=irnchJcZoSSK+q8IdXQg6CM6YC5Lgq8OdyAu7QgaRBrSgSWmxutJg2Tj+NlEIhx5zKfs1l 0fGr7xf1DhKZUAjlr3pT886yly9GkG/laFsXAw4k78ye4y3DTMg6jgiy0ym5Bpa0FTCufI kfxgVSV4WneVc74h6cXwcGJj2bbQqTQ= X-MC-Unique: lLRxbcSPMuCSGMePi9oNHQ-1 X-Mimecast-MFC-AGG-ID: lLRxbcSPMuCSGMePi9oNHQ_1773763810 To: devel@lists.libvirt.org Subject: [PATCH 2/3] network: Format element using virXMLFormatElement() Date: Tue, 17 Mar 2026 17:10:04 +0100 Message-ID: <99cecbf570af8928ec9aae0a46cef8a0b51cf82b.1773763761.git.mprivozn@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: Ks8oaQWhS299CWzlWht7E4IGf4StHUVlxZmPZY0IrZY_1773763810 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: XJUIMBY2LM3VLQWMV3CE6CCDJXK3N2AW X-Message-ID-Hash: XJUIMBY2LM3VLQWMV3CE6CCDJXK3N2AW X-MailFrom: mprivozn@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; header-match-devel.lists.libvirt.org-0; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.10 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: From: Michal Privoznik via Devel Reply-To: Michal Privoznik X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1773764046651154100 Content-Type: text/plain; charset="utf-8"; x-default="true" From: Michal Privoznik Signed-off-by: Michal Privoznik --- src/conf/network_conf.c | 76 +++++++++---------- .../nat-network-dns-hosts-modified.xml | 3 +- .../nat-network-dns-more-hosts.xml | 3 +- .../nat-network-dns-srv-record.xml | 12 +-- .../nat-network-dns-srv-records.xml | 12 +-- .../nat-network-dns-txt-modify-ok.xml | 12 +-- .../nat-network-dns-txt-none.xml | 12 +-- .../nat-network-dns-txt-records.xml | 12 +-- .../nat-network-forward-ifaces.xml | 12 +-- .../nat-network-host-updated.xml | 12 +-- .../nat-network-hosts.xml | 12 +-- .../nat-network-no-forward-ifaces.xml | 12 +-- .../nat-network-no-hosts.xml | 3 +- .../nat-network-no-range.xml | 12 +-- .../nat-network-one-host.xml | 12 +-- tests/networkxml2xmlupdateout/nat-network.xml | 12 +-- .../dhcp6-nat-network.expect.xml | 6 +- .../nat-network-dns-forward-plain.expect.xml | 3 +- ...network-dns-forwarder-no-resolv.expect.xml | 3 +- .../nat-network-dns-forwarders.expect.xml | 3 +- .../nat-network-dns-hosts.expect.xml | 3 +- .../nat-network-dns-local-domain.expect.xml | 3 +- ...-network-dns-srv-record-minimal.expect.xml | 12 +-- .../nat-network-dns-srv-record.expect.xml | 12 +-- .../nat-network-dns-srv-records.expect.xml | 12 +-- .../nat-network-dns-txt-record.expect.xml | 12 +-- .../nat-network-explicit-flood.expect.xml | 12 +-- ...nat-network-forward-nat-address.expect.xml | 12 +-- .../nat-network-forward-nat-ipv6.expect.xml | 3 +- ...-network-forward-nat-no-address.expect.xml | 12 +-- .../nat-network-mtu.expect.xml | 12 +-- .../nat-network-name-with-quotes.expect.xml | 12 +-- .../networkxmlconfdata/nat-network.expect.xml | 12 +-- .../open-network.expect.xml | 3 +- .../ptr-domains-auto.expect.xml | 12 +-- .../routed-network-no-dns.expect.xml | 3 +- .../routed-network.expect.xml | 3 +- 37 files changed, 141 insertions(+), 253 deletions(-) diff --git a/src/conf/network_conf.c b/src/conf/network_conf.c index 26887342e4..17ef1c2a08 100644 --- a/src/conf/network_conf.c +++ b/src/conf/network_conf.c @@ -2065,40 +2065,40 @@ static int virNetworkIPDefFormat(virBuffer *buf, const virNetworkIPDef *def) { - virBufferAddLit(buf, "family) - virBufferAsprintf(buf, " family=3D'%s'", def->family); + virBufferAsprintf(&ipAttrBuf, " family=3D'%s'", def->family); if (VIR_SOCKET_ADDR_VALID(&def->address)) { g_autofree char *addr =3D virSocketAddrFormat(&def->address); if (!addr) return -1; - virBufferAsprintf(buf, " address=3D'%s'", addr); + virBufferAsprintf(&ipAttrBuf, " address=3D'%s'", addr); } if (VIR_SOCKET_ADDR_VALID(&def->netmask)) { g_autofree char *addr =3D virSocketAddrFormat(&def->netmask); if (!addr) return -1; - virBufferAsprintf(buf, " netmask=3D'%s'", addr); + virBufferAsprintf(&ipAttrBuf, " netmask=3D'%s'", addr); } if (def->prefix > 0) - virBufferAsprintf(buf, " prefix=3D'%u'", def->prefix); + virBufferAsprintf(&ipAttrBuf, " prefix=3D'%u'", def->prefix); =20 if (def->localPTR) { - virBufferAsprintf(buf, " localPtr=3D'%s'", + virBufferAsprintf(&ipAttrBuf, " localPtr=3D'%s'", virTristateBoolTypeToString(def->localPTR)); } =20 - virBufferAddLit(buf, ">\n"); - virBufferAdjustIndent(buf, 2); - virBufferEscapeString(buf, "\n", + virBufferEscapeString(&ipChildBuf, "\n", def->tftproot); if ((def->nranges || def->nhosts)) { + virBuffer dhcpChildBuf =3D VIR_BUFFER_INIT_CHILD(&ipChildBuf); size_t i; - virBufferAddLit(buf, "\n"); - virBufferAdjustIndent(buf, 2); =20 for (i =3D 0; i < def->nranges; i++) { + virBuffer rangeAttrBuf =3D VIR_BUFFER_INITIALIZER; + virBuffer rangeChildBuf =3D VIR_BUFFER_INIT_CHILD(&dhcpChildBu= f); virSocketAddrRange addr =3D def->ranges[i].addr; virNetworkDHCPLeaseTimeDef *lease =3D def->ranges[i].lease; g_autofree char *saddr =3D NULL; @@ -2110,75 +2110,69 @@ virNetworkIPDefFormat(virBuffer *buf, if (!(eaddr =3D virSocketAddrFormat(&addr.end))) return -1; =20 - virBufferAsprintf(buf, "\n"); - virBufferAdjustIndent(buf, 2); if (!lease->expiry) { - virBufferAddLit(buf, "\n"); + virBufferAddLit(&rangeChildBuf, "= \n"); } else { - virBufferAsprintf(buf, "\n", + virBufferAsprintf(&rangeChildBuf, "\n", lease->expiry, virNetworkDHCPLeaseTimeUnitTypeToStr= ing(lease->unit)); } - virBufferAdjustIndent(buf, -2); - virBufferAddLit(buf, "\n"); - } else { - virBufferAddLit(buf, "/>\n"); } + + virXMLFormatElement(&dhcpChildBuf, "range", &rangeAttrBuf, &ra= ngeChildBuf); } for (i =3D 0; i < def->nhosts; i++) { + virBuffer hostAttrBuf =3D VIR_BUFFER_INITIALIZER; + virBuffer hostChildBuf =3D VIR_BUFFER_INIT_CHILD(&dhcpChildBuf= ); virNetworkDHCPLeaseTimeDef *lease =3D def->hosts[i].lease; - virBufferAddLit(buf, "hosts[i].mac) - virBufferAsprintf(buf, " mac=3D'%s'", def->hosts[i].mac); + virBufferAsprintf(&hostAttrBuf, " mac=3D'%s'", def->hosts[= i].mac); if (def->hosts[i].id) - virBufferAsprintf(buf, " id=3D'%s'", def->hosts[i].id); + virBufferAsprintf(&hostAttrBuf, " id=3D'%s'", def->hosts[i= ].id); if (def->hosts[i].name) - virBufferAsprintf(buf, " name=3D'%s'", def->hosts[i].name); + virBufferAsprintf(&hostAttrBuf, " name=3D'%s'", def->hosts= [i].name); if (VIR_SOCKET_ADDR_VALID(&def->hosts[i].ip)) { g_autofree char *ipaddr =3D virSocketAddrFormat(&def->host= s[i].ip); if (!ipaddr) return -1; =20 - virBufferAsprintf(buf, " ip=3D'%s'", ipaddr); + virBufferAsprintf(&hostAttrBuf, " ip=3D'%s'", ipaddr); } if (lease) { - virBufferAddLit(buf, ">\n"); - virBufferAdjustIndent(buf, 2); if (!lease->expiry) { - virBufferAddLit(buf, "\n"); + virBufferAddLit(&hostChildBuf, "\= n"); } else { - virBufferAsprintf(buf, "\n", + virBufferAsprintf(&hostChildBuf, "\n", lease->expiry, virNetworkDHCPLeaseTimeUnitTypeToStr= ing(lease->unit)); } - virBufferAdjustIndent(buf, -2); - virBufferAddLit(buf, "\n"); - } else { - virBufferAddLit(buf, "/>\n"); } + + virXMLFormatElement(&dhcpChildBuf, "host", &hostAttrBuf, &host= ChildBuf); } if (def->bootfile) { - virBufferEscapeString(buf, "bootfile); + virBuffer bootpAttrBuf =3D VIR_BUFFER_INITIALIZER; + + virBufferEscapeString(&bootpAttrBuf, " file=3D'%s'", def->boot= file); if (VIR_SOCKET_ADDR_VALID(&def->bootserver)) { g_autofree char *ipaddr =3D virSocketAddrFormat(&def->boot= server); if (!ipaddr) return -1; =20 - virBufferEscapeString(buf, " server=3D'%s'", ipaddr); + virBufferEscapeString(&bootpAttrBuf, " server=3D'%s'", ipa= ddr); } - virBufferAddLit(buf, "/>\n"); =20 + virXMLFormatElement(&dhcpChildBuf, "bootp", &bootpAttrBuf, NUL= L); } - virBufferAdjustIndent(buf, -2); - virBufferAddLit(buf, "\n"); + + virXMLFormatElement(&ipChildBuf, "dhcp", NULL, &dhcpChildBuf); } =20 - virBufferAdjustIndent(buf, -2); - virBufferAddLit(buf, "\n"); + virXMLFormatElement(buf, "ip", &ipAttrBuf, &ipChildBuf); =20 return 0; } diff --git a/tests/networkxml2xmlupdateout/nat-network-dns-hosts-modified.x= ml b/tests/networkxml2xmlupdateout/nat-network-dns-hosts-modified.xml index 3183671376..1a334e77d2 100644 --- a/tests/networkxml2xmlupdateout/nat-network-dns-hosts-modified.xml +++ b/tests/networkxml2xmlupdateout/nat-network-dns-hosts-modified.xml @@ -24,6 +24,5 @@ names - - + diff --git a/tests/networkxml2xmlupdateout/nat-network-dns-more-hosts.xml b= /tests/networkxml2xmlupdateout/nat-network-dns-more-hosts.xml index 21e4ebde5f..5fb300061d 100644 --- a/tests/networkxml2xmlupdateout/nat-network-dns-more-hosts.xml +++ b/tests/networkxml2xmlupdateout/nat-network-dns-more-hosts.xml @@ -26,6 +26,5 @@ names - - + diff --git a/tests/networkxml2xmlupdateout/nat-network-dns-srv-record.xml b= /tests/networkxml2xmlupdateout/nat-network-dns-srv-record.xml index 3dd19e6698..cca69213a1 100644 --- a/tests/networkxml2xmlupdateout/nat-network-dns-srv-record.xml +++ b/tests/networkxml2xmlupdateout/nat-network-dns-srv-record.xml @@ -15,12 +15,8 @@ - - - - - - - - + + + + diff --git a/tests/networkxml2xmlupdateout/nat-network-dns-srv-records.xml = b/tests/networkxml2xmlupdateout/nat-network-dns-srv-records.xml index 2bdd9321ff..e643323a9d 100644 --- a/tests/networkxml2xmlupdateout/nat-network-dns-srv-records.xml +++ b/tests/networkxml2xmlupdateout/nat-network-dns-srv-records.xml @@ -22,12 +22,8 @@ - - - - - - - - + + + + diff --git a/tests/networkxml2xmlupdateout/nat-network-dns-txt-modify-ok.xm= l b/tests/networkxml2xmlupdateout/nat-network-dns-txt-modify-ok.xml index 4b4dda094a..03861b9d6a 100644 --- a/tests/networkxml2xmlupdateout/nat-network-dns-txt-modify-ok.xml +++ b/tests/networkxml2xmlupdateout/nat-network-dns-txt-modify-ok.xml @@ -15,12 +15,8 @@ - - - - - - - - + + + + diff --git a/tests/networkxml2xmlupdateout/nat-network-dns-txt-none.xml b/t= ests/networkxml2xmlupdateout/nat-network-dns-txt-none.xml index 93bc7db51d..3f1da54ed8 100644 --- a/tests/networkxml2xmlupdateout/nat-network-dns-txt-none.xml +++ b/tests/networkxml2xmlupdateout/nat-network-dns-txt-none.xml @@ -12,12 +12,8 @@ - - - - - - - - + + + + diff --git a/tests/networkxml2xmlupdateout/nat-network-dns-txt-records.xml = b/tests/networkxml2xmlupdateout/nat-network-dns-txt-records.xml index 63254d2d88..99090d45c9 100644 --- a/tests/networkxml2xmlupdateout/nat-network-dns-txt-records.xml +++ b/tests/networkxml2xmlupdateout/nat-network-dns-txt-records.xml @@ -16,12 +16,8 @@ - - - - - - - - + + + + diff --git a/tests/networkxml2xmlupdateout/nat-network-forward-ifaces.xml b= /tests/networkxml2xmlupdateout/nat-network-forward-ifaces.xml index 13d1fdfa6d..7b3001e287 100644 --- a/tests/networkxml2xmlupdateout/nat-network-forward-ifaces.xml +++ b/tests/networkxml2xmlupdateout/nat-network-forward-ifaces.xml @@ -22,12 +22,8 @@ - - - - - - - - + + + + diff --git a/tests/networkxml2xmlupdateout/nat-network-host-updated.xml b/t= ests/networkxml2xmlupdateout/nat-network-host-updated.xml index 816ab3835d..d325f8a6ab 100644 --- a/tests/networkxml2xmlupdateout/nat-network-host-updated.xml +++ b/tests/networkxml2xmlupdateout/nat-network-host-updated.xml @@ -12,12 +12,8 @@ - - - - - - - - + + + + diff --git a/tests/networkxml2xmlupdateout/nat-network-hosts.xml b/tests/ne= tworkxml2xmlupdateout/nat-network-hosts.xml index eb7acd7083..e05ae29151 100644 --- a/tests/networkxml2xmlupdateout/nat-network-hosts.xml +++ b/tests/networkxml2xmlupdateout/nat-network-hosts.xml @@ -13,12 +13,8 @@ - - - - - - - - + + + + diff --git a/tests/networkxml2xmlupdateout/nat-network-no-forward-ifaces.xm= l b/tests/networkxml2xmlupdateout/nat-network-no-forward-ifaces.xml index 79c97a508f..30019b3db3 100644 --- a/tests/networkxml2xmlupdateout/nat-network-no-forward-ifaces.xml +++ b/tests/networkxml2xmlupdateout/nat-network-no-forward-ifaces.xml @@ -19,12 +19,8 @@ - - - - - - - - + + + + diff --git a/tests/networkxml2xmlupdateout/nat-network-no-hosts.xml b/tests= /networkxml2xmlupdateout/nat-network-no-hosts.xml index e3c88ff534..d44e940dee 100644 --- a/tests/networkxml2xmlupdateout/nat-network-no-hosts.xml +++ b/tests/networkxml2xmlupdateout/nat-network-no-hosts.xml @@ -19,6 +19,5 @@ names - - + diff --git a/tests/networkxml2xmlupdateout/nat-network-no-range.xml b/tests= /networkxml2xmlupdateout/nat-network-no-range.xml index 7128783cbe..66c1e6cca0 100644 --- a/tests/networkxml2xmlupdateout/nat-network-no-range.xml +++ b/tests/networkxml2xmlupdateout/nat-network-no-range.xml @@ -11,12 +11,8 @@ - - - - - - - - + + + + diff --git a/tests/networkxml2xmlupdateout/nat-network-one-host.xml b/tests= /networkxml2xmlupdateout/nat-network-one-host.xml index 62778e4c5f..38ba109a6e 100644 --- a/tests/networkxml2xmlupdateout/nat-network-one-host.xml +++ b/tests/networkxml2xmlupdateout/nat-network-one-host.xml @@ -11,12 +11,8 @@ - - - - - - - - + + + + diff --git a/tests/networkxml2xmlupdateout/nat-network.xml b/tests/networkx= ml2xmlupdateout/nat-network.xml index 741352ef14..ebcb7477e0 100644 --- a/tests/networkxml2xmlupdateout/nat-network.xml +++ b/tests/networkxml2xmlupdateout/nat-network.xml @@ -20,12 +20,8 @@ - - - - - - - - + + + + diff --git a/tests/networkxmlconfdata/dhcp6-nat-network.expect.xml b/tests/= networkxmlconfdata/dhcp6-nat-network.expect.xml index 44bb2d1f5d..20b795ec89 100644 --- a/tests/networkxmlconfdata/dhcp6-nat-network.expect.xml +++ b/tests/networkxmlconfdata/dhcp6-nat-network.expect.xml @@ -13,8 +13,7 @@ - - + @@ -25,6 +24,5 @@ - - + diff --git a/tests/networkxmlconfdata/nat-network-dns-forward-plain.expect.= xml b/tests/networkxmlconfdata/nat-network-dns-forward-plain.expect.xml index 76e0f926a9..f87c09e0bd 100644 --- a/tests/networkxmlconfdata/nat-network-dns-forward-plain.expect.xml +++ b/tests/networkxmlconfdata/nat-network-dns-forward-plain.expect.xml @@ -7,6 +7,5 @@ - - + diff --git a/tests/networkxmlconfdata/nat-network-dns-forwarder-no-resolv.e= xpect.xml b/tests/networkxmlconfdata/nat-network-dns-forwarder-no-resolv.ex= pect.xml index ab2800331c..0ae5154416 100644 --- a/tests/networkxmlconfdata/nat-network-dns-forwarder-no-resolv.expect.x= ml +++ b/tests/networkxmlconfdata/nat-network-dns-forwarder-no-resolv.expect.x= ml @@ -7,6 +7,5 @@ - - + diff --git a/tests/networkxmlconfdata/nat-network-dns-forwarders.expect.xml= b/tests/networkxmlconfdata/nat-network-dns-forwarders.expect.xml index ee8ba7b1dd..dd117fb9b0 100644 --- a/tests/networkxmlconfdata/nat-network-dns-forwarders.expect.xml +++ b/tests/networkxmlconfdata/nat-network-dns-forwarders.expect.xml @@ -13,6 +13,5 @@ - - + diff --git a/tests/networkxmlconfdata/nat-network-dns-hosts.expect.xml b/te= sts/networkxmlconfdata/nat-network-dns-hosts.expect.xml index f8a609f9cb..a231ea6309 100644 --- a/tests/networkxmlconfdata/nat-network-dns-hosts.expect.xml +++ b/tests/networkxmlconfdata/nat-network-dns-hosts.expect.xml @@ -24,6 +24,5 @@ names - - + diff --git a/tests/networkxmlconfdata/nat-network-dns-local-domain.expect.x= ml b/tests/networkxmlconfdata/nat-network-dns-local-domain.expect.xml index 33f4bbfc32..7b05cb09b0 100644 --- a/tests/networkxmlconfdata/nat-network-dns-local-domain.expect.xml +++ b/tests/networkxmlconfdata/nat-network-dns-local-domain.expect.xml @@ -7,6 +7,5 @@ - - + diff --git a/tests/networkxmlconfdata/nat-network-dns-srv-record-minimal.ex= pect.xml b/tests/networkxmlconfdata/nat-network-dns-srv-record-minimal.expe= ct.xml index 16032c9af2..559d826c16 100644 --- a/tests/networkxmlconfdata/nat-network-dns-srv-record-minimal.expect.xml +++ b/tests/networkxmlconfdata/nat-network-dns-srv-record-minimal.expect.xml @@ -16,12 +16,8 @@ - - - - - - - - + + + + diff --git a/tests/networkxmlconfdata/nat-network-dns-srv-record.expect.xml= b/tests/networkxmlconfdata/nat-network-dns-srv-record.expect.xml index 0f54a72f95..589c715353 100644 --- a/tests/networkxmlconfdata/nat-network-dns-srv-record.expect.xml +++ b/tests/networkxmlconfdata/nat-network-dns-srv-record.expect.xml @@ -22,12 +22,8 @@ - - - - - - - - + + + + diff --git a/tests/networkxmlconfdata/nat-network-dns-srv-records.expect.xm= l b/tests/networkxmlconfdata/nat-network-dns-srv-records.expect.xml index 26b802e1eb..a8e064854d 100644 --- a/tests/networkxmlconfdata/nat-network-dns-srv-records.expect.xml +++ b/tests/networkxmlconfdata/nat-network-dns-srv-records.expect.xml @@ -17,12 +17,8 @@ - - - - - - - - + + + + diff --git a/tests/networkxmlconfdata/nat-network-dns-txt-record.expect.xml= b/tests/networkxmlconfdata/nat-network-dns-txt-record.expect.xml index cba7e9d1f8..4d35e36b5e 100644 --- a/tests/networkxmlconfdata/nat-network-dns-txt-record.expect.xml +++ b/tests/networkxmlconfdata/nat-network-dns-txt-record.expect.xml @@ -16,12 +16,8 @@ - - - - - - - - + + + + diff --git a/tests/networkxmlconfdata/nat-network-explicit-flood.expect.xml= b/tests/networkxmlconfdata/nat-network-explicit-flood.expect.xml index c039955543..15950c017b 100644 --- a/tests/networkxmlconfdata/nat-network-explicit-flood.expect.xml +++ b/tests/networkxmlconfdata/nat-network-explicit-flood.expect.xml @@ -13,12 +13,8 @@ - - - - - - - - + + + + diff --git a/tests/networkxmlconfdata/nat-network-forward-nat-address.expec= t.xml b/tests/networkxmlconfdata/nat-network-forward-nat-address.expect.xml index e3276ac338..af1df7dc2d 100644 --- a/tests/networkxmlconfdata/nat-network-forward-nat-address.expect.xml +++ b/tests/networkxmlconfdata/nat-network-forward-nat-address.expect.xml @@ -17,12 +17,8 @@ - - - - - - - - + + + + diff --git a/tests/networkxmlconfdata/nat-network-forward-nat-ipv6.expect.x= ml b/tests/networkxmlconfdata/nat-network-forward-nat-ipv6.expect.xml index 642929cc8d..e42939318f 100644 --- a/tests/networkxmlconfdata/nat-network-forward-nat-ipv6.expect.xml +++ b/tests/networkxmlconfdata/nat-network-forward-nat-ipv6.expect.xml @@ -6,6 +6,5 @@ - - + diff --git a/tests/networkxmlconfdata/nat-network-forward-nat-no-address.ex= pect.xml b/tests/networkxmlconfdata/nat-network-forward-nat-no-address.expe= ct.xml index 77fc0b5324..c29debdd30 100644 --- a/tests/networkxmlconfdata/nat-network-forward-nat-no-address.expect.xml +++ b/tests/networkxmlconfdata/nat-network-forward-nat-no-address.expect.xml @@ -16,12 +16,8 @@ - - - - - - - - + + + + diff --git a/tests/networkxmlconfdata/nat-network-mtu.expect.xml b/tests/ne= tworkxmlconfdata/nat-network-mtu.expect.xml index 97044c70ec..1865cd0ea3 100644 --- a/tests/networkxmlconfdata/nat-network-mtu.expect.xml +++ b/tests/networkxmlconfdata/nat-network-mtu.expect.xml @@ -14,12 +14,8 @@ - - - - - - - - + + + + diff --git a/tests/networkxmlconfdata/nat-network-name-with-quotes.expect.x= ml b/tests/networkxmlconfdata/nat-network-name-with-quotes.expect.xml index c0a9cedc7d..c1f5fee466 100644 --- a/tests/networkxmlconfdata/nat-network-name-with-quotes.expect.xml +++ b/tests/networkxmlconfdata/nat-network-name-with-quotes.expect.xml @@ -16,12 +16,8 @@ - - - - - - - - + + + + diff --git a/tests/networkxmlconfdata/nat-network.expect.xml b/tests/networ= kxmlconfdata/nat-network.expect.xml index 9d3757f0e0..da274e0682 100644 --- a/tests/networkxmlconfdata/nat-network.expect.xml +++ b/tests/networkxmlconfdata/nat-network.expect.xml @@ -13,12 +13,8 @@ - - - - - - - - + + + + diff --git a/tests/networkxmlconfdata/open-network.expect.xml b/tests/netwo= rkxmlconfdata/open-network.expect.xml index 29e968442b..a4842f6688 100644 --- a/tests/networkxmlconfdata/open-network.expect.xml +++ b/tests/networkxmlconfdata/open-network.expect.xml @@ -4,6 +4,5 @@ - - + diff --git a/tests/networkxmlconfdata/ptr-domains-auto.expect.xml b/tests/n= etworkxmlconfdata/ptr-domains-auto.expect.xml index fe2047b708..3653852adb 100644 --- a/tests/networkxmlconfdata/ptr-domains-auto.expect.xml +++ b/tests/networkxmlconfdata/ptr-domains-auto.expect.xml @@ -13,12 +13,8 @@ - - - - - - - - + + + + diff --git a/tests/networkxmlconfdata/routed-network-no-dns.expect.xml b/te= sts/networkxmlconfdata/routed-network-no-dns.expect.xml index f68ce8a941..eeec0563ae 100644 --- a/tests/networkxmlconfdata/routed-network-no-dns.expect.xml +++ b/tests/networkxmlconfdata/routed-network-no-dns.expect.xml @@ -7,6 +7,5 @@ - - + diff --git a/tests/networkxmlconfdata/routed-network.expect.xml b/tests/net= workxmlconfdata/routed-network.expect.xml index 2e13cf4ffa..92e94ac83f 100644 --- a/tests/networkxmlconfdata/routed-network.expect.xml +++ b/tests/networkxmlconfdata/routed-network.expect.xml @@ -6,6 +6,5 @@ - - + --=20 2.52.0