From nobody Mon Feb 2 07:31:22 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=1769612249; cv=none; d=zohomail.com; s=zohoarc; b=NMNb9Z2/GXhr1ZBGZWq2iVMleu1+mnZjNfMybzVK0GN6AsTmVyzCw4rWMc9LZLCq/czBnXkFrqQfFqtoG2LgPdif7wKoZPlPzWq4KXd3LQdMoFNNHraz5Q2RRLCoc4iaHdu23cgCRv84t38spWOfEeStrnuC51Opk5seJDHwTC0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1769612249; 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=6yYoHiD+iq80okkkgBqi+IvVxkSBoC7j1fFIhJ2bBuQ=; b=aqdjGnNcTjM0hvnYxgVi8vQGnphft/uZ07Qz8i5bUANCkoHkrowRrkZhgW0A6jC3exPepSLKHYdxs4aNFE9qqhIhSDcpEMnj5Br0nhYYv4jXxkGSO4NNWmnuLLPINUvfPicPm4P2IaxT2l3HsQYllt0oaIArKyw8LlEljA9ZQq0= 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 1769612249121987.5607972774608; Wed, 28 Jan 2026 06:57:29 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 993) id E84F73F89F; Wed, 28 Jan 2026 09:57:27 -0500 (EST) Received: from [172.19.199.3] (lists.libvirt.org [8.43.85.245]) by lists.libvirt.org (Postfix) with ESMTP id 85841441FD; Wed, 28 Jan 2026 09:39:00 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 993) id 20959418F3; Wed, 28 Jan 2026 09:38:54 -0500 (EST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.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 B8CE343F1B for ; Wed, 28 Jan 2026 09:31:11 -0500 (EST) Received: from mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-537-gUfeTDTnNGu2ljtEeqOe4Q-1; Wed, 28 Jan 2026 09:31:07 -0500 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-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 244C318005AD for ; Wed, 28 Jan 2026 14:31:07 +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 7B69E195419A for ; Wed, 28 Jan 2026 14:31:06 +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=-5.0 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,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=1769610671; 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=6yYoHiD+iq80okkkgBqi+IvVxkSBoC7j1fFIhJ2bBuQ=; b=LC6n7qHPNeKoLACnO9YvzkVMn2RC3xPha2VesggQWnmFuc8hMtWzh+ghYFhqnkqPhzDtCQ AQIvnAPgcpYi6MGU6LUftdg9eEoGeihHcZ70b5uMCZq/89hdGBE0BCItyDDe1j163FzmZM ioJxtth7HL74ul5nIaX1kkhIKdUmCq0= X-MC-Unique: gUfeTDTnNGu2ljtEeqOe4Q-1 X-Mimecast-MFC-AGG-ID: gUfeTDTnNGu2ljtEeqOe4Q_1769610667 To: devel@lists.libvirt.org Subject: [PATCH 20/20] tests: Rename networkxml2xmltest to networkxmlconftest Date: Wed, 28 Jan 2026 15:30:41 +0100 Message-ID: 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: d9jTp8NHMBwrXA8E4etGxVGpAR7IbpkKNcgPxa2cghI_1769610667 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: TKPVUIAM6ZOB7TZXPUPEJA3KDEO4M65B X-Message-ID-Hash: TKPVUIAM6ZOB7TZXPUPEJA3KDEO4M65B 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: 1769612251521158500 Content-Type: text/plain; charset="utf-8"; x-default="true" From: Michal Privoznik Now that networkxml2xmltest does both XML -> XML and XML -> conf tests its name became misleading. Rename it to networkxmlconftest and move its data into networkxmlconfdata/ dir. Signed-off-by: Michal Privoznik --- src/network/bridge_driver.c | 2 +- tests/meson.build | 2 +- .../dhcp6host-routed-network.xml | 22 ------------- .../networkxml2confdata/isolated-network.xml | 11 ------- .../nat-network-dns-forwarders.xml | 15 --------- .../nat-network-dns-hosts.xml | 15 --------- tests/networkxml2confdata/nat-network-mtu.xml | 22 ------------- tests/networkxml2confdata/nat-network.xml | 21 ------------ tests/networkxml2confdata/netboot-network.xml | 14 -------- .../netboot-proxy-network.xml | 13 -------- tests/networkxml2confdata/open-network.xml | 9 ------ tests/networkxml2confdata/routed-network.xml | 9 ------ tests/networkxml2xmlin/dhcp6-nat-network.xml | 27 ---------------- tests/networkxml2xmlin/dhcp6-network.xml | 17 ---------- tests/networkxml2xmlin/dnsmasq-options.xml | 15 --------- tests/networkxml2xmlin/leasetime-hours.xml | 1 - tests/networkxml2xmlin/leasetime-infinite.xml | 1 - tests/networkxml2xmlin/leasetime-minutes.xml | 1 - tests/networkxml2xmlin/leasetime-seconds.xml | 1 - .../nat-network-dns-forward-plain.xml | 9 ------ .../nat-network-dns-forwarder-no-resolv.xml | 11 ------- .../nat-network-dns-local-domain.xml | 9 ------ .../nat-network-dns-srv-record-minimal.xml | 26 --------------- .../nat-network-dns-srv-record.xml | 32 ------------------- .../nat-network-dns-txt-record.xml | 24 -------------- .../nat-network-name-with-quotes.xml | 26 --------------- tests/networkxml2xmlin/netboot-tftp.xml | 1 - tests/networkxml2xmlin/ptr-domains-auto.xml | 21 ------------ tests/networkxml2xmlout/leasetime-hours.xml | 1 - .../networkxml2xmlout/leasetime-infinite.xml | 1 - tests/networkxml2xmlout/leasetime-minutes.xml | 1 - tests/networkxml2xmlout/leasetime-seconds.xml | 1 - tests/networkxml2xmlout/netboot-tftp.xml | 1 - tests/networkxml2xmlupdatetest.c | 2 +- .../8021Qbh-net.expect.xml} | 0 .../8021Qbh-net.xml | 0 .../bandwidth-network.conf | 0 .../bandwidth-network.expect.xml} | 0 .../bandwidth-network.xml | 0 .../dhcp6-nat-network.conf | 0 .../dhcp6-nat-network.expect.xml} | 0 .../dhcp6-nat-network.hostsfile | 0 .../dhcp6-nat-network.xml | 0 .../dhcp6-network.conf | 0 .../dhcp6-network.expect.xml} | 0 .../dhcp6-network.hostsfile | 0 .../dhcp6-network.xml | 0 .../dhcp6host-routed-network.conf | 0 .../dhcp6host-routed-network.expect.xml} | 0 .../dhcp6host-routed-network.hostsfile | 0 .../dhcp6host-routed-network.xml | 0 .../direct-net.expect.xml} | 0 .../direct-net.xml | 0 .../dnsmasq-options.conf | 0 .../dnsmasq-options.expect.xml} | 0 .../dnsmasq-options.xml | 0 .../empty-allow-ipv6.expect.xml} | 0 .../empty-allow-ipv6.xml | 0 .../host-bridge-net.expect.xml} | 0 .../host-bridge-net.xml | 0 .../host-bridge-no-flood.expect.xml} | 0 .../host-bridge-no-flood.xml | 0 .../hostdev-duplicate.xml | 0 .../hostdev-pf-driver-model.expect.xml} | 0 .../hostdev-pf-driver-model.xml | 0 .../hostdev-pf.expect.xml} | 0 .../hostdev-pf.xml | 0 .../hostdev.expect.xml} | 0 .../hostdev.xml | 0 .../isolated-network.conf | 0 .../isolated-network.expect.xml} | 0 .../isolated-network.xml | 0 .../isolated-ports.expect.xml} | 0 .../isolated-ports.xml | 0 .../leasetime-hours.conf | 0 .../leasetime-hours.expect.xml | 1 + .../leasetime-hours.hostsfile | 0 .../leasetime-hours.xml | 0 .../leasetime-infinite.conf | 0 .../leasetime-infinite.expect.xml | 1 + .../leasetime-infinite.hostsfile | 0 .../leasetime-infinite.xml | 0 .../leasetime-minutes.conf | 0 .../leasetime-minutes.expect.xml | 1 + .../leasetime-minutes.hostsfile | 0 .../leasetime-minutes.xml | 0 .../leasetime-seconds.conf | 0 .../leasetime-seconds.expect.xml | 1 + .../leasetime-seconds.hostsfile | 0 .../leasetime-seconds.xml | 0 .../metadata.expect.xml} | 0 .../metadata.xml | 0 .../nat-network-dns-forward-plain.conf | 0 .../nat-network-dns-forward-plain.expect.xml} | 0 .../nat-network-dns-forward-plain.xml | 0 .../nat-network-dns-forwarder-no-resolv.conf | 0 ...etwork-dns-forwarder-no-resolv.expect.xml} | 0 .../nat-network-dns-forwarder-no-resolv.xml | 0 .../nat-network-dns-forwarders.conf | 0 .../nat-network-dns-forwarders.expect.xml} | 0 .../nat-network-dns-forwarders.xml | 0 .../nat-network-dns-hosts.conf | 0 .../nat-network-dns-hosts.expect.xml} | 0 .../nat-network-dns-hosts.xml | 0 .../nat-network-dns-local-domain.conf | 0 .../nat-network-dns-local-domain.expect.xml} | 0 .../nat-network-dns-local-domain.xml | 0 .../nat-network-dns-srv-record-minimal.conf | 0 ...network-dns-srv-record-minimal.expect.xml} | 0 ...t-network-dns-srv-record-minimal.hostsfile | 0 .../nat-network-dns-srv-record-minimal.xml | 0 .../nat-network-dns-srv-record.conf | 0 .../nat-network-dns-srv-record.expect.xml} | 0 .../nat-network-dns-srv-record.hostsfile | 0 .../nat-network-dns-srv-record.xml | 0 .../nat-network-dns-srv-records.conf | 0 .../nat-network-dns-srv-records.expect.xml} | 0 .../nat-network-dns-srv-records.hostsfile | 0 .../nat-network-dns-srv-records.xml | 0 .../nat-network-dns-txt-record.conf | 0 .../nat-network-dns-txt-record.expect.xml} | 0 .../nat-network-dns-txt-record.hostsfile | 0 .../nat-network-dns-txt-record.xml | 0 .../nat-network-explicit-flood.conf | 0 .../nat-network-explicit-flood.expect.xml} | 0 .../nat-network-explicit-flood.hostsfile | 0 .../nat-network-explicit-flood.xml | 0 .../nat-network-forward-nat-address.conf | 0 ...at-network-forward-nat-address.expect.xml} | 0 .../nat-network-forward-nat-address.hostsfile | 0 .../nat-network-forward-nat-address.xml | 0 .../nat-network-forward-nat-ipv6.conf | 0 .../nat-network-forward-nat-ipv6.expect.xml} | 0 .../nat-network-forward-nat-ipv6.xml | 0 .../nat-network-forward-nat-no-address.conf | 0 ...network-forward-nat-no-address.expect.xml} | 0 ...t-network-forward-nat-no-address.hostsfile | 0 .../nat-network-forward-nat-no-address.xml | 0 .../nat-network-mtu.conf | 0 .../nat-network-mtu.expect.xml} | 0 .../nat-network-mtu.hostsfile | 0 .../nat-network-mtu.xml | 0 .../nat-network-name-with-quotes.conf | 0 .../nat-network-name-with-quotes.expect.xml} | 0 .../nat-network-name-with-quotes.hostsfile | 0 .../nat-network-name-with-quotes.xml | 0 .../nat-network.conf | 0 .../nat-network.expect.xml} | 0 .../nat-network.hostsfile | 0 .../nat-network.xml | 0 .../netboot-network.conf | 0 .../netboot-network.expect.xml} | 0 .../netboot-network.xml | 0 .../netboot-proxy-network.conf | 0 .../netboot-proxy-network.expect.xml} | 0 .../netboot-proxy-network.xml | 0 .../netboot-tftp.conf | 0 .../netboot-tftp.expect.xml | 1 + .../netboot-tftp.xml | 0 .../open-network-with-forward-dev.xml | 0 .../open-network.conf | 0 .../open-network.expect.xml} | 0 .../open-network.xml | 0 .../openvswitch-net.expect.xml} | 0 .../openvswitch-net.xml | 0 .../passthrough-address-crash.xml | 0 .../passthrough-duplicate.xml | 0 .../passthrough-pf.conf | 0 .../passthrough-pf.xml | 0 .../ptr-domains-auto.conf | 0 .../ptr-domains-auto.expect.xml} | 0 .../ptr-domains-auto.hostsfile | 0 .../ptr-domains-auto.xml | 0 .../routed-network-no-dns-extra-elements.xml | 0 .../routed-network-no-dns.expect.xml} | 0 .../routed-network-no-dns.xml | 0 .../routed-network.conf | 0 .../routed-network.expect.xml} | 0 .../routed-network.xml | 0 .../set-mtu.conf | 0 .../set-mtu.expect.xml} | 0 .../set-mtu.xml | 0 .../vepa-net.expect.xml} | 0 .../vepa-net.xml | 0 ...workxml2xmltest.c =3D> networkxmlconftest.c} | 9 +++--- tests/qemuxmlconftest.c | 6 ++-- tests/virschematest.c | 4 +-- 187 files changed, 16 insertions(+), 392 deletions(-) delete mode 100644 tests/networkxml2confdata/dhcp6host-routed-network.xml delete mode 100644 tests/networkxml2confdata/isolated-network.xml delete mode 100644 tests/networkxml2confdata/nat-network-dns-forwarders.xml delete mode 100644 tests/networkxml2confdata/nat-network-dns-hosts.xml delete mode 100644 tests/networkxml2confdata/nat-network-mtu.xml delete mode 100644 tests/networkxml2confdata/nat-network.xml delete mode 100644 tests/networkxml2confdata/netboot-network.xml delete mode 100644 tests/networkxml2confdata/netboot-proxy-network.xml delete mode 100644 tests/networkxml2confdata/open-network.xml delete mode 100644 tests/networkxml2confdata/routed-network.xml delete mode 100644 tests/networkxml2xmlin/dhcp6-nat-network.xml delete mode 100644 tests/networkxml2xmlin/dhcp6-network.xml delete mode 100644 tests/networkxml2xmlin/dnsmasq-options.xml delete mode 120000 tests/networkxml2xmlin/leasetime-hours.xml delete mode 120000 tests/networkxml2xmlin/leasetime-infinite.xml delete mode 120000 tests/networkxml2xmlin/leasetime-minutes.xml delete mode 120000 tests/networkxml2xmlin/leasetime-seconds.xml delete mode 100644 tests/networkxml2xmlin/nat-network-dns-forward-plain.xml delete mode 100644 tests/networkxml2xmlin/nat-network-dns-forwarder-no-res= olv.xml delete mode 100644 tests/networkxml2xmlin/nat-network-dns-local-domain.xml delete mode 100644 tests/networkxml2xmlin/nat-network-dns-srv-record-minim= al.xml delete mode 100644 tests/networkxml2xmlin/nat-network-dns-srv-record.xml delete mode 100644 tests/networkxml2xmlin/nat-network-dns-txt-record.xml delete mode 100644 tests/networkxml2xmlin/nat-network-name-with-quotes.xml delete mode 120000 tests/networkxml2xmlin/netboot-tftp.xml delete mode 100644 tests/networkxml2xmlin/ptr-domains-auto.xml delete mode 120000 tests/networkxml2xmlout/leasetime-hours.xml delete mode 120000 tests/networkxml2xmlout/leasetime-infinite.xml delete mode 120000 tests/networkxml2xmlout/leasetime-minutes.xml delete mode 120000 tests/networkxml2xmlout/leasetime-seconds.xml delete mode 120000 tests/networkxml2xmlout/netboot-tftp.xml rename tests/{networkxml2xmlout/8021Qbh-net.xml =3D> networkxmlconfdata/80= 21Qbh-net.expect.xml} (100%) rename tests/{networkxml2xmlin =3D> networkxmlconfdata}/8021Qbh-net.xml (1= 00%) rename tests/{networkxml2confdata =3D> networkxmlconfdata}/bandwidth-netwo= rk.conf (100%) rename tests/{networkxml2xmlout/bandwidth-network.xml =3D> networkxmlconfd= ata/bandwidth-network.expect.xml} (100%) rename tests/{networkxml2xmlin =3D> networkxmlconfdata}/bandwidth-network.= xml (100%) rename tests/{networkxml2confdata =3D> networkxmlconfdata}/dhcp6-nat-netwo= rk.conf (100%) rename tests/{networkxml2xmlout/dhcp6-nat-network.xml =3D> networkxmlconfd= ata/dhcp6-nat-network.expect.xml} (100%) rename tests/{networkxml2confdata =3D> networkxmlconfdata}/dhcp6-nat-netwo= rk.hostsfile (100%) rename tests/{networkxml2confdata =3D> networkxmlconfdata}/dhcp6-nat-netwo= rk.xml (100%) rename tests/{networkxml2confdata =3D> networkxmlconfdata}/dhcp6-network.c= onf (100%) rename tests/{networkxml2xmlout/dhcp6-network.xml =3D> networkxmlconfdata/= dhcp6-network.expect.xml} (100%) rename tests/{networkxml2confdata =3D> networkxmlconfdata}/dhcp6-network.h= ostsfile (100%) rename tests/{networkxml2confdata =3D> networkxmlconfdata}/dhcp6-network.x= ml (100%) rename tests/{networkxml2confdata =3D> networkxmlconfdata}/dhcp6host-route= d-network.conf (100%) rename tests/{networkxml2xmlout/dhcp6host-routed-network.xml =3D> networkx= mlconfdata/dhcp6host-routed-network.expect.xml} (100%) rename tests/{networkxml2confdata =3D> networkxmlconfdata}/dhcp6host-route= d-network.hostsfile (100%) rename tests/{networkxml2xmlin =3D> networkxmlconfdata}/dhcp6host-routed-n= etwork.xml (100%) rename tests/{networkxml2xmlout/direct-net.xml =3D> networkxmlconfdata/dir= ect-net.expect.xml} (100%) rename tests/{networkxml2xmlin =3D> networkxmlconfdata}/direct-net.xml (10= 0%) rename tests/{networkxml2confdata =3D> networkxmlconfdata}/dnsmasq-options= .conf (100%) rename tests/{networkxml2xmlout/dnsmasq-options.xml =3D> networkxmlconfdat= a/dnsmasq-options.expect.xml} (100%) rename tests/{networkxml2confdata =3D> networkxmlconfdata}/dnsmasq-options= .xml (100%) rename tests/{networkxml2xmlout/empty-allow-ipv6.xml =3D> networkxmlconfda= ta/empty-allow-ipv6.expect.xml} (100%) rename tests/{networkxml2xmlin =3D> networkxmlconfdata}/empty-allow-ipv6.x= ml (100%) rename tests/{networkxml2xmlout/host-bridge-net.xml =3D> networkxmlconfdat= a/host-bridge-net.expect.xml} (100%) rename tests/{networkxml2xmlin =3D> networkxmlconfdata}/host-bridge-net.xm= l (100%) rename tests/{networkxml2xmlout/host-bridge-no-flood.xml =3D> networkxmlco= nfdata/host-bridge-no-flood.expect.xml} (100%) rename tests/{networkxml2xmlin =3D> networkxmlconfdata}/host-bridge-no-flo= od.xml (100%) rename tests/{networkxml2xmlin =3D> networkxmlconfdata}/hostdev-duplicate.= xml (100%) rename tests/{networkxml2xmlin/hostdev-pf-driver-model.xml =3D> networkxml= confdata/hostdev-pf-driver-model.expect.xml} (100%) rename tests/{networkxml2xmlout =3D> networkxmlconfdata}/hostdev-pf-driver= -model.xml (100%) rename tests/{networkxml2xmlin/hostdev-pf.xml =3D> networkxmlconfdata/host= dev-pf.expect.xml} (100%) rename tests/{networkxml2xmlout =3D> networkxmlconfdata}/hostdev-pf.xml (1= 00%) rename tests/{networkxml2xmlin/hostdev.xml =3D> networkxmlconfdata/hostdev= .expect.xml} (100%) rename tests/{networkxml2xmlout =3D> networkxmlconfdata}/hostdev.xml (100%) rename tests/{networkxml2confdata =3D> networkxmlconfdata}/isolated-networ= k.conf (100%) rename tests/{networkxml2xmlout/isolated-network.xml =3D> networkxmlconfda= ta/isolated-network.expect.xml} (100%) rename tests/{networkxml2xmlin =3D> networkxmlconfdata}/isolated-network.x= ml (100%) rename tests/{networkxml2xmlout/isolated-ports.xml =3D> networkxmlconfdata= /isolated-ports.expect.xml} (100%) rename tests/{networkxml2xmlin =3D> networkxmlconfdata}/isolated-ports.xml= (100%) rename tests/{networkxml2confdata =3D> networkxmlconfdata}/leasetime-hours= .conf (100%) create mode 120000 tests/networkxmlconfdata/leasetime-hours.expect.xml rename tests/{networkxml2confdata =3D> networkxmlconfdata}/leasetime-hours= .hostsfile (100%) rename tests/{networkxml2confdata =3D> networkxmlconfdata}/leasetime-hours= .xml (100%) rename tests/{networkxml2confdata =3D> networkxmlconfdata}/leasetime-infin= ite.conf (100%) create mode 120000 tests/networkxmlconfdata/leasetime-infinite.expect.xml rename tests/{networkxml2confdata =3D> networkxmlconfdata}/leasetime-infin= ite.hostsfile (100%) rename tests/{networkxml2confdata =3D> networkxmlconfdata}/leasetime-infin= ite.xml (100%) rename tests/{networkxml2confdata =3D> networkxmlconfdata}/leasetime-minut= es.conf (100%) create mode 120000 tests/networkxmlconfdata/leasetime-minutes.expect.xml rename tests/{networkxml2confdata =3D> networkxmlconfdata}/leasetime-minut= es.hostsfile (100%) rename tests/{networkxml2confdata =3D> networkxmlconfdata}/leasetime-minut= es.xml (100%) rename tests/{networkxml2confdata =3D> networkxmlconfdata}/leasetime-secon= ds.conf (100%) create mode 120000 tests/networkxmlconfdata/leasetime-seconds.expect.xml rename tests/{networkxml2confdata =3D> networkxmlconfdata}/leasetime-secon= ds.hostsfile (100%) rename tests/{networkxml2confdata =3D> networkxmlconfdata}/leasetime-secon= ds.xml (100%) rename tests/{networkxml2xmlout/metadata.xml =3D> networkxmlconfdata/metad= ata.expect.xml} (100%) rename tests/{networkxml2xmlin =3D> networkxmlconfdata}/metadata.xml (100%) rename tests/{networkxml2confdata =3D> networkxmlconfdata}/nat-network-dns= -forward-plain.conf (100%) rename tests/{networkxml2xmlout/nat-network-dns-forward-plain.xml =3D> net= workxmlconfdata/nat-network-dns-forward-plain.expect.xml} (100%) rename tests/{networkxml2confdata =3D> networkxmlconfdata}/nat-network-dns= -forward-plain.xml (100%) rename tests/{networkxml2confdata =3D> networkxmlconfdata}/nat-network-dns= -forwarder-no-resolv.conf (100%) rename tests/{networkxml2xmlout/nat-network-dns-forwarder-no-resolv.xml = =3D> networkxmlconfdata/nat-network-dns-forwarder-no-resolv.expect.xml} (10= 0%) rename tests/{networkxml2confdata =3D> networkxmlconfdata}/nat-network-dns= -forwarder-no-resolv.xml (100%) rename tests/{networkxml2confdata =3D> networkxmlconfdata}/nat-network-dns= -forwarders.conf (100%) rename tests/{networkxml2xmlout/nat-network-dns-forwarders.xml =3D> networ= kxmlconfdata/nat-network-dns-forwarders.expect.xml} (100%) rename tests/{networkxml2xmlin =3D> networkxmlconfdata}/nat-network-dns-fo= rwarders.xml (100%) rename tests/{networkxml2confdata =3D> networkxmlconfdata}/nat-network-dns= -hosts.conf (100%) rename tests/{networkxml2xmlout/nat-network-dns-hosts.xml =3D> networkxmlc= onfdata/nat-network-dns-hosts.expect.xml} (100%) rename tests/{networkxml2xmlin =3D> networkxmlconfdata}/nat-network-dns-ho= sts.xml (100%) rename tests/{networkxml2confdata =3D> networkxmlconfdata}/nat-network-dns= -local-domain.conf (100%) rename tests/{networkxml2xmlout/nat-network-dns-local-domain.xml =3D> netw= orkxmlconfdata/nat-network-dns-local-domain.expect.xml} (100%) rename tests/{networkxml2confdata =3D> networkxmlconfdata}/nat-network-dns= -local-domain.xml (100%) rename tests/{networkxml2confdata =3D> networkxmlconfdata}/nat-network-dns= -srv-record-minimal.conf (100%) rename tests/{networkxml2xmlout/nat-network-dns-srv-record-minimal.xml =3D= > networkxmlconfdata/nat-network-dns-srv-record-minimal.expect.xml} (100%) rename tests/{networkxml2confdata =3D> networkxmlconfdata}/nat-network-dns= -srv-record-minimal.hostsfile (100%) rename tests/{networkxml2confdata =3D> networkxmlconfdata}/nat-network-dns= -srv-record-minimal.xml (100%) rename tests/{networkxml2confdata =3D> networkxmlconfdata}/nat-network-dns= -srv-record.conf (100%) rename tests/{networkxml2xmlout/nat-network-dns-srv-record.xml =3D> networ= kxmlconfdata/nat-network-dns-srv-record.expect.xml} (100%) rename tests/{networkxml2confdata =3D> networkxmlconfdata}/nat-network-dns= -srv-record.hostsfile (100%) rename tests/{networkxml2confdata =3D> networkxmlconfdata}/nat-network-dns= -srv-record.xml (100%) rename tests/{networkxml2confdata =3D> networkxmlconfdata}/nat-network-dns= -srv-records.conf (100%) rename tests/{networkxml2xmlout/nat-network-dns-srv-records.xml =3D> netwo= rkxmlconfdata/nat-network-dns-srv-records.expect.xml} (100%) rename tests/{networkxml2confdata =3D> networkxmlconfdata}/nat-network-dns= -srv-records.hostsfile (100%) rename tests/{networkxml2xmlin =3D> networkxmlconfdata}/nat-network-dns-sr= v-records.xml (100%) rename tests/{networkxml2confdata =3D> networkxmlconfdata}/nat-network-dns= -txt-record.conf (100%) rename tests/{networkxml2xmlout/nat-network-dns-txt-record.xml =3D> networ= kxmlconfdata/nat-network-dns-txt-record.expect.xml} (100%) rename tests/{networkxml2confdata =3D> networkxmlconfdata}/nat-network-dns= -txt-record.hostsfile (100%) rename tests/{networkxml2confdata =3D> networkxmlconfdata}/nat-network-dns= -txt-record.xml (100%) rename tests/{networkxml2confdata =3D> networkxmlconfdata}/nat-network-exp= licit-flood.conf (100%) rename tests/{networkxml2xmlout/nat-network-explicit-flood.xml =3D> networ= kxmlconfdata/nat-network-explicit-flood.expect.xml} (100%) rename tests/{networkxml2confdata =3D> networkxmlconfdata}/nat-network-exp= licit-flood.hostsfile (100%) rename tests/{networkxml2xmlin =3D> networkxmlconfdata}/nat-network-explic= it-flood.xml (100%) rename tests/{networkxml2confdata =3D> networkxmlconfdata}/nat-network-for= ward-nat-address.conf (100%) rename tests/{networkxml2xmlout/nat-network-forward-nat-address.xml =3D> n= etworkxmlconfdata/nat-network-forward-nat-address.expect.xml} (100%) rename tests/{networkxml2confdata =3D> networkxmlconfdata}/nat-network-for= ward-nat-address.hostsfile (100%) rename tests/{networkxml2xmlin =3D> networkxmlconfdata}/nat-network-forwar= d-nat-address.xml (100%) rename tests/{networkxml2confdata =3D> networkxmlconfdata}/nat-network-for= ward-nat-ipv6.conf (100%) rename tests/{networkxml2xmlout/nat-network-forward-nat-ipv6.xml =3D> netw= orkxmlconfdata/nat-network-forward-nat-ipv6.expect.xml} (100%) rename tests/{networkxml2xmlin =3D> networkxmlconfdata}/nat-network-forwar= d-nat-ipv6.xml (100%) rename tests/{networkxml2confdata =3D> networkxmlconfdata}/nat-network-for= ward-nat-no-address.conf (100%) rename tests/{networkxml2xmlout/nat-network-forward-nat-no-address.xml =3D= > networkxmlconfdata/nat-network-forward-nat-no-address.expect.xml} (100%) rename tests/{networkxml2confdata =3D> networkxmlconfdata}/nat-network-for= ward-nat-no-address.hostsfile (100%) rename tests/{networkxml2xmlin =3D> networkxmlconfdata}/nat-network-forwar= d-nat-no-address.xml (100%) rename tests/{networkxml2confdata =3D> networkxmlconfdata}/nat-network-mtu= .conf (100%) rename tests/{networkxml2xmlout/nat-network-mtu.xml =3D> networkxmlconfdat= a/nat-network-mtu.expect.xml} (100%) rename tests/{networkxml2confdata =3D> networkxmlconfdata}/nat-network-mtu= .hostsfile (100%) rename tests/{networkxml2xmlin =3D> networkxmlconfdata}/nat-network-mtu.xm= l (100%) rename tests/{networkxml2confdata =3D> networkxmlconfdata}/nat-network-nam= e-with-quotes.conf (100%) rename tests/{networkxml2xmlout/nat-network-name-with-quotes.xml =3D> netw= orkxmlconfdata/nat-network-name-with-quotes.expect.xml} (100%) rename tests/{networkxml2confdata =3D> networkxmlconfdata}/nat-network-nam= e-with-quotes.hostsfile (100%) rename tests/{networkxml2confdata =3D> networkxmlconfdata}/nat-network-nam= e-with-quotes.xml (100%) rename tests/{networkxml2confdata =3D> networkxmlconfdata}/nat-network.con= f (100%) rename tests/{networkxml2xmlout/nat-network.xml =3D> networkxmlconfdata/na= t-network.expect.xml} (100%) rename tests/{networkxml2confdata =3D> networkxmlconfdata}/nat-network.hos= tsfile (100%) rename tests/{networkxml2xmlin =3D> networkxmlconfdata}/nat-network.xml (1= 00%) rename tests/{networkxml2confdata =3D> networkxmlconfdata}/netboot-network= .conf (100%) rename tests/{networkxml2xmlout/netboot-network.xml =3D> networkxmlconfdat= a/netboot-network.expect.xml} (100%) rename tests/{networkxml2xmlin =3D> networkxmlconfdata}/netboot-network.xm= l (100%) rename tests/{networkxml2confdata =3D> networkxmlconfdata}/netboot-proxy-n= etwork.conf (100%) rename tests/{networkxml2xmlout/netboot-proxy-network.xml =3D> networkxmlc= onfdata/netboot-proxy-network.expect.xml} (100%) rename tests/{networkxml2xmlin =3D> networkxmlconfdata}/netboot-proxy-netw= ork.xml (100%) rename tests/{networkxml2confdata =3D> networkxmlconfdata}/netboot-tftp.co= nf (100%) create mode 120000 tests/networkxmlconfdata/netboot-tftp.expect.xml rename tests/{networkxml2confdata =3D> networkxmlconfdata}/netboot-tftp.xm= l (100%) rename tests/{networkxml2xmlin =3D> networkxmlconfdata}/open-network-with-= forward-dev.xml (100%) rename tests/{networkxml2confdata =3D> networkxmlconfdata}/open-network.co= nf (100%) rename tests/{networkxml2xmlout/open-network.xml =3D> networkxmlconfdata/o= pen-network.expect.xml} (100%) rename tests/{networkxml2xmlin =3D> networkxmlconfdata}/open-network.xml (= 100%) rename tests/{networkxml2xmlin/openvswitch-net.xml =3D> networkxmlconfdata= /openvswitch-net.expect.xml} (100%) rename tests/{networkxml2xmlout =3D> networkxmlconfdata}/openvswitch-net.x= ml (100%) rename tests/{networkxml2xmlin =3D> networkxmlconfdata}/passthrough-addres= s-crash.xml (100%) rename tests/{networkxml2xmlin =3D> networkxmlconfdata}/passthrough-duplic= ate.xml (100%) rename tests/{networkxml2confdata =3D> networkxmlconfdata}/passthrough-pf.= conf (100%) rename tests/{networkxml2xmlin =3D> networkxmlconfdata}/passthrough-pf.xml= (100%) rename tests/{networkxml2confdata =3D> networkxmlconfdata}/ptr-domains-aut= o.conf (100%) rename tests/{networkxml2xmlout/ptr-domains-auto.xml =3D> networkxmlconfda= ta/ptr-domains-auto.expect.xml} (100%) rename tests/{networkxml2confdata =3D> networkxmlconfdata}/ptr-domains-aut= o.hostsfile (100%) rename tests/{networkxml2confdata =3D> networkxmlconfdata}/ptr-domains-aut= o.xml (100%) rename tests/{networkxml2xmlin =3D> networkxmlconfdata}/routed-network-no-= dns-extra-elements.xml (100%) rename tests/{networkxml2xmlout/routed-network-no-dns.xml =3D> networkxmlc= onfdata/routed-network-no-dns.expect.xml} (100%) rename tests/{networkxml2xmlin =3D> networkxmlconfdata}/routed-network-no-= dns.xml (100%) rename tests/{networkxml2confdata =3D> networkxmlconfdata}/routed-network.= conf (100%) rename tests/{networkxml2xmlout/routed-network.xml =3D> networkxmlconfdata= /routed-network.expect.xml} (100%) rename tests/{networkxml2xmlin =3D> networkxmlconfdata}/routed-network.xml= (100%) rename tests/{networkxml2confdata =3D> networkxmlconfdata}/set-mtu.conf (1= 00%) rename tests/{networkxml2xmlout/set-mtu.xml =3D> networkxmlconfdata/set-mt= u.expect.xml} (100%) rename tests/{networkxml2xmlin =3D> networkxmlconfdata}/set-mtu.xml (100%) rename tests/{networkxml2xmlout/vepa-net.xml =3D> networkxmlconfdata/vepa-= net.expect.xml} (100%) rename tests/{networkxml2xmlin =3D> networkxmlconfdata}/vepa-net.xml (100%) rename tests/{networkxml2xmltest.c =3D> networkxmlconftest.c} (96%) diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index 665eeecedb..d50d42c98c 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -1178,7 +1178,7 @@ networkDnsmasqConfContents(virNetworkObj *obj, =20 /* create dnsmasq config file appropriate for this network */ =20 - /* Don't forget to update networkxml2xmltest :-) */ + /* Don't forget to update networkxmlconftest :-) */ virBufferAsprintf(&configbuf, "##WARNING: THIS IS AN AUTO-GENERATED FILE. " "CHANGES TO IT ARE LIKELY TO BE\n" diff --git a/tests/meson.build b/tests/meson.build index 00c81877af..b28ad4a65b 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -408,7 +408,7 @@ endif if conf.has('WITH_NETWORK') tests +=3D [ { 'name': 'networkxml2firewalltest', 'include': [ network_inc_dir ], '= link_with': [ network_driver_impl ] }, - { 'name': 'networkxml2xmltest', 'include': [ network_inc_dir ], 'link_= with': [ network_driver_impl ], }, + { 'name': 'networkxmlconftest', 'include': [ network_inc_dir ], 'link_= with': [ network_driver_impl ], }, ] endif =20 diff --git a/tests/networkxml2confdata/dhcp6host-routed-network.xml b/tests= /networkxml2confdata/dhcp6host-routed-network.xml deleted file mode 100644 index 42b9d3f16a..0000000000 --- a/tests/networkxml2confdata/dhcp6host-routed-network.xml +++ /dev/null @@ -1,22 +0,0 @@ - - local - 81ff0d90-c91e-6742-64da-4a736edb9a9b - - - - - - - - - - - - - - - - - - - diff --git a/tests/networkxml2confdata/isolated-network.xml b/tests/network= xml2confdata/isolated-network.xml deleted file mode 100644 index b22d4ea775..0000000000 --- a/tests/networkxml2confdata/isolated-network.xml +++ /dev/null @@ -1,11 +0,0 @@ - - private - 81ff0d90-c91e-6742-64da-4a736edb9a9b - - - - - - - - diff --git a/tests/networkxml2confdata/nat-network-dns-forwarders.xml b/tes= ts/networkxml2confdata/nat-network-dns-forwarders.xml deleted file mode 100644 index d84576b1b3..0000000000 --- a/tests/networkxml2confdata/nat-network-dns-forwarders.xml +++ /dev/null @@ -1,15 +0,0 @@ - - default - 81ff0d90-c91e-6742-64da-4a736edb9a9c - - - - - - - - - - - - diff --git a/tests/networkxml2confdata/nat-network-dns-hosts.xml b/tests/ne= tworkxml2confdata/nat-network-dns-hosts.xml deleted file mode 100644 index 9add45656a..0000000000 --- a/tests/networkxml2confdata/nat-network-dns-hosts.xml +++ /dev/null @@ -1,15 +0,0 @@ - - default - 81ff0d90-c91e-6742-64da-4a736edb9a9c - - - - - - host - gateway - - - - - diff --git a/tests/networkxml2confdata/nat-network-mtu.xml b/tests/networkx= ml2confdata/nat-network-mtu.xml deleted file mode 100644 index 87b214e95c..0000000000 --- a/tests/networkxml2confdata/nat-network-mtu.xml +++ /dev/null @@ -1,22 +0,0 @@ - - default - 81ff0d90-c91e-6742-64da-4a736edb9a9b - - - - - - - - - - - - - - - - - - - diff --git a/tests/networkxml2confdata/nat-network.xml b/tests/networkxml2c= onfdata/nat-network.xml deleted file mode 100644 index e44d35d83d..0000000000 --- a/tests/networkxml2confdata/nat-network.xml +++ /dev/null @@ -1,21 +0,0 @@ - - default - 81ff0d90-c91e-6742-64da-4a736edb9a9b - - - - - - - - - - - - - - - - - - diff --git a/tests/networkxml2confdata/netboot-network.xml b/tests/networkx= ml2confdata/netboot-network.xml deleted file mode 100644 index ec06c30050..0000000000 --- a/tests/networkxml2confdata/netboot-network.xml +++ /dev/null @@ -1,14 +0,0 @@ - - netboot - 81ff0d90-c91e-6742-64da-4a736edb9a9b - - - - - - - - - - - diff --git a/tests/networkxml2confdata/netboot-proxy-network.xml b/tests/ne= tworkxml2confdata/netboot-proxy-network.xml deleted file mode 100644 index a5b7c1e4e6..0000000000 --- a/tests/networkxml2confdata/netboot-proxy-network.xml +++ /dev/null @@ -1,13 +0,0 @@ - - netboot - 81ff0d90-c91e-6742-64da-4a736edb9a9b - - - - - - - - - - diff --git a/tests/networkxml2confdata/open-network.xml b/tests/networkxml2= confdata/open-network.xml deleted file mode 100644 index e0b3f039f4..0000000000 --- a/tests/networkxml2confdata/open-network.xml +++ /dev/null @@ -1,9 +0,0 @@ - - open - 81ff0d90-c91e-6742-64da-4a736edb9a9b - - - - - - diff --git a/tests/networkxml2confdata/routed-network.xml b/tests/networkxm= l2confdata/routed-network.xml deleted file mode 100644 index 6b0853a0b4..0000000000 --- a/tests/networkxml2confdata/routed-network.xml +++ /dev/null @@ -1,9 +0,0 @@ - - local - 81ff0d90-c91e-6742-64da-4a736edb9a9b - - - - - - diff --git a/tests/networkxml2xmlin/dhcp6-nat-network.xml b/tests/networkxm= l2xmlin/dhcp6-nat-network.xml deleted file mode 100644 index cab0700f2b..0000000000 --- a/tests/networkxml2xmlin/dhcp6-nat-network.xml +++ /dev/null @@ -1,27 +0,0 @@ - - default - 81ff0d90-c91e-6742-64da-4a736edb9a9b - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tests/networkxml2xmlin/dhcp6-network.xml b/tests/networkxml2xm= lin/dhcp6-network.xml deleted file mode 100644 index ae9ff1f32c..0000000000 --- a/tests/networkxml2xmlin/dhcp6-network.xml +++ /dev/null @@ -1,17 +0,0 @@ - - default - 81ff0d90-c91e-6742-64da-4a736edb9a9b - - - - - - - - - - - - - - diff --git a/tests/networkxml2xmlin/dnsmasq-options.xml b/tests/networkxml2= xmlin/dnsmasq-options.xml deleted file mode 100644 index 35a87b8e3e..0000000000 --- a/tests/networkxml2xmlin/dnsmasq-options.xml +++ /dev/null @@ -1,15 +0,0 @@ - - default - 81ff0d90-c91e-6742-64da-4a736edb9a9b - - - - - - - - - - - - diff --git a/tests/networkxml2xmlin/leasetime-hours.xml b/tests/networkxml2= xmlin/leasetime-hours.xml deleted file mode 120000 index 5a6bed3d5f..0000000000 --- a/tests/networkxml2xmlin/leasetime-hours.xml +++ /dev/null @@ -1 +0,0 @@ -../networkxml2confdata/leasetime-hours.xml \ No newline at end of file diff --git a/tests/networkxml2xmlin/leasetime-infinite.xml b/tests/networkx= ml2xmlin/leasetime-infinite.xml deleted file mode 120000 index 706e4cdf11..0000000000 --- a/tests/networkxml2xmlin/leasetime-infinite.xml +++ /dev/null @@ -1 +0,0 @@ -../networkxml2confdata/leasetime-infinite.xml \ No newline at end of file diff --git a/tests/networkxml2xmlin/leasetime-minutes.xml b/tests/networkxm= l2xmlin/leasetime-minutes.xml deleted file mode 120000 index 2c19b06a8a..0000000000 --- a/tests/networkxml2xmlin/leasetime-minutes.xml +++ /dev/null @@ -1 +0,0 @@ -../networkxml2confdata/leasetime-minutes.xml \ No newline at end of file diff --git a/tests/networkxml2xmlin/leasetime-seconds.xml b/tests/networkxm= l2xmlin/leasetime-seconds.xml deleted file mode 120000 index f182cfa2f1..0000000000 --- a/tests/networkxml2xmlin/leasetime-seconds.xml +++ /dev/null @@ -1 +0,0 @@ -../networkxml2confdata/leasetime-seconds.xml \ No newline at end of file diff --git a/tests/networkxml2xmlin/nat-network-dns-forward-plain.xml b/tes= ts/networkxml2xmlin/nat-network-dns-forward-plain.xml deleted file mode 100644 index 10bacb5cbb..0000000000 --- a/tests/networkxml2xmlin/nat-network-dns-forward-plain.xml +++ /dev/null @@ -1,9 +0,0 @@ - - default - 81ff0d90-c91e-6742-64da-4a736edb9a9c - - - - - - diff --git a/tests/networkxml2xmlin/nat-network-dns-forwarder-no-resolv.xml= b/tests/networkxml2xmlin/nat-network-dns-forwarder-no-resolv.xml deleted file mode 100644 index 9661ce561e..0000000000 --- a/tests/networkxml2xmlin/nat-network-dns-forwarder-no-resolv.xml +++ /dev/null @@ -1,11 +0,0 @@ - - default - 81ff0d90-c91e-6742-64da-4a736edb9a9c - - - - - - - - diff --git a/tests/networkxml2xmlin/nat-network-dns-local-domain.xml b/test= s/networkxml2xmlin/nat-network-dns-local-domain.xml deleted file mode 100644 index a92d71f1f2..0000000000 --- a/tests/networkxml2xmlin/nat-network-dns-local-domain.xml +++ /dev/null @@ -1,9 +0,0 @@ - - default - 81ff0d90-c91e-6742-64da-4a736edb9a9c - - - - - - diff --git a/tests/networkxml2xmlin/nat-network-dns-srv-record-minimal.xml = b/tests/networkxml2xmlin/nat-network-dns-srv-record-minimal.xml deleted file mode 100644 index 83838d01d3..0000000000 --- a/tests/networkxml2xmlin/nat-network-dns-srv-record-minimal.xml +++ /dev/null @@ -1,26 +0,0 @@ - - default - 81ff0d90-c91e-6742-64da-4a736edb9a9b - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tests/networkxml2xmlin/nat-network-dns-srv-record.xml b/tests/= networkxml2xmlin/nat-network-dns-srv-record.xml deleted file mode 100644 index 0369f4caa9..0000000000 --- a/tests/networkxml2xmlin/nat-network-dns-srv-record.xml +++ /dev/null @@ -1,32 +0,0 @@ - - default - 81ff0d90-c91e-6742-64da-4a736edb9a9b - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tests/networkxml2xmlin/nat-network-dns-txt-record.xml b/tests/= networkxml2xmlin/nat-network-dns-txt-record.xml deleted file mode 100644 index 0a6bd595ae..0000000000 --- a/tests/networkxml2xmlin/nat-network-dns-txt-record.xml +++ /dev/null @@ -1,24 +0,0 @@ - - default - 81ff0d90-c91e-6742-64da-4a736edb9a9b - - - - - - - - - - - - - - - - - - - - - diff --git a/tests/networkxml2xmlin/nat-network-name-with-quotes.xml b/test= s/networkxml2xmlin/nat-network-name-with-quotes.xml deleted file mode 100644 index eba75d2e2d..0000000000 --- a/tests/networkxml2xmlin/nat-network-name-with-quotes.xml +++ /dev/null @@ -1,26 +0,0 @@ - - default"with"quotes" - 81ff0d90-c91e-6742-64da-4a736edb9a9b - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tests/networkxml2xmlin/netboot-tftp.xml b/tests/networkxml2xml= in/netboot-tftp.xml deleted file mode 120000 index 1487de558b..0000000000 --- a/tests/networkxml2xmlin/netboot-tftp.xml +++ /dev/null @@ -1 +0,0 @@ -../networkxml2confdata/netboot-tftp.xml \ No newline at end of file diff --git a/tests/networkxml2xmlin/ptr-domains-auto.xml b/tests/networkxml= 2xmlin/ptr-domains-auto.xml deleted file mode 100644 index 7fe12dc671..0000000000 --- a/tests/networkxml2xmlin/ptr-domains-auto.xml +++ /dev/null @@ -1,21 +0,0 @@ - - default - 81ff0d90-c91e-6742-64da-4a736edb9a9b - - - - - - - - - - - - - - - - - - diff --git a/tests/networkxml2xmlout/leasetime-hours.xml b/tests/networkxml= 2xmlout/leasetime-hours.xml deleted file mode 120000 index d3cf0fb342..0000000000 --- a/tests/networkxml2xmlout/leasetime-hours.xml +++ /dev/null @@ -1 +0,0 @@ -../networkxml2xmlin/leasetime-hours.xml \ No newline at end of file diff --git a/tests/networkxml2xmlout/leasetime-infinite.xml b/tests/network= xml2xmlout/leasetime-infinite.xml deleted file mode 120000 index 2390f7a3a7..0000000000 --- a/tests/networkxml2xmlout/leasetime-infinite.xml +++ /dev/null @@ -1 +0,0 @@ -../networkxml2xmlin/leasetime-infinite.xml \ No newline at end of file diff --git a/tests/networkxml2xmlout/leasetime-minutes.xml b/tests/networkx= ml2xmlout/leasetime-minutes.xml deleted file mode 120000 index 09ebdb9c14..0000000000 --- a/tests/networkxml2xmlout/leasetime-minutes.xml +++ /dev/null @@ -1 +0,0 @@ -../networkxml2xmlin/leasetime-minutes.xml \ No newline at end of file diff --git a/tests/networkxml2xmlout/leasetime-seconds.xml b/tests/networkx= ml2xmlout/leasetime-seconds.xml deleted file mode 120000 index 7036ca6713..0000000000 --- a/tests/networkxml2xmlout/leasetime-seconds.xml +++ /dev/null @@ -1 +0,0 @@ -../networkxml2xmlin/leasetime-seconds.xml \ No newline at end of file diff --git a/tests/networkxml2xmlout/netboot-tftp.xml b/tests/networkxml2xm= lout/netboot-tftp.xml deleted file mode 120000 index 1487de558b..0000000000 --- a/tests/networkxml2xmlout/netboot-tftp.xml +++ /dev/null @@ -1 +0,0 @@ -../networkxml2confdata/netboot-tftp.xml \ No newline at end of file diff --git a/tests/networkxml2xmlupdatetest.c b/tests/networkxml2xmlupdatet= est.c index 60931a2eba..b017922d94 100644 --- a/tests/networkxml2xmlupdatetest.c +++ b/tests/networkxml2xmlupdatetest.c @@ -76,7 +76,7 @@ testCompareXMLToXMLHelper(const void *data) g_autofree char *updatexml =3D NULL; g_autofree char *outxml =3D NULL; =20 - netxml =3D g_strdup_printf("%s/networkxml2xmlin/%s.xml", + netxml =3D g_strdup_printf("%s/networkxmlconfdata/%s.xml", abs_srcdir, info->netxml); updatexml =3D g_strdup_printf("%s/networkxml2xmlupdatein/%s.xml", abs_srcdir, info->updatexml); diff --git a/tests/networkxml2xmlout/8021Qbh-net.xml b/tests/networkxmlconf= data/8021Qbh-net.expect.xml similarity index 100% rename from tests/networkxml2xmlout/8021Qbh-net.xml rename to tests/networkxmlconfdata/8021Qbh-net.expect.xml diff --git a/tests/networkxml2xmlin/8021Qbh-net.xml b/tests/networkxmlconfd= ata/8021Qbh-net.xml similarity index 100% rename from tests/networkxml2xmlin/8021Qbh-net.xml rename to tests/networkxmlconfdata/8021Qbh-net.xml diff --git a/tests/networkxml2confdata/bandwidth-network.conf b/tests/netwo= rkxmlconfdata/bandwidth-network.conf similarity index 100% rename from tests/networkxml2confdata/bandwidth-network.conf rename to tests/networkxmlconfdata/bandwidth-network.conf diff --git a/tests/networkxml2xmlout/bandwidth-network.xml b/tests/networkx= mlconfdata/bandwidth-network.expect.xml similarity index 100% rename from tests/networkxml2xmlout/bandwidth-network.xml rename to tests/networkxmlconfdata/bandwidth-network.expect.xml diff --git a/tests/networkxml2xmlin/bandwidth-network.xml b/tests/networkxm= lconfdata/bandwidth-network.xml similarity index 100% rename from tests/networkxml2xmlin/bandwidth-network.xml rename to tests/networkxmlconfdata/bandwidth-network.xml diff --git a/tests/networkxml2confdata/dhcp6-nat-network.conf b/tests/netwo= rkxmlconfdata/dhcp6-nat-network.conf similarity index 100% rename from tests/networkxml2confdata/dhcp6-nat-network.conf rename to tests/networkxmlconfdata/dhcp6-nat-network.conf diff --git a/tests/networkxml2xmlout/dhcp6-nat-network.xml b/tests/networkx= mlconfdata/dhcp6-nat-network.expect.xml similarity index 100% rename from tests/networkxml2xmlout/dhcp6-nat-network.xml rename to tests/networkxmlconfdata/dhcp6-nat-network.expect.xml diff --git a/tests/networkxml2confdata/dhcp6-nat-network.hostsfile b/tests/= networkxmlconfdata/dhcp6-nat-network.hostsfile similarity index 100% rename from tests/networkxml2confdata/dhcp6-nat-network.hostsfile rename to tests/networkxmlconfdata/dhcp6-nat-network.hostsfile diff --git a/tests/networkxml2confdata/dhcp6-nat-network.xml b/tests/networ= kxmlconfdata/dhcp6-nat-network.xml similarity index 100% rename from tests/networkxml2confdata/dhcp6-nat-network.xml rename to tests/networkxmlconfdata/dhcp6-nat-network.xml diff --git a/tests/networkxml2confdata/dhcp6-network.conf b/tests/networkxm= lconfdata/dhcp6-network.conf similarity index 100% rename from tests/networkxml2confdata/dhcp6-network.conf rename to tests/networkxmlconfdata/dhcp6-network.conf diff --git a/tests/networkxml2xmlout/dhcp6-network.xml b/tests/networkxmlco= nfdata/dhcp6-network.expect.xml similarity index 100% rename from tests/networkxml2xmlout/dhcp6-network.xml rename to tests/networkxmlconfdata/dhcp6-network.expect.xml diff --git a/tests/networkxml2confdata/dhcp6-network.hostsfile b/tests/netw= orkxmlconfdata/dhcp6-network.hostsfile similarity index 100% rename from tests/networkxml2confdata/dhcp6-network.hostsfile rename to tests/networkxmlconfdata/dhcp6-network.hostsfile diff --git a/tests/networkxml2confdata/dhcp6-network.xml b/tests/networkxml= confdata/dhcp6-network.xml similarity index 100% rename from tests/networkxml2confdata/dhcp6-network.xml rename to tests/networkxmlconfdata/dhcp6-network.xml diff --git a/tests/networkxml2confdata/dhcp6host-routed-network.conf b/test= s/networkxmlconfdata/dhcp6host-routed-network.conf similarity index 100% rename from tests/networkxml2confdata/dhcp6host-routed-network.conf rename to tests/networkxmlconfdata/dhcp6host-routed-network.conf diff --git a/tests/networkxml2xmlout/dhcp6host-routed-network.xml b/tests/n= etworkxmlconfdata/dhcp6host-routed-network.expect.xml similarity index 100% rename from tests/networkxml2xmlout/dhcp6host-routed-network.xml rename to tests/networkxmlconfdata/dhcp6host-routed-network.expect.xml diff --git a/tests/networkxml2confdata/dhcp6host-routed-network.hostsfile b= /tests/networkxmlconfdata/dhcp6host-routed-network.hostsfile similarity index 100% rename from tests/networkxml2confdata/dhcp6host-routed-network.hostsfile rename to tests/networkxmlconfdata/dhcp6host-routed-network.hostsfile diff --git a/tests/networkxml2xmlin/dhcp6host-routed-network.xml b/tests/ne= tworkxmlconfdata/dhcp6host-routed-network.xml similarity index 100% rename from tests/networkxml2xmlin/dhcp6host-routed-network.xml rename to tests/networkxmlconfdata/dhcp6host-routed-network.xml diff --git a/tests/networkxml2xmlout/direct-net.xml b/tests/networkxmlconfd= ata/direct-net.expect.xml similarity index 100% rename from tests/networkxml2xmlout/direct-net.xml rename to tests/networkxmlconfdata/direct-net.expect.xml diff --git a/tests/networkxml2xmlin/direct-net.xml b/tests/networkxmlconfda= ta/direct-net.xml similarity index 100% rename from tests/networkxml2xmlin/direct-net.xml rename to tests/networkxmlconfdata/direct-net.xml diff --git a/tests/networkxml2confdata/dnsmasq-options.conf b/tests/network= xmlconfdata/dnsmasq-options.conf similarity index 100% rename from tests/networkxml2confdata/dnsmasq-options.conf rename to tests/networkxmlconfdata/dnsmasq-options.conf diff --git a/tests/networkxml2xmlout/dnsmasq-options.xml b/tests/networkxml= confdata/dnsmasq-options.expect.xml similarity index 100% rename from tests/networkxml2xmlout/dnsmasq-options.xml rename to tests/networkxmlconfdata/dnsmasq-options.expect.xml diff --git a/tests/networkxml2confdata/dnsmasq-options.xml b/tests/networkx= mlconfdata/dnsmasq-options.xml similarity index 100% rename from tests/networkxml2confdata/dnsmasq-options.xml rename to tests/networkxmlconfdata/dnsmasq-options.xml diff --git a/tests/networkxml2xmlout/empty-allow-ipv6.xml b/tests/networkxm= lconfdata/empty-allow-ipv6.expect.xml similarity index 100% rename from tests/networkxml2xmlout/empty-allow-ipv6.xml rename to tests/networkxmlconfdata/empty-allow-ipv6.expect.xml diff --git a/tests/networkxml2xmlin/empty-allow-ipv6.xml b/tests/networkxml= confdata/empty-allow-ipv6.xml similarity index 100% rename from tests/networkxml2xmlin/empty-allow-ipv6.xml rename to tests/networkxmlconfdata/empty-allow-ipv6.xml diff --git a/tests/networkxml2xmlout/host-bridge-net.xml b/tests/networkxml= confdata/host-bridge-net.expect.xml similarity index 100% rename from tests/networkxml2xmlout/host-bridge-net.xml rename to tests/networkxmlconfdata/host-bridge-net.expect.xml diff --git a/tests/networkxml2xmlin/host-bridge-net.xml b/tests/networkxmlc= onfdata/host-bridge-net.xml similarity index 100% rename from tests/networkxml2xmlin/host-bridge-net.xml rename to tests/networkxmlconfdata/host-bridge-net.xml diff --git a/tests/networkxml2xmlout/host-bridge-no-flood.xml b/tests/netwo= rkxmlconfdata/host-bridge-no-flood.expect.xml similarity index 100% rename from tests/networkxml2xmlout/host-bridge-no-flood.xml rename to tests/networkxmlconfdata/host-bridge-no-flood.expect.xml diff --git a/tests/networkxml2xmlin/host-bridge-no-flood.xml b/tests/networ= kxmlconfdata/host-bridge-no-flood.xml similarity index 100% rename from tests/networkxml2xmlin/host-bridge-no-flood.xml rename to tests/networkxmlconfdata/host-bridge-no-flood.xml diff --git a/tests/networkxml2xmlin/hostdev-duplicate.xml b/tests/networkxm= lconfdata/hostdev-duplicate.xml similarity index 100% rename from tests/networkxml2xmlin/hostdev-duplicate.xml rename to tests/networkxmlconfdata/hostdev-duplicate.xml diff --git a/tests/networkxml2xmlin/hostdev-pf-driver-model.xml b/tests/net= workxmlconfdata/hostdev-pf-driver-model.expect.xml similarity index 100% rename from tests/networkxml2xmlin/hostdev-pf-driver-model.xml rename to tests/networkxmlconfdata/hostdev-pf-driver-model.expect.xml diff --git a/tests/networkxml2xmlout/hostdev-pf-driver-model.xml b/tests/ne= tworkxmlconfdata/hostdev-pf-driver-model.xml similarity index 100% rename from tests/networkxml2xmlout/hostdev-pf-driver-model.xml rename to tests/networkxmlconfdata/hostdev-pf-driver-model.xml diff --git a/tests/networkxml2xmlin/hostdev-pf.xml b/tests/networkxmlconfda= ta/hostdev-pf.expect.xml similarity index 100% rename from tests/networkxml2xmlin/hostdev-pf.xml rename to tests/networkxmlconfdata/hostdev-pf.expect.xml diff --git a/tests/networkxml2xmlout/hostdev-pf.xml b/tests/networkxmlconfd= ata/hostdev-pf.xml similarity index 100% rename from tests/networkxml2xmlout/hostdev-pf.xml rename to tests/networkxmlconfdata/hostdev-pf.xml diff --git a/tests/networkxml2xmlin/hostdev.xml b/tests/networkxmlconfdata/= hostdev.expect.xml similarity index 100% rename from tests/networkxml2xmlin/hostdev.xml rename to tests/networkxmlconfdata/hostdev.expect.xml diff --git a/tests/networkxml2xmlout/hostdev.xml b/tests/networkxmlconfdata= /hostdev.xml similarity index 100% rename from tests/networkxml2xmlout/hostdev.xml rename to tests/networkxmlconfdata/hostdev.xml diff --git a/tests/networkxml2confdata/isolated-network.conf b/tests/networ= kxmlconfdata/isolated-network.conf similarity index 100% rename from tests/networkxml2confdata/isolated-network.conf rename to tests/networkxmlconfdata/isolated-network.conf diff --git a/tests/networkxml2xmlout/isolated-network.xml b/tests/networkxm= lconfdata/isolated-network.expect.xml similarity index 100% rename from tests/networkxml2xmlout/isolated-network.xml rename to tests/networkxmlconfdata/isolated-network.expect.xml diff --git a/tests/networkxml2xmlin/isolated-network.xml b/tests/networkxml= confdata/isolated-network.xml similarity index 100% rename from tests/networkxml2xmlin/isolated-network.xml rename to tests/networkxmlconfdata/isolated-network.xml diff --git a/tests/networkxml2xmlout/isolated-ports.xml b/tests/networkxmlc= onfdata/isolated-ports.expect.xml similarity index 100% rename from tests/networkxml2xmlout/isolated-ports.xml rename to tests/networkxmlconfdata/isolated-ports.expect.xml diff --git a/tests/networkxml2xmlin/isolated-ports.xml b/tests/networkxmlco= nfdata/isolated-ports.xml similarity index 100% rename from tests/networkxml2xmlin/isolated-ports.xml rename to tests/networkxmlconfdata/isolated-ports.xml diff --git a/tests/networkxml2confdata/leasetime-hours.conf b/tests/network= xmlconfdata/leasetime-hours.conf similarity index 100% rename from tests/networkxml2confdata/leasetime-hours.conf rename to tests/networkxmlconfdata/leasetime-hours.conf diff --git a/tests/networkxmlconfdata/leasetime-hours.expect.xml b/tests/ne= tworkxmlconfdata/leasetime-hours.expect.xml new file mode 120000 index 0000000000..9ba0abf62b --- /dev/null +++ b/tests/networkxmlconfdata/leasetime-hours.expect.xml @@ -0,0 +1 @@ +leasetime-hours.xml \ No newline at end of file diff --git a/tests/networkxml2confdata/leasetime-hours.hostsfile b/tests/ne= tworkxmlconfdata/leasetime-hours.hostsfile similarity index 100% rename from tests/networkxml2confdata/leasetime-hours.hostsfile rename to tests/networkxmlconfdata/leasetime-hours.hostsfile diff --git a/tests/networkxml2confdata/leasetime-hours.xml b/tests/networkx= mlconfdata/leasetime-hours.xml similarity index 100% rename from tests/networkxml2confdata/leasetime-hours.xml rename to tests/networkxmlconfdata/leasetime-hours.xml diff --git a/tests/networkxml2confdata/leasetime-infinite.conf b/tests/netw= orkxmlconfdata/leasetime-infinite.conf similarity index 100% rename from tests/networkxml2confdata/leasetime-infinite.conf rename to tests/networkxmlconfdata/leasetime-infinite.conf diff --git a/tests/networkxmlconfdata/leasetime-infinite.expect.xml b/tests= /networkxmlconfdata/leasetime-infinite.expect.xml new file mode 120000 index 0000000000..8862319079 --- /dev/null +++ b/tests/networkxmlconfdata/leasetime-infinite.expect.xml @@ -0,0 +1 @@ +leasetime-infinite.xml \ No newline at end of file diff --git a/tests/networkxml2confdata/leasetime-infinite.hostsfile b/tests= /networkxmlconfdata/leasetime-infinite.hostsfile similarity index 100% rename from tests/networkxml2confdata/leasetime-infinite.hostsfile rename to tests/networkxmlconfdata/leasetime-infinite.hostsfile diff --git a/tests/networkxml2confdata/leasetime-infinite.xml b/tests/netwo= rkxmlconfdata/leasetime-infinite.xml similarity index 100% rename from tests/networkxml2confdata/leasetime-infinite.xml rename to tests/networkxmlconfdata/leasetime-infinite.xml diff --git a/tests/networkxml2confdata/leasetime-minutes.conf b/tests/netwo= rkxmlconfdata/leasetime-minutes.conf similarity index 100% rename from tests/networkxml2confdata/leasetime-minutes.conf rename to tests/networkxmlconfdata/leasetime-minutes.conf diff --git a/tests/networkxmlconfdata/leasetime-minutes.expect.xml b/tests/= networkxmlconfdata/leasetime-minutes.expect.xml new file mode 120000 index 0000000000..ef86e9cf90 --- /dev/null +++ b/tests/networkxmlconfdata/leasetime-minutes.expect.xml @@ -0,0 +1 @@ +leasetime-minutes.xml \ No newline at end of file diff --git a/tests/networkxml2confdata/leasetime-minutes.hostsfile b/tests/= networkxmlconfdata/leasetime-minutes.hostsfile similarity index 100% rename from tests/networkxml2confdata/leasetime-minutes.hostsfile rename to tests/networkxmlconfdata/leasetime-minutes.hostsfile diff --git a/tests/networkxml2confdata/leasetime-minutes.xml b/tests/networ= kxmlconfdata/leasetime-minutes.xml similarity index 100% rename from tests/networkxml2confdata/leasetime-minutes.xml rename to tests/networkxmlconfdata/leasetime-minutes.xml diff --git a/tests/networkxml2confdata/leasetime-seconds.conf b/tests/netwo= rkxmlconfdata/leasetime-seconds.conf similarity index 100% rename from tests/networkxml2confdata/leasetime-seconds.conf rename to tests/networkxmlconfdata/leasetime-seconds.conf diff --git a/tests/networkxmlconfdata/leasetime-seconds.expect.xml b/tests/= networkxmlconfdata/leasetime-seconds.expect.xml new file mode 120000 index 0000000000..e7944dc429 --- /dev/null +++ b/tests/networkxmlconfdata/leasetime-seconds.expect.xml @@ -0,0 +1 @@ +leasetime-seconds.xml \ No newline at end of file diff --git a/tests/networkxml2confdata/leasetime-seconds.hostsfile b/tests/= networkxmlconfdata/leasetime-seconds.hostsfile similarity index 100% rename from tests/networkxml2confdata/leasetime-seconds.hostsfile rename to tests/networkxmlconfdata/leasetime-seconds.hostsfile diff --git a/tests/networkxml2confdata/leasetime-seconds.xml b/tests/networ= kxmlconfdata/leasetime-seconds.xml similarity index 100% rename from tests/networkxml2confdata/leasetime-seconds.xml rename to tests/networkxmlconfdata/leasetime-seconds.xml diff --git a/tests/networkxml2xmlout/metadata.xml b/tests/networkxmlconfdat= a/metadata.expect.xml similarity index 100% rename from tests/networkxml2xmlout/metadata.xml rename to tests/networkxmlconfdata/metadata.expect.xml diff --git a/tests/networkxml2xmlin/metadata.xml b/tests/networkxmlconfdata= /metadata.xml similarity index 100% rename from tests/networkxml2xmlin/metadata.xml rename to tests/networkxmlconfdata/metadata.xml diff --git a/tests/networkxml2confdata/nat-network-dns-forward-plain.conf b= /tests/networkxmlconfdata/nat-network-dns-forward-plain.conf similarity index 100% rename from tests/networkxml2confdata/nat-network-dns-forward-plain.conf rename to tests/networkxmlconfdata/nat-network-dns-forward-plain.conf diff --git a/tests/networkxml2xmlout/nat-network-dns-forward-plain.xml b/te= sts/networkxmlconfdata/nat-network-dns-forward-plain.expect.xml similarity index 100% rename from tests/networkxml2xmlout/nat-network-dns-forward-plain.xml rename to tests/networkxmlconfdata/nat-network-dns-forward-plain.expect.xml diff --git a/tests/networkxml2confdata/nat-network-dns-forward-plain.xml b/= tests/networkxmlconfdata/nat-network-dns-forward-plain.xml similarity index 100% rename from tests/networkxml2confdata/nat-network-dns-forward-plain.xml rename to tests/networkxmlconfdata/nat-network-dns-forward-plain.xml diff --git a/tests/networkxml2confdata/nat-network-dns-forwarder-no-resolv.= conf b/tests/networkxmlconfdata/nat-network-dns-forwarder-no-resolv.conf similarity index 100% rename from tests/networkxml2confdata/nat-network-dns-forwarder-no-resolv.c= onf rename to tests/networkxmlconfdata/nat-network-dns-forwarder-no-resolv.conf diff --git a/tests/networkxml2xmlout/nat-network-dns-forwarder-no-resolv.xm= l b/tests/networkxmlconfdata/nat-network-dns-forwarder-no-resolv.expect.xml similarity index 100% rename from tests/networkxml2xmlout/nat-network-dns-forwarder-no-resolv.xml rename to tests/networkxmlconfdata/nat-network-dns-forwarder-no-resolv.expe= ct.xml diff --git a/tests/networkxml2confdata/nat-network-dns-forwarder-no-resolv.= xml b/tests/networkxmlconfdata/nat-network-dns-forwarder-no-resolv.xml similarity index 100% rename from tests/networkxml2confdata/nat-network-dns-forwarder-no-resolv.x= ml rename to tests/networkxmlconfdata/nat-network-dns-forwarder-no-resolv.xml diff --git a/tests/networkxml2confdata/nat-network-dns-forwarders.conf b/te= sts/networkxmlconfdata/nat-network-dns-forwarders.conf similarity index 100% rename from tests/networkxml2confdata/nat-network-dns-forwarders.conf rename to tests/networkxmlconfdata/nat-network-dns-forwarders.conf diff --git a/tests/networkxml2xmlout/nat-network-dns-forwarders.xml b/tests= /networkxmlconfdata/nat-network-dns-forwarders.expect.xml similarity index 100% rename from tests/networkxml2xmlout/nat-network-dns-forwarders.xml rename to tests/networkxmlconfdata/nat-network-dns-forwarders.expect.xml diff --git a/tests/networkxml2xmlin/nat-network-dns-forwarders.xml b/tests/= networkxmlconfdata/nat-network-dns-forwarders.xml similarity index 100% rename from tests/networkxml2xmlin/nat-network-dns-forwarders.xml rename to tests/networkxmlconfdata/nat-network-dns-forwarders.xml diff --git a/tests/networkxml2confdata/nat-network-dns-hosts.conf b/tests/n= etworkxmlconfdata/nat-network-dns-hosts.conf similarity index 100% rename from tests/networkxml2confdata/nat-network-dns-hosts.conf rename to tests/networkxmlconfdata/nat-network-dns-hosts.conf diff --git a/tests/networkxml2xmlout/nat-network-dns-hosts.xml b/tests/netw= orkxmlconfdata/nat-network-dns-hosts.expect.xml similarity index 100% rename from tests/networkxml2xmlout/nat-network-dns-hosts.xml rename to tests/networkxmlconfdata/nat-network-dns-hosts.expect.xml diff --git a/tests/networkxml2xmlin/nat-network-dns-hosts.xml b/tests/netwo= rkxmlconfdata/nat-network-dns-hosts.xml similarity index 100% rename from tests/networkxml2xmlin/nat-network-dns-hosts.xml rename to tests/networkxmlconfdata/nat-network-dns-hosts.xml diff --git a/tests/networkxml2confdata/nat-network-dns-local-domain.conf b/= tests/networkxmlconfdata/nat-network-dns-local-domain.conf similarity index 100% rename from tests/networkxml2confdata/nat-network-dns-local-domain.conf rename to tests/networkxmlconfdata/nat-network-dns-local-domain.conf diff --git a/tests/networkxml2xmlout/nat-network-dns-local-domain.xml b/tes= ts/networkxmlconfdata/nat-network-dns-local-domain.expect.xml similarity index 100% rename from tests/networkxml2xmlout/nat-network-dns-local-domain.xml rename to tests/networkxmlconfdata/nat-network-dns-local-domain.expect.xml diff --git a/tests/networkxml2confdata/nat-network-dns-local-domain.xml b/t= ests/networkxmlconfdata/nat-network-dns-local-domain.xml similarity index 100% rename from tests/networkxml2confdata/nat-network-dns-local-domain.xml rename to tests/networkxmlconfdata/nat-network-dns-local-domain.xml diff --git a/tests/networkxml2confdata/nat-network-dns-srv-record-minimal.c= onf b/tests/networkxmlconfdata/nat-network-dns-srv-record-minimal.conf similarity index 100% rename from tests/networkxml2confdata/nat-network-dns-srv-record-minimal.co= nf rename to tests/networkxmlconfdata/nat-network-dns-srv-record-minimal.conf diff --git a/tests/networkxml2xmlout/nat-network-dns-srv-record-minimal.xml= b/tests/networkxmlconfdata/nat-network-dns-srv-record-minimal.expect.xml similarity index 100% rename from tests/networkxml2xmlout/nat-network-dns-srv-record-minimal.xml rename to tests/networkxmlconfdata/nat-network-dns-srv-record-minimal.expec= t.xml diff --git a/tests/networkxml2confdata/nat-network-dns-srv-record-minimal.h= ostsfile b/tests/networkxmlconfdata/nat-network-dns-srv-record-minimal.host= sfile similarity index 100% rename from tests/networkxml2confdata/nat-network-dns-srv-record-minimal.ho= stsfile rename to tests/networkxmlconfdata/nat-network-dns-srv-record-minimal.hosts= file diff --git a/tests/networkxml2confdata/nat-network-dns-srv-record-minimal.x= ml b/tests/networkxmlconfdata/nat-network-dns-srv-record-minimal.xml similarity index 100% rename from tests/networkxml2confdata/nat-network-dns-srv-record-minimal.xml rename to tests/networkxmlconfdata/nat-network-dns-srv-record-minimal.xml diff --git a/tests/networkxml2confdata/nat-network-dns-srv-record.conf b/te= sts/networkxmlconfdata/nat-network-dns-srv-record.conf similarity index 100% rename from tests/networkxml2confdata/nat-network-dns-srv-record.conf rename to tests/networkxmlconfdata/nat-network-dns-srv-record.conf diff --git a/tests/networkxml2xmlout/nat-network-dns-srv-record.xml b/tests= /networkxmlconfdata/nat-network-dns-srv-record.expect.xml similarity index 100% rename from tests/networkxml2xmlout/nat-network-dns-srv-record.xml rename to tests/networkxmlconfdata/nat-network-dns-srv-record.expect.xml diff --git a/tests/networkxml2confdata/nat-network-dns-srv-record.hostsfile= b/tests/networkxmlconfdata/nat-network-dns-srv-record.hostsfile similarity index 100% rename from tests/networkxml2confdata/nat-network-dns-srv-record.hostsfile rename to tests/networkxmlconfdata/nat-network-dns-srv-record.hostsfile diff --git a/tests/networkxml2confdata/nat-network-dns-srv-record.xml b/tes= ts/networkxmlconfdata/nat-network-dns-srv-record.xml similarity index 100% rename from tests/networkxml2confdata/nat-network-dns-srv-record.xml rename to tests/networkxmlconfdata/nat-network-dns-srv-record.xml diff --git a/tests/networkxml2confdata/nat-network-dns-srv-records.conf b/t= ests/networkxmlconfdata/nat-network-dns-srv-records.conf similarity index 100% rename from tests/networkxml2confdata/nat-network-dns-srv-records.conf rename to tests/networkxmlconfdata/nat-network-dns-srv-records.conf diff --git a/tests/networkxml2xmlout/nat-network-dns-srv-records.xml b/test= s/networkxmlconfdata/nat-network-dns-srv-records.expect.xml similarity index 100% rename from tests/networkxml2xmlout/nat-network-dns-srv-records.xml rename to tests/networkxmlconfdata/nat-network-dns-srv-records.expect.xml diff --git a/tests/networkxml2confdata/nat-network-dns-srv-records.hostsfil= e b/tests/networkxmlconfdata/nat-network-dns-srv-records.hostsfile similarity index 100% rename from tests/networkxml2confdata/nat-network-dns-srv-records.hostsfile rename to tests/networkxmlconfdata/nat-network-dns-srv-records.hostsfile diff --git a/tests/networkxml2xmlin/nat-network-dns-srv-records.xml b/tests= /networkxmlconfdata/nat-network-dns-srv-records.xml similarity index 100% rename from tests/networkxml2xmlin/nat-network-dns-srv-records.xml rename to tests/networkxmlconfdata/nat-network-dns-srv-records.xml diff --git a/tests/networkxml2confdata/nat-network-dns-txt-record.conf b/te= sts/networkxmlconfdata/nat-network-dns-txt-record.conf similarity index 100% rename from tests/networkxml2confdata/nat-network-dns-txt-record.conf rename to tests/networkxmlconfdata/nat-network-dns-txt-record.conf diff --git a/tests/networkxml2xmlout/nat-network-dns-txt-record.xml b/tests= /networkxmlconfdata/nat-network-dns-txt-record.expect.xml similarity index 100% rename from tests/networkxml2xmlout/nat-network-dns-txt-record.xml rename to tests/networkxmlconfdata/nat-network-dns-txt-record.expect.xml diff --git a/tests/networkxml2confdata/nat-network-dns-txt-record.hostsfile= b/tests/networkxmlconfdata/nat-network-dns-txt-record.hostsfile similarity index 100% rename from tests/networkxml2confdata/nat-network-dns-txt-record.hostsfile rename to tests/networkxmlconfdata/nat-network-dns-txt-record.hostsfile diff --git a/tests/networkxml2confdata/nat-network-dns-txt-record.xml b/tes= ts/networkxmlconfdata/nat-network-dns-txt-record.xml similarity index 100% rename from tests/networkxml2confdata/nat-network-dns-txt-record.xml rename to tests/networkxmlconfdata/nat-network-dns-txt-record.xml diff --git a/tests/networkxml2confdata/nat-network-explicit-flood.conf b/te= sts/networkxmlconfdata/nat-network-explicit-flood.conf similarity index 100% rename from tests/networkxml2confdata/nat-network-explicit-flood.conf rename to tests/networkxmlconfdata/nat-network-explicit-flood.conf diff --git a/tests/networkxml2xmlout/nat-network-explicit-flood.xml b/tests= /networkxmlconfdata/nat-network-explicit-flood.expect.xml similarity index 100% rename from tests/networkxml2xmlout/nat-network-explicit-flood.xml rename to tests/networkxmlconfdata/nat-network-explicit-flood.expect.xml diff --git a/tests/networkxml2confdata/nat-network-explicit-flood.hostsfile= b/tests/networkxmlconfdata/nat-network-explicit-flood.hostsfile similarity index 100% rename from tests/networkxml2confdata/nat-network-explicit-flood.hostsfile rename to tests/networkxmlconfdata/nat-network-explicit-flood.hostsfile diff --git a/tests/networkxml2xmlin/nat-network-explicit-flood.xml b/tests/= networkxmlconfdata/nat-network-explicit-flood.xml similarity index 100% rename from tests/networkxml2xmlin/nat-network-explicit-flood.xml rename to tests/networkxmlconfdata/nat-network-explicit-flood.xml diff --git a/tests/networkxml2confdata/nat-network-forward-nat-address.conf= b/tests/networkxmlconfdata/nat-network-forward-nat-address.conf similarity index 100% rename from tests/networkxml2confdata/nat-network-forward-nat-address.conf rename to tests/networkxmlconfdata/nat-network-forward-nat-address.conf diff --git a/tests/networkxml2xmlout/nat-network-forward-nat-address.xml b/= tests/networkxmlconfdata/nat-network-forward-nat-address.expect.xml similarity index 100% rename from tests/networkxml2xmlout/nat-network-forward-nat-address.xml rename to tests/networkxmlconfdata/nat-network-forward-nat-address.expect.x= ml diff --git a/tests/networkxml2confdata/nat-network-forward-nat-address.host= sfile b/tests/networkxmlconfdata/nat-network-forward-nat-address.hostsfile similarity index 100% rename from tests/networkxml2confdata/nat-network-forward-nat-address.hosts= file rename to tests/networkxmlconfdata/nat-network-forward-nat-address.hostsfile diff --git a/tests/networkxml2xmlin/nat-network-forward-nat-address.xml b/t= ests/networkxmlconfdata/nat-network-forward-nat-address.xml similarity index 100% rename from tests/networkxml2xmlin/nat-network-forward-nat-address.xml rename to tests/networkxmlconfdata/nat-network-forward-nat-address.xml diff --git a/tests/networkxml2confdata/nat-network-forward-nat-ipv6.conf b/= tests/networkxmlconfdata/nat-network-forward-nat-ipv6.conf similarity index 100% rename from tests/networkxml2confdata/nat-network-forward-nat-ipv6.conf rename to tests/networkxmlconfdata/nat-network-forward-nat-ipv6.conf diff --git a/tests/networkxml2xmlout/nat-network-forward-nat-ipv6.xml b/tes= ts/networkxmlconfdata/nat-network-forward-nat-ipv6.expect.xml similarity index 100% rename from tests/networkxml2xmlout/nat-network-forward-nat-ipv6.xml rename to tests/networkxmlconfdata/nat-network-forward-nat-ipv6.expect.xml diff --git a/tests/networkxml2xmlin/nat-network-forward-nat-ipv6.xml b/test= s/networkxmlconfdata/nat-network-forward-nat-ipv6.xml similarity index 100% rename from tests/networkxml2xmlin/nat-network-forward-nat-ipv6.xml rename to tests/networkxmlconfdata/nat-network-forward-nat-ipv6.xml diff --git a/tests/networkxml2confdata/nat-network-forward-nat-no-address.c= onf b/tests/networkxmlconfdata/nat-network-forward-nat-no-address.conf similarity index 100% rename from tests/networkxml2confdata/nat-network-forward-nat-no-address.co= nf rename to tests/networkxmlconfdata/nat-network-forward-nat-no-address.conf diff --git a/tests/networkxml2xmlout/nat-network-forward-nat-no-address.xml= b/tests/networkxmlconfdata/nat-network-forward-nat-no-address.expect.xml similarity index 100% rename from tests/networkxml2xmlout/nat-network-forward-nat-no-address.xml rename to tests/networkxmlconfdata/nat-network-forward-nat-no-address.expec= t.xml diff --git a/tests/networkxml2confdata/nat-network-forward-nat-no-address.h= ostsfile b/tests/networkxmlconfdata/nat-network-forward-nat-no-address.host= sfile similarity index 100% rename from tests/networkxml2confdata/nat-network-forward-nat-no-address.ho= stsfile rename to tests/networkxmlconfdata/nat-network-forward-nat-no-address.hosts= file diff --git a/tests/networkxml2xmlin/nat-network-forward-nat-no-address.xml = b/tests/networkxmlconfdata/nat-network-forward-nat-no-address.xml similarity index 100% rename from tests/networkxml2xmlin/nat-network-forward-nat-no-address.xml rename to tests/networkxmlconfdata/nat-network-forward-nat-no-address.xml diff --git a/tests/networkxml2confdata/nat-network-mtu.conf b/tests/network= xmlconfdata/nat-network-mtu.conf similarity index 100% rename from tests/networkxml2confdata/nat-network-mtu.conf rename to tests/networkxmlconfdata/nat-network-mtu.conf diff --git a/tests/networkxml2xmlout/nat-network-mtu.xml b/tests/networkxml= confdata/nat-network-mtu.expect.xml similarity index 100% rename from tests/networkxml2xmlout/nat-network-mtu.xml rename to tests/networkxmlconfdata/nat-network-mtu.expect.xml diff --git a/tests/networkxml2confdata/nat-network-mtu.hostsfile b/tests/ne= tworkxmlconfdata/nat-network-mtu.hostsfile similarity index 100% rename from tests/networkxml2confdata/nat-network-mtu.hostsfile rename to tests/networkxmlconfdata/nat-network-mtu.hostsfile diff --git a/tests/networkxml2xmlin/nat-network-mtu.xml b/tests/networkxmlc= onfdata/nat-network-mtu.xml similarity index 100% rename from tests/networkxml2xmlin/nat-network-mtu.xml rename to tests/networkxmlconfdata/nat-network-mtu.xml diff --git a/tests/networkxml2confdata/nat-network-name-with-quotes.conf b/= tests/networkxmlconfdata/nat-network-name-with-quotes.conf similarity index 100% rename from tests/networkxml2confdata/nat-network-name-with-quotes.conf rename to tests/networkxmlconfdata/nat-network-name-with-quotes.conf diff --git a/tests/networkxml2xmlout/nat-network-name-with-quotes.xml b/tes= ts/networkxmlconfdata/nat-network-name-with-quotes.expect.xml similarity index 100% rename from tests/networkxml2xmlout/nat-network-name-with-quotes.xml rename to tests/networkxmlconfdata/nat-network-name-with-quotes.expect.xml diff --git a/tests/networkxml2confdata/nat-network-name-with-quotes.hostsfi= le b/tests/networkxmlconfdata/nat-network-name-with-quotes.hostsfile similarity index 100% rename from tests/networkxml2confdata/nat-network-name-with-quotes.hostsfile rename to tests/networkxmlconfdata/nat-network-name-with-quotes.hostsfile diff --git a/tests/networkxml2confdata/nat-network-name-with-quotes.xml b/t= ests/networkxmlconfdata/nat-network-name-with-quotes.xml similarity index 100% rename from tests/networkxml2confdata/nat-network-name-with-quotes.xml rename to tests/networkxmlconfdata/nat-network-name-with-quotes.xml diff --git a/tests/networkxml2confdata/nat-network.conf b/tests/networkxmlc= onfdata/nat-network.conf similarity index 100% rename from tests/networkxml2confdata/nat-network.conf rename to tests/networkxmlconfdata/nat-network.conf diff --git a/tests/networkxml2xmlout/nat-network.xml b/tests/networkxmlconf= data/nat-network.expect.xml similarity index 100% rename from tests/networkxml2xmlout/nat-network.xml rename to tests/networkxmlconfdata/nat-network.expect.xml diff --git a/tests/networkxml2confdata/nat-network.hostsfile b/tests/networ= kxmlconfdata/nat-network.hostsfile similarity index 100% rename from tests/networkxml2confdata/nat-network.hostsfile rename to tests/networkxmlconfdata/nat-network.hostsfile diff --git a/tests/networkxml2xmlin/nat-network.xml b/tests/networkxmlconfd= ata/nat-network.xml similarity index 100% rename from tests/networkxml2xmlin/nat-network.xml rename to tests/networkxmlconfdata/nat-network.xml diff --git a/tests/networkxml2confdata/netboot-network.conf b/tests/network= xmlconfdata/netboot-network.conf similarity index 100% rename from tests/networkxml2confdata/netboot-network.conf rename to tests/networkxmlconfdata/netboot-network.conf diff --git a/tests/networkxml2xmlout/netboot-network.xml b/tests/networkxml= confdata/netboot-network.expect.xml similarity index 100% rename from tests/networkxml2xmlout/netboot-network.xml rename to tests/networkxmlconfdata/netboot-network.expect.xml diff --git a/tests/networkxml2xmlin/netboot-network.xml b/tests/networkxmlc= onfdata/netboot-network.xml similarity index 100% rename from tests/networkxml2xmlin/netboot-network.xml rename to tests/networkxmlconfdata/netboot-network.xml diff --git a/tests/networkxml2confdata/netboot-proxy-network.conf b/tests/n= etworkxmlconfdata/netboot-proxy-network.conf similarity index 100% rename from tests/networkxml2confdata/netboot-proxy-network.conf rename to tests/networkxmlconfdata/netboot-proxy-network.conf diff --git a/tests/networkxml2xmlout/netboot-proxy-network.xml b/tests/netw= orkxmlconfdata/netboot-proxy-network.expect.xml similarity index 100% rename from tests/networkxml2xmlout/netboot-proxy-network.xml rename to tests/networkxmlconfdata/netboot-proxy-network.expect.xml diff --git a/tests/networkxml2xmlin/netboot-proxy-network.xml b/tests/netwo= rkxmlconfdata/netboot-proxy-network.xml similarity index 100% rename from tests/networkxml2xmlin/netboot-proxy-network.xml rename to tests/networkxmlconfdata/netboot-proxy-network.xml diff --git a/tests/networkxml2confdata/netboot-tftp.conf b/tests/networkxml= confdata/netboot-tftp.conf similarity index 100% rename from tests/networkxml2confdata/netboot-tftp.conf rename to tests/networkxmlconfdata/netboot-tftp.conf diff --git a/tests/networkxmlconfdata/netboot-tftp.expect.xml b/tests/netwo= rkxmlconfdata/netboot-tftp.expect.xml new file mode 120000 index 0000000000..eb3b28de25 --- /dev/null +++ b/tests/networkxmlconfdata/netboot-tftp.expect.xml @@ -0,0 +1 @@ +netboot-tftp.xml \ No newline at end of file diff --git a/tests/networkxml2confdata/netboot-tftp.xml b/tests/networkxmlc= onfdata/netboot-tftp.xml similarity index 100% rename from tests/networkxml2confdata/netboot-tftp.xml rename to tests/networkxmlconfdata/netboot-tftp.xml diff --git a/tests/networkxml2xmlin/open-network-with-forward-dev.xml b/tes= ts/networkxmlconfdata/open-network-with-forward-dev.xml similarity index 100% rename from tests/networkxml2xmlin/open-network-with-forward-dev.xml rename to tests/networkxmlconfdata/open-network-with-forward-dev.xml diff --git a/tests/networkxml2confdata/open-network.conf b/tests/networkxml= confdata/open-network.conf similarity index 100% rename from tests/networkxml2confdata/open-network.conf rename to tests/networkxmlconfdata/open-network.conf diff --git a/tests/networkxml2xmlout/open-network.xml b/tests/networkxmlcon= fdata/open-network.expect.xml similarity index 100% rename from tests/networkxml2xmlout/open-network.xml rename to tests/networkxmlconfdata/open-network.expect.xml diff --git a/tests/networkxml2xmlin/open-network.xml b/tests/networkxmlconf= data/open-network.xml similarity index 100% rename from tests/networkxml2xmlin/open-network.xml rename to tests/networkxmlconfdata/open-network.xml diff --git a/tests/networkxml2xmlin/openvswitch-net.xml b/tests/networkxmlc= onfdata/openvswitch-net.expect.xml similarity index 100% rename from tests/networkxml2xmlin/openvswitch-net.xml rename to tests/networkxmlconfdata/openvswitch-net.expect.xml diff --git a/tests/networkxml2xmlout/openvswitch-net.xml b/tests/networkxml= confdata/openvswitch-net.xml similarity index 100% rename from tests/networkxml2xmlout/openvswitch-net.xml rename to tests/networkxmlconfdata/openvswitch-net.xml diff --git a/tests/networkxml2xmlin/passthrough-address-crash.xml b/tests/n= etworkxmlconfdata/passthrough-address-crash.xml similarity index 100% rename from tests/networkxml2xmlin/passthrough-address-crash.xml rename to tests/networkxmlconfdata/passthrough-address-crash.xml diff --git a/tests/networkxml2xmlin/passthrough-duplicate.xml b/tests/netwo= rkxmlconfdata/passthrough-duplicate.xml similarity index 100% rename from tests/networkxml2xmlin/passthrough-duplicate.xml rename to tests/networkxmlconfdata/passthrough-duplicate.xml diff --git a/tests/networkxml2confdata/passthrough-pf.conf b/tests/networkx= mlconfdata/passthrough-pf.conf similarity index 100% rename from tests/networkxml2confdata/passthrough-pf.conf rename to tests/networkxmlconfdata/passthrough-pf.conf diff --git a/tests/networkxml2xmlin/passthrough-pf.xml b/tests/networkxmlco= nfdata/passthrough-pf.xml similarity index 100% rename from tests/networkxml2xmlin/passthrough-pf.xml rename to tests/networkxmlconfdata/passthrough-pf.xml diff --git a/tests/networkxml2confdata/ptr-domains-auto.conf b/tests/networ= kxmlconfdata/ptr-domains-auto.conf similarity index 100% rename from tests/networkxml2confdata/ptr-domains-auto.conf rename to tests/networkxmlconfdata/ptr-domains-auto.conf diff --git a/tests/networkxml2xmlout/ptr-domains-auto.xml b/tests/networkxm= lconfdata/ptr-domains-auto.expect.xml similarity index 100% rename from tests/networkxml2xmlout/ptr-domains-auto.xml rename to tests/networkxmlconfdata/ptr-domains-auto.expect.xml diff --git a/tests/networkxml2confdata/ptr-domains-auto.hostsfile b/tests/n= etworkxmlconfdata/ptr-domains-auto.hostsfile similarity index 100% rename from tests/networkxml2confdata/ptr-domains-auto.hostsfile rename to tests/networkxmlconfdata/ptr-domains-auto.hostsfile diff --git a/tests/networkxml2confdata/ptr-domains-auto.xml b/tests/network= xmlconfdata/ptr-domains-auto.xml similarity index 100% rename from tests/networkxml2confdata/ptr-domains-auto.xml rename to tests/networkxmlconfdata/ptr-domains-auto.xml diff --git a/tests/networkxml2xmlin/routed-network-no-dns-extra-elements.xm= l b/tests/networkxmlconfdata/routed-network-no-dns-extra-elements.xml similarity index 100% rename from tests/networkxml2xmlin/routed-network-no-dns-extra-elements.xml rename to tests/networkxmlconfdata/routed-network-no-dns-extra-elements.xml diff --git a/tests/networkxml2xmlout/routed-network-no-dns.xml b/tests/netw= orkxmlconfdata/routed-network-no-dns.expect.xml similarity index 100% rename from tests/networkxml2xmlout/routed-network-no-dns.xml rename to tests/networkxmlconfdata/routed-network-no-dns.expect.xml diff --git a/tests/networkxml2xmlin/routed-network-no-dns.xml b/tests/netwo= rkxmlconfdata/routed-network-no-dns.xml similarity index 100% rename from tests/networkxml2xmlin/routed-network-no-dns.xml rename to tests/networkxmlconfdata/routed-network-no-dns.xml diff --git a/tests/networkxml2confdata/routed-network.conf b/tests/networkx= mlconfdata/routed-network.conf similarity index 100% rename from tests/networkxml2confdata/routed-network.conf rename to tests/networkxmlconfdata/routed-network.conf diff --git a/tests/networkxml2xmlout/routed-network.xml b/tests/networkxmlc= onfdata/routed-network.expect.xml similarity index 100% rename from tests/networkxml2xmlout/routed-network.xml rename to tests/networkxmlconfdata/routed-network.expect.xml diff --git a/tests/networkxml2xmlin/routed-network.xml b/tests/networkxmlco= nfdata/routed-network.xml similarity index 100% rename from tests/networkxml2xmlin/routed-network.xml rename to tests/networkxmlconfdata/routed-network.xml diff --git a/tests/networkxml2confdata/set-mtu.conf b/tests/networkxmlconfd= ata/set-mtu.conf similarity index 100% rename from tests/networkxml2confdata/set-mtu.conf rename to tests/networkxmlconfdata/set-mtu.conf diff --git a/tests/networkxml2xmlout/set-mtu.xml b/tests/networkxmlconfdata= /set-mtu.expect.xml similarity index 100% rename from tests/networkxml2xmlout/set-mtu.xml rename to tests/networkxmlconfdata/set-mtu.expect.xml diff --git a/tests/networkxml2xmlin/set-mtu.xml b/tests/networkxmlconfdata/= set-mtu.xml similarity index 100% rename from tests/networkxml2xmlin/set-mtu.xml rename to tests/networkxmlconfdata/set-mtu.xml diff --git a/tests/networkxml2xmlout/vepa-net.xml b/tests/networkxmlconfdat= a/vepa-net.expect.xml similarity index 100% rename from tests/networkxml2xmlout/vepa-net.xml rename to tests/networkxmlconfdata/vepa-net.expect.xml diff --git a/tests/networkxml2xmlin/vepa-net.xml b/tests/networkxmlconfdata= /vepa-net.xml similarity index 100% rename from tests/networkxml2xmlin/vepa-net.xml rename to tests/networkxmlconfdata/vepa-net.xml diff --git a/tests/networkxml2xmltest.c b/tests/networkxmlconftest.c similarity index 96% rename from tests/networkxml2xmltest.c rename to tests/networkxmlconftest.c index 1d897c1fe4..69a060c57d 100644 --- a/tests/networkxml2xmltest.c +++ b/tests/networkxmlconftest.c @@ -241,11 +241,10 @@ testRun(const char *name, info->expectResult =3D expectResult; info->xmlopt =3D xmlopt; info->caps =3D caps; - info->inxml =3D g_strdup_printf("%s/networkxml2xmlin/%s.xml", abs_srcd= ir, name); - info->outxml =3D g_strdup_printf("%s/networkxml2xmlout/%s.xml", abs_sr= cdir, name); - /* Temporarily use conf files from networkxml2confdata/ */ - info->outconf =3D g_strdup_printf("%s/networkxml2confdata/%s.conf", ab= s_srcdir, name); - info->outhostsfile =3D g_strdup_printf("%s/networkxml2confdata/%s.host= sfile", abs_srcdir, name); + info->inxml =3D g_strdup_printf("%s/networkxmlconfdata/%s.xml", abs_sr= cdir, name); + info->outxml =3D g_strdup_printf("%s/networkxmlconfdata/%s.expect.xml"= , abs_srcdir, name); + info->outconf =3D g_strdup_printf("%s/networkxmlconfdata/%s.conf", abs= _srcdir, name); + info->outhostsfile =3D g_strdup_printf("%s/networkxmlconfdata/%s.hosts= file", abs_srcdir, name); =20 virTestRunLog(ret, name_xml2xml, testCompareXMLToXMLFiles, info); =20 diff --git a/tests/qemuxmlconftest.c b/tests/qemuxmlconftest.c index 6f1f816cba..486d3d47ec 100644 --- a/tests/qemuxmlconftest.c +++ b/tests/qemuxmlconftest.c @@ -263,7 +263,7 @@ static virNWFilterDriver fakeNWFilterDriver =3D { /* name of the fake network shall be constructed as: * NETWORKXMLNAME;NETWORKPORTXMLNAME * where: - * NETWORKXMLNAME resolves to abs_srcdir/networkxml2xmlin/NETWORKXMLNAME.= xml + * NETWORKXMLNAME resolves to abs_srcdir/networkxmlconfdata/NETWORKXMLNAM= E.xml * NETWORKPORTXMLNAME resolves to abs_srcdir/virnetworkportxml2xmldata/NE= TWORKPORTXMLNAME.xml */ static virNetworkPtr @@ -286,7 +286,7 @@ fakeNetworkLookupByName(virConnectPtr conn, return NULL; } =20 - path =3D g_strdup_printf(abs_srcdir "/networkxml2xmlin/%s.xml", netnam= e); + path =3D g_strdup_printf(abs_srcdir "/networkxmlconfdata/%s.xml", netn= ame); =20 if (!virFileExists(path)) { virReportError(VIR_ERR_NO_NETWORK, "fake network '%s' not found", = path); @@ -307,7 +307,7 @@ fakeNetworkGetXMLDesc(virNetworkPtr network, =20 *(strchr(netname, ';')) =3D '\0'; =20 - path =3D g_strdup_printf(abs_srcdir "/networkxml2xmlin/%s.xml", netnam= e); + path =3D g_strdup_printf(abs_srcdir "/networkxmlconfdata/%s.xml", netn= ame); =20 if (virFileReadAll(path, 4 * 1024, &xml) < 0) return NULL; diff --git a/tests/virschematest.c b/tests/virschematest.c index 57a49c270c..4faac8d976 100644 --- a/tests/virschematest.c +++ b/tests/virschematest.c @@ -303,9 +303,7 @@ static const struct testSchemaEntry schemaInterface[] = =3D { =20 static const struct testSchemaEntry schemaNetwork[] =3D { { .dir =3D "src/network" }, - { .dir =3D "tests/networkxml2xmlin" }, - { .dir =3D "tests/networkxml2xmlout" }, - { .dir =3D "tests/networkxml2confdata" }, + { .dir =3D "tests/networkxmlconfdata" }, { .dir =3D "examples/xml/test/", .dirRegex =3D "testnet.*" }, { .dir =3D "tests/networkxml2xmlupdateout" }, --=20 2.52.0