From: Michal Privoznik <[email protected]> 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 <[email protected]> --- 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 => 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-resolv.xml delete mode 100644 tests/networkxml2xmlin/nat-network-dns-local-domain.xml delete mode 100644 tests/networkxml2xmlin/nat-network-dns-srv-record-minimal.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 => networkxmlconfdata/8021Qbh-net.expect.xml} (100%) rename tests/{networkxml2xmlin => networkxmlconfdata}/8021Qbh-net.xml (100%) rename tests/{networkxml2confdata => networkxmlconfdata}/bandwidth-network.conf (100%) rename tests/{networkxml2xmlout/bandwidth-network.xml => networkxmlconfdata/bandwidth-network.expect.xml} (100%) rename tests/{networkxml2xmlin => networkxmlconfdata}/bandwidth-network.xml (100%) rename tests/{networkxml2confdata => networkxmlconfdata}/dhcp6-nat-network.conf (100%) rename tests/{networkxml2xmlout/dhcp6-nat-network.xml => networkxmlconfdata/dhcp6-nat-network.expect.xml} (100%) rename tests/{networkxml2confdata => networkxmlconfdata}/dhcp6-nat-network.hostsfile (100%) rename tests/{networkxml2confdata => networkxmlconfdata}/dhcp6-nat-network.xml (100%) rename tests/{networkxml2confdata => networkxmlconfdata}/dhcp6-network.conf (100%) rename tests/{networkxml2xmlout/dhcp6-network.xml => networkxmlconfdata/dhcp6-network.expect.xml} (100%) rename tests/{networkxml2confdata => networkxmlconfdata}/dhcp6-network.hostsfile (100%) rename tests/{networkxml2confdata => networkxmlconfdata}/dhcp6-network.xml (100%) rename tests/{networkxml2confdata => networkxmlconfdata}/dhcp6host-routed-network.conf (100%) rename tests/{networkxml2xmlout/dhcp6host-routed-network.xml => networkxmlconfdata/dhcp6host-routed-network.expect.xml} (100%) rename tests/{networkxml2confdata => networkxmlconfdata}/dhcp6host-routed-network.hostsfile (100%) rename tests/{networkxml2xmlin => networkxmlconfdata}/dhcp6host-routed-network.xml (100%) rename tests/{networkxml2xmlout/direct-net.xml => networkxmlconfdata/direct-net.expect.xml} (100%) rename tests/{networkxml2xmlin => networkxmlconfdata}/direct-net.xml (100%) rename tests/{networkxml2confdata => networkxmlconfdata}/dnsmasq-options.conf (100%) rename tests/{networkxml2xmlout/dnsmasq-options.xml => networkxmlconfdata/dnsmasq-options.expect.xml} (100%) rename tests/{networkxml2confdata => networkxmlconfdata}/dnsmasq-options.xml (100%) rename tests/{networkxml2xmlout/empty-allow-ipv6.xml => networkxmlconfdata/empty-allow-ipv6.expect.xml} (100%) rename tests/{networkxml2xmlin => networkxmlconfdata}/empty-allow-ipv6.xml (100%) rename tests/{networkxml2xmlout/host-bridge-net.xml => networkxmlconfdata/host-bridge-net.expect.xml} (100%) rename tests/{networkxml2xmlin => networkxmlconfdata}/host-bridge-net.xml (100%) rename tests/{networkxml2xmlout/host-bridge-no-flood.xml => networkxmlconfdata/host-bridge-no-flood.expect.xml} (100%) rename tests/{networkxml2xmlin => networkxmlconfdata}/host-bridge-no-flood.xml (100%) rename tests/{networkxml2xmlin => networkxmlconfdata}/hostdev-duplicate.xml (100%) rename tests/{networkxml2xmlin/hostdev-pf-driver-model.xml => networkxmlconfdata/hostdev-pf-driver-model.expect.xml} (100%) rename tests/{networkxml2xmlout => networkxmlconfdata}/hostdev-pf-driver-model.xml (100%) rename tests/{networkxml2xmlin/hostdev-pf.xml => networkxmlconfdata/hostdev-pf.expect.xml} (100%) rename tests/{networkxml2xmlout => networkxmlconfdata}/hostdev-pf.xml (100%) rename tests/{networkxml2xmlin/hostdev.xml => networkxmlconfdata/hostdev.expect.xml} (100%) rename tests/{networkxml2xmlout => networkxmlconfdata}/hostdev.xml (100%) rename tests/{networkxml2confdata => networkxmlconfdata}/isolated-network.conf (100%) rename tests/{networkxml2xmlout/isolated-network.xml => networkxmlconfdata/isolated-network.expect.xml} (100%) rename tests/{networkxml2xmlin => networkxmlconfdata}/isolated-network.xml (100%) rename tests/{networkxml2xmlout/isolated-ports.xml => networkxmlconfdata/isolated-ports.expect.xml} (100%) rename tests/{networkxml2xmlin => networkxmlconfdata}/isolated-ports.xml (100%) rename tests/{networkxml2confdata => networkxmlconfdata}/leasetime-hours.conf (100%) create mode 120000 tests/networkxmlconfdata/leasetime-hours.expect.xml rename tests/{networkxml2confdata => networkxmlconfdata}/leasetime-hours.hostsfile (100%) rename tests/{networkxml2confdata => networkxmlconfdata}/leasetime-hours.xml (100%) rename tests/{networkxml2confdata => networkxmlconfdata}/leasetime-infinite.conf (100%) create mode 120000 tests/networkxmlconfdata/leasetime-infinite.expect.xml rename tests/{networkxml2confdata => networkxmlconfdata}/leasetime-infinite.hostsfile (100%) rename tests/{networkxml2confdata => networkxmlconfdata}/leasetime-infinite.xml (100%) rename tests/{networkxml2confdata => networkxmlconfdata}/leasetime-minutes.conf (100%) create mode 120000 tests/networkxmlconfdata/leasetime-minutes.expect.xml rename tests/{networkxml2confdata => networkxmlconfdata}/leasetime-minutes.hostsfile (100%) rename tests/{networkxml2confdata => networkxmlconfdata}/leasetime-minutes.xml (100%) rename tests/{networkxml2confdata => networkxmlconfdata}/leasetime-seconds.conf (100%) create mode 120000 tests/networkxmlconfdata/leasetime-seconds.expect.xml rename tests/{networkxml2confdata => networkxmlconfdata}/leasetime-seconds.hostsfile (100%) rename tests/{networkxml2confdata => networkxmlconfdata}/leasetime-seconds.xml (100%) rename tests/{networkxml2xmlout/metadata.xml => networkxmlconfdata/metadata.expect.xml} (100%) rename tests/{networkxml2xmlin => networkxmlconfdata}/metadata.xml (100%) rename tests/{networkxml2confdata => networkxmlconfdata}/nat-network-dns-forward-plain.conf (100%) rename tests/{networkxml2xmlout/nat-network-dns-forward-plain.xml => networkxmlconfdata/nat-network-dns-forward-plain.expect.xml} (100%) rename tests/{networkxml2confdata => networkxmlconfdata}/nat-network-dns-forward-plain.xml (100%) rename tests/{networkxml2confdata => networkxmlconfdata}/nat-network-dns-forwarder-no-resolv.conf (100%) rename tests/{networkxml2xmlout/nat-network-dns-forwarder-no-resolv.xml => networkxmlconfdata/nat-network-dns-forwarder-no-resolv.expect.xml} (100%) rename tests/{networkxml2confdata => networkxmlconfdata}/nat-network-dns-forwarder-no-resolv.xml (100%) rename tests/{networkxml2confdata => networkxmlconfdata}/nat-network-dns-forwarders.conf (100%) rename tests/{networkxml2xmlout/nat-network-dns-forwarders.xml => networkxmlconfdata/nat-network-dns-forwarders.expect.xml} (100%) rename tests/{networkxml2xmlin => networkxmlconfdata}/nat-network-dns-forwarders.xml (100%) rename tests/{networkxml2confdata => networkxmlconfdata}/nat-network-dns-hosts.conf (100%) rename tests/{networkxml2xmlout/nat-network-dns-hosts.xml => networkxmlconfdata/nat-network-dns-hosts.expect.xml} (100%) rename tests/{networkxml2xmlin => networkxmlconfdata}/nat-network-dns-hosts.xml (100%) rename tests/{networkxml2confdata => networkxmlconfdata}/nat-network-dns-local-domain.conf (100%) rename tests/{networkxml2xmlout/nat-network-dns-local-domain.xml => networkxmlconfdata/nat-network-dns-local-domain.expect.xml} (100%) rename tests/{networkxml2confdata => networkxmlconfdata}/nat-network-dns-local-domain.xml (100%) rename tests/{networkxml2confdata => networkxmlconfdata}/nat-network-dns-srv-record-minimal.conf (100%) rename tests/{networkxml2xmlout/nat-network-dns-srv-record-minimal.xml => networkxmlconfdata/nat-network-dns-srv-record-minimal.expect.xml} (100%) rename tests/{networkxml2confdata => networkxmlconfdata}/nat-network-dns-srv-record-minimal.hostsfile (100%) rename tests/{networkxml2confdata => networkxmlconfdata}/nat-network-dns-srv-record-minimal.xml (100%) rename tests/{networkxml2confdata => networkxmlconfdata}/nat-network-dns-srv-record.conf (100%) rename tests/{networkxml2xmlout/nat-network-dns-srv-record.xml => networkxmlconfdata/nat-network-dns-srv-record.expect.xml} (100%) rename tests/{networkxml2confdata => networkxmlconfdata}/nat-network-dns-srv-record.hostsfile (100%) rename tests/{networkxml2confdata => networkxmlconfdata}/nat-network-dns-srv-record.xml (100%) rename tests/{networkxml2confdata => networkxmlconfdata}/nat-network-dns-srv-records.conf (100%) rename tests/{networkxml2xmlout/nat-network-dns-srv-records.xml => networkxmlconfdata/nat-network-dns-srv-records.expect.xml} (100%) rename tests/{networkxml2confdata => networkxmlconfdata}/nat-network-dns-srv-records.hostsfile (100%) rename tests/{networkxml2xmlin => networkxmlconfdata}/nat-network-dns-srv-records.xml (100%) rename tests/{networkxml2confdata => networkxmlconfdata}/nat-network-dns-txt-record.conf (100%) rename tests/{networkxml2xmlout/nat-network-dns-txt-record.xml => networkxmlconfdata/nat-network-dns-txt-record.expect.xml} (100%) rename tests/{networkxml2confdata => networkxmlconfdata}/nat-network-dns-txt-record.hostsfile (100%) rename tests/{networkxml2confdata => networkxmlconfdata}/nat-network-dns-txt-record.xml (100%) rename tests/{networkxml2confdata => networkxmlconfdata}/nat-network-explicit-flood.conf (100%) rename tests/{networkxml2xmlout/nat-network-explicit-flood.xml => networkxmlconfdata/nat-network-explicit-flood.expect.xml} (100%) rename tests/{networkxml2confdata => networkxmlconfdata}/nat-network-explicit-flood.hostsfile (100%) rename tests/{networkxml2xmlin => networkxmlconfdata}/nat-network-explicit-flood.xml (100%) rename tests/{networkxml2confdata => networkxmlconfdata}/nat-network-forward-nat-address.conf (100%) rename tests/{networkxml2xmlout/nat-network-forward-nat-address.xml => networkxmlconfdata/nat-network-forward-nat-address.expect.xml} (100%) rename tests/{networkxml2confdata => networkxmlconfdata}/nat-network-forward-nat-address.hostsfile (100%) rename tests/{networkxml2xmlin => networkxmlconfdata}/nat-network-forward-nat-address.xml (100%) rename tests/{networkxml2confdata => networkxmlconfdata}/nat-network-forward-nat-ipv6.conf (100%) rename tests/{networkxml2xmlout/nat-network-forward-nat-ipv6.xml => networkxmlconfdata/nat-network-forward-nat-ipv6.expect.xml} (100%) rename tests/{networkxml2xmlin => networkxmlconfdata}/nat-network-forward-nat-ipv6.xml (100%) rename tests/{networkxml2confdata => networkxmlconfdata}/nat-network-forward-nat-no-address.conf (100%) rename tests/{networkxml2xmlout/nat-network-forward-nat-no-address.xml => networkxmlconfdata/nat-network-forward-nat-no-address.expect.xml} (100%) rename tests/{networkxml2confdata => networkxmlconfdata}/nat-network-forward-nat-no-address.hostsfile (100%) rename tests/{networkxml2xmlin => networkxmlconfdata}/nat-network-forward-nat-no-address.xml (100%) rename tests/{networkxml2confdata => networkxmlconfdata}/nat-network-mtu.conf (100%) rename tests/{networkxml2xmlout/nat-network-mtu.xml => networkxmlconfdata/nat-network-mtu.expect.xml} (100%) rename tests/{networkxml2confdata => networkxmlconfdata}/nat-network-mtu.hostsfile (100%) rename tests/{networkxml2xmlin => networkxmlconfdata}/nat-network-mtu.xml (100%) rename tests/{networkxml2confdata => networkxmlconfdata}/nat-network-name-with-quotes.conf (100%) rename tests/{networkxml2xmlout/nat-network-name-with-quotes.xml => networkxmlconfdata/nat-network-name-with-quotes.expect.xml} (100%) rename tests/{networkxml2confdata => networkxmlconfdata}/nat-network-name-with-quotes.hostsfile (100%) rename tests/{networkxml2confdata => networkxmlconfdata}/nat-network-name-with-quotes.xml (100%) rename tests/{networkxml2confdata => networkxmlconfdata}/nat-network.conf (100%) rename tests/{networkxml2xmlout/nat-network.xml => networkxmlconfdata/nat-network.expect.xml} (100%) rename tests/{networkxml2confdata => networkxmlconfdata}/nat-network.hostsfile (100%) rename tests/{networkxml2xmlin => networkxmlconfdata}/nat-network.xml (100%) rename tests/{networkxml2confdata => networkxmlconfdata}/netboot-network.conf (100%) rename tests/{networkxml2xmlout/netboot-network.xml => networkxmlconfdata/netboot-network.expect.xml} (100%) rename tests/{networkxml2xmlin => networkxmlconfdata}/netboot-network.xml (100%) rename tests/{networkxml2confdata => networkxmlconfdata}/netboot-proxy-network.conf (100%) rename tests/{networkxml2xmlout/netboot-proxy-network.xml => networkxmlconfdata/netboot-proxy-network.expect.xml} (100%) rename tests/{networkxml2xmlin => networkxmlconfdata}/netboot-proxy-network.xml (100%) rename tests/{networkxml2confdata => networkxmlconfdata}/netboot-tftp.conf (100%) create mode 120000 tests/networkxmlconfdata/netboot-tftp.expect.xml rename tests/{networkxml2confdata => networkxmlconfdata}/netboot-tftp.xml (100%) rename tests/{networkxml2xmlin => networkxmlconfdata}/open-network-with-forward-dev.xml (100%) rename tests/{networkxml2confdata => networkxmlconfdata}/open-network.conf (100%) rename tests/{networkxml2xmlout/open-network.xml => networkxmlconfdata/open-network.expect.xml} (100%) rename tests/{networkxml2xmlin => networkxmlconfdata}/open-network.xml (100%) rename tests/{networkxml2xmlin/openvswitch-net.xml => networkxmlconfdata/openvswitch-net.expect.xml} (100%) rename tests/{networkxml2xmlout => networkxmlconfdata}/openvswitch-net.xml (100%) rename tests/{networkxml2xmlin => networkxmlconfdata}/passthrough-address-crash.xml (100%) rename tests/{networkxml2xmlin => networkxmlconfdata}/passthrough-duplicate.xml (100%) rename tests/{networkxml2confdata => networkxmlconfdata}/passthrough-pf.conf (100%) rename tests/{networkxml2xmlin => networkxmlconfdata}/passthrough-pf.xml (100%) rename tests/{networkxml2confdata => networkxmlconfdata}/ptr-domains-auto.conf (100%) rename tests/{networkxml2xmlout/ptr-domains-auto.xml => networkxmlconfdata/ptr-domains-auto.expect.xml} (100%) rename tests/{networkxml2confdata => networkxmlconfdata}/ptr-domains-auto.hostsfile (100%) rename tests/{networkxml2confdata => networkxmlconfdata}/ptr-domains-auto.xml (100%) rename tests/{networkxml2xmlin => networkxmlconfdata}/routed-network-no-dns-extra-elements.xml (100%) rename tests/{networkxml2xmlout/routed-network-no-dns.xml => networkxmlconfdata/routed-network-no-dns.expect.xml} (100%) rename tests/{networkxml2xmlin => networkxmlconfdata}/routed-network-no-dns.xml (100%) rename tests/{networkxml2confdata => networkxmlconfdata}/routed-network.conf (100%) rename tests/{networkxml2xmlout/routed-network.xml => networkxmlconfdata/routed-network.expect.xml} (100%) rename tests/{networkxml2xmlin => networkxmlconfdata}/routed-network.xml (100%) rename tests/{networkxml2confdata => networkxmlconfdata}/set-mtu.conf (100%) rename tests/{networkxml2xmlout/set-mtu.xml => networkxmlconfdata/set-mtu.expect.xml} (100%) rename tests/{networkxml2xmlin => networkxmlconfdata}/set-mtu.xml (100%) rename tests/{networkxml2xmlout/vepa-net.xml => networkxmlconfdata/vepa-net.expect.xml} (100%) rename tests/{networkxml2xmlin => networkxmlconfdata}/vepa-net.xml (100%) rename tests/{networkxml2xmltest.c => 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, /* create dnsmasq config file appropriate for this network */ - /* 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 += [ { '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 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 @@ -<network> - <name>local</name> - <uuid>81ff0d90-c91e-6742-64da-4a736edb9a9b</uuid> - <forward dev='eth1' mode='route'/> - <bridge name='virbr1' stp='on' delay='0'/> - <mac address='12:34:56:78:9A:BC'/> - <ip address='192.168.122.1' netmask='255.255.255.0'> - <dhcp> - <host mac='00:16:3e:77:e2:ed' name='a.example.com' ip='192.168.122.10'/> - <host mac='00:16:3e:3e:a9:1a' name='b.example.com' ip='192.168.122.11'/> - </dhcp> - </ip> - <ip family='ipv6' address='2001:db8:ac10:fd01::1' prefix='64'> - <dhcp> - <host id='0:4:7e:7d:f0:7d:a8:bc:c5:d2:13:32:11:ed:16:ea:84:63' ip='2001:db8:ac10:fd01::1:20'/> - <host name='paul' ip='2001:db8:ac10:fd01::1:21'/> - <host id='0:3:0:1:0:16:3e:11:22:33' name='peter.xyz' ip='2001:db8:ac10:fd01::1:22'/> - <host id='0:3:0:1:0:16:3e:44:55:33' ip='2001:db8:ac10:fd01::1:23'/> - <host id='0:1:0:1:18:aa:62:fe:0:16:3e:44:55:66' name='badbob' ip='2001:db8:ac10:fd01::1:24'/> - </dhcp> - </ip> -</network> diff --git a/tests/networkxml2confdata/isolated-network.xml b/tests/networkxml2confdata/isolated-network.xml deleted file mode 100644 index b22d4ea775..0000000000 --- a/tests/networkxml2confdata/isolated-network.xml +++ /dev/null @@ -1,11 +0,0 @@ -<network> - <name>private</name> - <uuid>81ff0d90-c91e-6742-64da-4a736edb9a9b</uuid> - <bridge name='virbr2' stp='on' delay='0'/> - <mac address='52:54:00:17:3F:37'/> - <ip address='192.168.152.1' netmask='255.255.255.0'> - <dhcp> - <range start='192.168.152.2' end='192.168.152.254'/> - </dhcp> - </ip> -</network> diff --git a/tests/networkxml2confdata/nat-network-dns-forwarders.xml b/tests/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 @@ -<network> - <name>default</name> - <uuid>81ff0d90-c91e-6742-64da-4a736edb9a9c</uuid> - <forward dev='eth0' mode='nat'/> - <bridge name='virbr0' stp='on' delay='0'/> - <dns> - <forwarder addr='8.8.8.8'/> - <forwarder addr='8.8.4.4'/> - <forwarder domain='example.com' addr='192.168.1.1'/> - <forwarder domain='example2.com' addr='192.168.2.1' port='1234'/> - <forwarder domain='www.example.com'/> - </dns> - <ip address='192.168.122.1' netmask='255.255.255.0'> - </ip> -</network> diff --git a/tests/networkxml2confdata/nat-network-dns-hosts.xml b/tests/networkxml2confdata/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 @@ -<network> - <name>default</name> - <uuid>81ff0d90-c91e-6742-64da-4a736edb9a9c</uuid> - <forward dev='eth0' mode='nat'/> - <bridge name='virbr0' stp='on' delay='0'/> - <domain name="example.com"/> - <dns forwardPlainNames='no'> - <host ip='192.168.122.1'> - <hostname>host</hostname> - <hostname>gateway</hostname> - </host> - </dns> - <ip address='192.168.122.1' netmask='255.255.255.0'> - </ip> -</network> diff --git a/tests/networkxml2confdata/nat-network-mtu.xml b/tests/networkxml2confdata/nat-network-mtu.xml deleted file mode 100644 index 87b214e95c..0000000000 --- a/tests/networkxml2confdata/nat-network-mtu.xml +++ /dev/null @@ -1,22 +0,0 @@ -<network> - <name>default</name> - <uuid>81ff0d90-c91e-6742-64da-4a736edb9a9b</uuid> - <forward dev='eth1' mode='nat'/> - <bridge name='virbr0' stp='on' delay='0'/> - <mtu size='7000'/> - <ip address='192.168.122.1' netmask='255.255.255.0'> - <dhcp> - <range start='192.168.122.2' end='192.168.122.254'/> - <host mac='00:16:3e:77:e2:ed' name='a.example.com' ip='192.168.122.10'/> - <host mac='00:16:3e:3e:a9:1a' name='b.example.com' ip='192.168.122.11'/> - </dhcp> - </ip> - <ip family='ipv4' address='192.168.123.1' netmask='255.255.255.0'> - </ip> - <ip family='ipv6' address='2001:db8:ac10:fe01::1' prefix='64'> - </ip> - <ip family='ipv6' address='2001:db8:ac10:fd01::1' prefix='64'> - </ip> - <ip family='ipv4' address='10.24.10.1'> - </ip> -</network> diff --git a/tests/networkxml2confdata/nat-network.xml b/tests/networkxml2confdata/nat-network.xml deleted file mode 100644 index e44d35d83d..0000000000 --- a/tests/networkxml2confdata/nat-network.xml +++ /dev/null @@ -1,21 +0,0 @@ -<network> - <name>default</name> - <uuid>81ff0d90-c91e-6742-64da-4a736edb9a9b</uuid> - <forward dev='eth1' mode='nat'/> - <bridge name='virbr0' stp='on' delay='0'/> - <ip address='192.168.122.1' netmask='255.255.255.0'> - <dhcp> - <range start='192.168.122.2' end='192.168.122.254'/> - <host mac='00:16:3e:77:e2:ed' name='a.example.com' ip='192.168.122.10'/> - <host mac='00:16:3e:3e:a9:1a' name='b.example.com' ip='192.168.122.11'/> - </dhcp> - </ip> - <ip family='ipv4' address='192.168.123.1' netmask='255.255.255.0'> - </ip> - <ip family='ipv6' address='2001:db8:ac10:fe01::1' prefix='64'> - </ip> - <ip family='ipv6' address='2001:db8:ac10:fd01::1' prefix='64'> - </ip> - <ip family='ipv4' address='10.24.10.1'> - </ip> -</network> diff --git a/tests/networkxml2confdata/netboot-network.xml b/tests/networkxml2confdata/netboot-network.xml deleted file mode 100644 index ec06c30050..0000000000 --- a/tests/networkxml2confdata/netboot-network.xml +++ /dev/null @@ -1,14 +0,0 @@ -<network> - <name>netboot</name> - <uuid>81ff0d90-c91e-6742-64da-4a736edb9a9b</uuid> - <forward mode='nat'/> - <bridge name='virbr1' stp='off' delay='1'/> - <domain name='example.com'/> - <ip address='192.168.122.1' netmask='255.255.255.0'> - <dhcp> - <range start='192.168.122.2' end='192.168.122.254'/> - <bootp file='pxeboot.img'/> - </dhcp> - <tftp root='/var/lib/tftproot'/> - </ip> -</network> diff --git a/tests/networkxml2confdata/netboot-proxy-network.xml b/tests/networkxml2confdata/netboot-proxy-network.xml deleted file mode 100644 index a5b7c1e4e6..0000000000 --- a/tests/networkxml2confdata/netboot-proxy-network.xml +++ /dev/null @@ -1,13 +0,0 @@ -<network> - <name>netboot</name> - <uuid>81ff0d90-c91e-6742-64da-4a736edb9a9b</uuid> - <forward mode='nat'/> - <bridge name='virbr1' stp='off' delay='1'/> - <domain name='example.com'/> - <ip address='192.168.122.1' netmask='255.255.255.0'> - <dhcp> - <range start='192.168.122.2' end='192.168.122.254'/> - <bootp file='pxeboot.img' server='10.20.30.40'/> - </dhcp> - </ip> -</network> diff --git a/tests/networkxml2confdata/open-network.xml b/tests/networkxml2confdata/open-network.xml deleted file mode 100644 index e0b3f039f4..0000000000 --- a/tests/networkxml2confdata/open-network.xml +++ /dev/null @@ -1,9 +0,0 @@ -<network> - <name>open</name> - <uuid>81ff0d90-c91e-6742-64da-4a736edb9a9b</uuid> - <forward mode='open'/> - <bridge name='virbr1' stp='on' delay='0'/> - <mac address='12:34:56:78:9A:BC'/> - <ip address='192.168.122.1' netmask='255.255.255.0'> - </ip> -</network> diff --git a/tests/networkxml2confdata/routed-network.xml b/tests/networkxml2confdata/routed-network.xml deleted file mode 100644 index 6b0853a0b4..0000000000 --- a/tests/networkxml2confdata/routed-network.xml +++ /dev/null @@ -1,9 +0,0 @@ -<network> - <name>local</name> - <uuid>81ff0d90-c91e-6742-64da-4a736edb9a9b</uuid> - <forward dev='eth1' mode='route'/> - <bridge name='virbr1' stp='on' delay='0'/> - <mac address='12:34:56:78:9A:BC'/> - <ip address='192.168.122.1' netmask='255.255.255.0'> - </ip> -</network> diff --git a/tests/networkxml2xmlin/dhcp6-nat-network.xml b/tests/networkxml2xmlin/dhcp6-nat-network.xml deleted file mode 100644 index cab0700f2b..0000000000 --- a/tests/networkxml2xmlin/dhcp6-nat-network.xml +++ /dev/null @@ -1,27 +0,0 @@ -<network> - <name>default</name> - <uuid>81ff0d90-c91e-6742-64da-4a736edb9a9b</uuid> - <forward dev='eth1' mode='nat'/> - <bridge name='virbr0' stp='on' delay='0'/> - <ip address='192.168.122.1' netmask='255.255.255.0'> - <dhcp> - <host mac='00:16:3e:77:e2:ed' name='a.example.com' ip='192.168.122.10'/> - <host mac='00:16:3e:3e:a9:1a' name='b.example.com' ip='192.168.122.11'/> - <range start='192.168.122.2' end='192.168.122.254'/> - </dhcp> - </ip> - <ip family='ipv4' address='192.168.123.1' netmask='255.255.255.0'> - </ip> - <ip family='ipv6' address='2001:db8:ac10:fd01::1' prefix='64'> - <dhcp> - <range start='2001:db8:ac10:fd01::1:10' end='2001:db8:ac10:fd01::1:ff'/> - <host id='0:4:7e:7d:f0:7d:a8:bc:c5:d2:13:32:11:ed:16:ea:84:63' ip='2001:db8:ac10:fd01::1:20'/> - <host name='paul' ip='2001:db8:ac10:fd01::1:21'/> - <host id='0:3:0:1:0:16:3e:11:22:33' name='peter.xyz' ip='2001:db8:ac10:fd01::1:22'/> - <host id='0:3:0:1:0:16:3e:44:55:33' ip='2001:db8:ac10:fd01::1:23'/> - <host id='0:1:0:1:18:aa:62:fe:0:16:3e:44:55:66' name='badbob' ip='2001:db8:ac10:fd01::1:24'/> - </dhcp> - </ip> - <ip family='ipv4' address='10.24.10.1'> - </ip> -</network> diff --git a/tests/networkxml2xmlin/dhcp6-network.xml b/tests/networkxml2xmlin/dhcp6-network.xml deleted file mode 100644 index ae9ff1f32c..0000000000 --- a/tests/networkxml2xmlin/dhcp6-network.xml +++ /dev/null @@ -1,17 +0,0 @@ -<network> - <name>default</name> - <uuid>81ff0d90-c91e-6742-64da-4a736edb9a9b</uuid> - <forward dev='eth1' mode='nat'/> - <bridge name='virbr0' stp='on' delay='0'/> - <domain name='mynet'/> - <ip family='ipv6' address='2001:db8:ac10:fd01::1' prefix='64'> - <dhcp> - <range start='2001:db8:ac10:fd01::1:10' end='2001:db8:ac10:fd01::1:ff'/> - <host id='0:4:7e:7d:f0:7d:a8:bc:c5:d2:13:32:11:ed:16:ea:84:63' ip='2001:db8:ac10:fd01::1:20'/> - <host name='paul' ip='2001:db8:ac10:fd01::1:21'/> - <host id='0:3:0:1:0:16:3e:11:22:33' name='peter.xyz' ip='2001:db8:ac10:fd01::1:22'/> - <host id='0:3:0:1:0:16:3e:44:55:33' ip='2001:db8:ac10:fd01::1:23'/> - <host id='0:1:0:1:18:aa:62:fe:0:16:3e:44:55:66' name='badbob' ip='2001:db8:ac10:fd01::1:24'/> - </dhcp> - </ip> -</network> diff --git a/tests/networkxml2xmlin/dnsmasq-options.xml b/tests/networkxml2xmlin/dnsmasq-options.xml deleted file mode 100644 index 35a87b8e3e..0000000000 --- a/tests/networkxml2xmlin/dnsmasq-options.xml +++ /dev/null @@ -1,15 +0,0 @@ -<network xmlns:dnsmasq="http://libvirt.org/schemas/network/dnsmasq/1.0";> - <name>default</name> - <uuid>81ff0d90-c91e-6742-64da-4a736edb9a9b</uuid> - <bridge name="virbr0"/> - <forward mode="nat" dev="eth1"/> - <ip address="192.168.122.1" netmask="255.255.255.0"> - <dhcp> - <range start="192.168.122.2" end="192.168.122.254"/> - </dhcp> - </ip> - <dnsmasq:options> - <dnsmasq:option value="foo=bar"/> - <dnsmasq:option value="cname=*.cloudapps.example.com,master.example.com"/> - </dnsmasq:options> -</network> diff --git a/tests/networkxml2xmlin/leasetime-hours.xml b/tests/networkxml2xmlin/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/networkxml2xmlin/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/networkxml2xmlin/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/networkxml2xmlin/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/tests/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 @@ -<network> - <name>default</name> - <uuid>81ff0d90-c91e-6742-64da-4a736edb9a9c</uuid> - <forward dev='eth0' mode='nat'/> - <bridge name='virbr0' stp='on' delay='0' /> - <dns forwardPlainNames='yes'/> - <ip address='192.168.122.1' netmask='255.255.255.0'> - </ip> -</network> 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 @@ -<network> - <name>default</name> - <uuid>81ff0d90-c91e-6742-64da-4a736edb9a9c</uuid> - <forward mode='nat'/> - <bridge name='virbr0' stp='on' delay='0'/> - <dns> - <forwarder domain='example.com' addr='192.168.1.1'/> - </dns> - <ip address='192.168.122.1' netmask='255.255.255.0'> - </ip> -</network> diff --git a/tests/networkxml2xmlin/nat-network-dns-local-domain.xml b/tests/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 @@ -<network> - <name>default</name> - <uuid>81ff0d90-c91e-6742-64da-4a736edb9a9c</uuid> - <forward dev='eth0' mode='nat'/> - <bridge name='virbr0' stp='on' delay='0' /> - <domain name='example.com' localOnly='yes'/> - <ip address='192.168.122.1' netmask='255.255.255.0'> - </ip> -</network> 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 @@ -<network> - <name>default</name> - <uuid>81ff0d90-c91e-6742-64da-4a736edb9a9b</uuid> - <forward dev='eth1' mode='nat'> - <interface dev='eth1'/> - </forward> - <bridge name='virbr0' stp='on' delay='0'/> - <dns> - <srv service='name' protocol='tcp'/> - </dns> - <ip address='192.168.122.1' netmask='255.255.255.0'> - <dhcp> - <range start='192.168.122.2' end='192.168.122.254'/> - <host mac='00:16:3e:77:e2:ed' name='a.example.com' ip='192.168.122.10'/> - <host mac='00:16:3e:3e:a9:1a' name='b.example.com' ip='192.168.122.11'/> - </dhcp> - </ip> - <ip family='ipv4' address='192.168.123.1' netmask='255.255.255.0'> - </ip> - <ip family='ipv6' address='2001:db8:ac10:fe01::1' prefix='64'> - </ip> - <ip family='ipv6' address='fc00:db8:ac10:fd01::1' prefix='64'> - </ip> - <ip family='ipv4' address='10.24.10.1'> - </ip> -</network> 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 @@ -<network> - <name>default</name> - <uuid>81ff0d90-c91e-6742-64da-4a736edb9a9b</uuid> - <forward dev='eth1' mode='nat'> - <interface dev='eth1'/> - </forward> - <bridge name='virbr0' stp='on' delay='0'/> - <dns> - <srv service='name' protocol='tcp' domain='test-domain-name' target='.' port='1024' priority='10' weight='10'/> - <srv service='name2' protocol='udp' target='test2.example.com' port='2222' priority='22' weight='222'/> - <srv service='name3' protocol='tcp' domain='test3.com' target='test3.example.com' port='3333' priority='33'/> - <srv service='name4' protocol='tcp' domain='test4.com' target='test4.example.com' port='4444'/> - <srv service='name5' protocol='udp' target='test5.example.com' priority='55' weight='555'/> - <srv service='name6' protocol='tcp' domain='test6.com' target='test6.example.com' port='6666' weight='666'/> - <srv service='name7' protocol='tcp' domain='test7.com' target='test7.example.com' weight='777'/> - </dns> - <ip address='192.168.122.1' netmask='255.255.255.0'> - <dhcp> - <range start='192.168.122.2' end='192.168.122.254'/> - <host mac='00:16:3e:77:e2:ed' name='a.example.com' ip='192.168.122.10'/> - <host mac='00:16:3e:3e:a9:1a' name='b.example.com' ip='192.168.122.11'/> - </dhcp> - </ip> - <ip family='ipv4' address='192.168.123.1' netmask='255.255.255.0'> - </ip> - <ip family='ipv6' address='2001:db8:ac10:fe01::1' prefix='64'> - </ip> - <ip family='ipv6' address='2001:db8:ac10:fd01::1' prefix='64'> - </ip> - <ip family='ipv4' address='10.24.10.1'> - </ip> -</network> 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 @@ -<network> - <name>default</name> - <uuid>81ff0d90-c91e-6742-64da-4a736edb9a9b</uuid> - <forward dev='eth1' mode='nat'/> - <bridge name='virbr0' stp='on' delay='0'/> - <dns> - <txt name='example' value='example value'/> - </dns> - <ip address='192.168.122.1' netmask='255.255.255.0'> - <dhcp> - <range start='192.168.122.2' end='192.168.122.254'/> - <host mac='00:16:3e:77:e2:ed' name='a.example.com' ip='192.168.122.10'/> - <host mac='00:16:3e:3e:a9:1a' name='b.example.com' ip='192.168.122.11'/> - </dhcp> - </ip> - <ip family='ipv4' address='192.168.123.1' netmask='255.255.255.0'> - </ip> - <ip family='ipv6' address='2001:db8:ac10:fe01::1' prefix='64'> - </ip> - <ip family='ipv6' address='2001:db8:ac10:fd01::1' prefix='64'> - </ip> - <ip family='ipv4' address='10.24.10.1'> - </ip> -</network> diff --git a/tests/networkxml2xmlin/nat-network-name-with-quotes.xml b/tests/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 @@ -<network> - <name>default"with"quotes"</name> - <uuid>81ff0d90-c91e-6742-64da-4a736edb9a9b</uuid> - <forward dev='eth1' mode='nat'> - <interface dev='eth1'/> - </forward> - <bridge name='virbr0' stp='on' delay='0'/> - <dns> - <srv service='name' protocol='tcp'/> - </dns> - <ip address='192.168.122.1' netmask='255.255.255.0'> - <dhcp> - <range start='192.168.122.2' end='192.168.122.254'/> - <host mac='00:16:3e:77:e2:ed' name='a.example.com' ip='192.168.122.10'/> - <host mac='00:16:3e:3e:a9:1a' name='b.example.com' ip='192.168.122.11'/> - </dhcp> - </ip> - <ip family='ipv4' address='192.168.123.1' netmask='255.255.255.0'> - </ip> - <ip family='ipv6' address='fc00:db8:ac10:fe01::1' prefix='64'> - </ip> - <ip family='ipv6' address='fc00:db8:ac10:fd01::1' prefix='64'> - </ip> - <ip family='ipv4' address='10.24.10.1'> - </ip> -</network> diff --git a/tests/networkxml2xmlin/netboot-tftp.xml b/tests/networkxml2xmlin/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/networkxml2xmlin/ptr-domains-auto.xml deleted file mode 100644 index 7fe12dc671..0000000000 --- a/tests/networkxml2xmlin/ptr-domains-auto.xml +++ /dev/null @@ -1,21 +0,0 @@ -<network> - <name>default</name> - <uuid>81ff0d90-c91e-6742-64da-4a736edb9a9b</uuid> - <forward dev='eth1' mode='nat'/> - <bridge name='virbr0' stp='on' delay='0'/> - <ip address='192.168.122.1' netmask='255.255.255.0' localPtr='yes'> - <dhcp> - <range start='192.168.122.2' end='192.168.122.254'/> - <host mac='00:16:3e:77:e2:ed' name='a.example.com' ip='192.168.122.10'/> - <host mac='00:16:3e:3e:a9:1a' name='b.example.com' ip='192.168.122.11'/> - </dhcp> - </ip> - <ip family='ipv4' address='192.168.123.1' netmask='255.255.255.0' localPtr='no'> - </ip> - <ip family='ipv6' address='2001:db8:ac10:fe01::1' prefix='64' localPtr='yes'> - </ip> - <ip family='ipv6' address='2001:db8:ac10:fd01::1' prefix='64'> - </ip> - <ip family='ipv4' address='10.24.10.1'> - </ip> -</network> diff --git a/tests/networkxml2xmlout/leasetime-hours.xml b/tests/networkxml2xmlout/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/networkxml2xmlout/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/networkxml2xmlout/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/networkxml2xmlout/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/networkxml2xmlout/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/networkxml2xmlupdatetest.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 = NULL; g_autofree char *outxml = NULL; - netxml = g_strdup_printf("%s/networkxml2xmlin/%s.xml", + netxml = g_strdup_printf("%s/networkxmlconfdata/%s.xml", abs_srcdir, info->netxml); updatexml = g_strdup_printf("%s/networkxml2xmlupdatein/%s.xml", abs_srcdir, info->updatexml); diff --git a/tests/networkxml2xmlout/8021Qbh-net.xml b/tests/networkxmlconfdata/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/networkxmlconfdata/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/networkxmlconfdata/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/networkxmlconfdata/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/networkxmlconfdata/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/networkxmlconfdata/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/networkxmlconfdata/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/networkxmlconfdata/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/networkxmlconfdata/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/networkxmlconfdata/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/networkxmlconfdata/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/networkxmlconfdata/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/tests/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/networkxmlconfdata/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/networkxmlconfdata/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/networkxmlconfdata/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/networkxmlconfdata/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/networkxmlconfdata/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/networkxmlconfdata/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/networkxmlconfdata/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/networkxmlconfdata/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/networkxmlconfdata/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/networkxmlconfdata/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/networkxmlconfdata/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/networkxmlconfdata/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/networkxmlconfdata/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/networkxmlconfdata/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/networkxmlconfdata/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/networkxmlconfdata/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/networkxmlconfdata/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/networkxmlconfdata/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/networkxmlconfdata/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/networkxmlconfdata/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/networkxmlconfdata/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/networkxmlconfdata/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/networkxmlconfdata/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/networkxmlconfdata/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/networkxmlconfdata/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/networkxmlconfdata/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/networkxmlconfdata/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/networkxmlconfdata/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/networkxmlconfdata/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/networkxmlconfdata/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/networkxmlconfdata/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/networkxmlconfdata/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/networkxmlconfdata/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/networkxmlconfdata/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/tests/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.conf rename to tests/networkxmlconfdata/nat-network-dns-forwarder-no-resolv.conf diff --git a/tests/networkxml2xmlout/nat-network-dns-forwarder-no-resolv.xml 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.expect.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.xml rename to tests/networkxmlconfdata/nat-network-dns-forwarder-no-resolv.xml diff --git a/tests/networkxml2confdata/nat-network-dns-forwarders.conf b/tests/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/networkxmlconfdata/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/networkxmlconfdata/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/networkxmlconfdata/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/tests/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/tests/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.conf b/tests/networkxmlconfdata/nat-network-dns-srv-record-minimal.conf similarity index 100% rename from tests/networkxml2confdata/nat-network-dns-srv-record-minimal.conf 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.expect.xml diff --git a/tests/networkxml2confdata/nat-network-dns-srv-record-minimal.hostsfile b/tests/networkxmlconfdata/nat-network-dns-srv-record-minimal.hostsfile similarity index 100% rename from tests/networkxml2confdata/nat-network-dns-srv-record-minimal.hostsfile rename to tests/networkxmlconfdata/nat-network-dns-srv-record-minimal.hostsfile diff --git a/tests/networkxml2confdata/nat-network-dns-srv-record-minimal.xml 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/tests/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/tests/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/tests/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/tests/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.hostsfile 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/tests/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/tests/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/tests/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.xml diff --git a/tests/networkxml2confdata/nat-network-forward-nat-address.hostsfile b/tests/networkxmlconfdata/nat-network-forward-nat-address.hostsfile similarity index 100% rename from tests/networkxml2confdata/nat-network-forward-nat-address.hostsfile rename to tests/networkxmlconfdata/nat-network-forward-nat-address.hostsfile diff --git a/tests/networkxml2xmlin/nat-network-forward-nat-address.xml b/tests/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/tests/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/tests/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.conf b/tests/networkxmlconfdata/nat-network-forward-nat-no-address.conf similarity index 100% rename from tests/networkxml2confdata/nat-network-forward-nat-no-address.conf 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.expect.xml diff --git a/tests/networkxml2confdata/nat-network-forward-nat-no-address.hostsfile b/tests/networkxmlconfdata/nat-network-forward-nat-no-address.hostsfile similarity index 100% rename from tests/networkxml2confdata/nat-network-forward-nat-no-address.hostsfile rename to tests/networkxmlconfdata/nat-network-forward-nat-no-address.hostsfile 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/networkxmlconfdata/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/networkxmlconfdata/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/networkxmlconfdata/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/networkxmlconfdata/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/tests/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.hostsfile 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/tests/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/networkxmlconfdata/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/networkxmlconfdata/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/networkxmlconfdata/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/networkxmlconfdata/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/networkxmlconfdata/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/networkxmlconfdata/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/networkxmlconfdata/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/networkxmlconfdata/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/networkxmlconfdata/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/networkxmlconfdata/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/networkxmlconfdata/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/networkxmlconfdata/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/networkxmlconfdata/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/tests/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/networkxmlconfdata/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/networkxmlconfdata/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/networkxmlconfdata/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/networkxmlconfdata/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/networkxmlconfdata/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/networkxmlconfdata/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/networkxmlconfdata/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/networkxmlconfdata/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/networkxmlconfdata/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/networkxmlconfdata/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/networkxmlconfdata/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/networkxmlconfdata/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/networkxmlconfdata/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.xml 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/networkxmlconfdata/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/networkxmlconfdata/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/networkxmlconfdata/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/networkxmlconfdata/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/networkxmlconfdata/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/networkxmlconfdata/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/networkxmlconfdata/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 = expectResult; info->xmlopt = xmlopt; info->caps = caps; - info->inxml = g_strdup_printf("%s/networkxml2xmlin/%s.xml", abs_srcdir, name); - info->outxml = g_strdup_printf("%s/networkxml2xmlout/%s.xml", abs_srcdir, name); - /* Temporarily use conf files from networkxml2confdata/ */ - info->outconf = g_strdup_printf("%s/networkxml2confdata/%s.conf", abs_srcdir, name); - info->outhostsfile = g_strdup_printf("%s/networkxml2confdata/%s.hostsfile", abs_srcdir, name); + info->inxml = g_strdup_printf("%s/networkxmlconfdata/%s.xml", abs_srcdir, name); + info->outxml = g_strdup_printf("%s/networkxmlconfdata/%s.expect.xml", abs_srcdir, name); + info->outconf = g_strdup_printf("%s/networkxmlconfdata/%s.conf", abs_srcdir, name); + info->outhostsfile = g_strdup_printf("%s/networkxmlconfdata/%s.hostsfile", abs_srcdir, name); virTestRunLog(ret, name_xml2xml, testCompareXMLToXMLFiles, info); 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 = { /* 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/NETWORKXMLNAME.xml * NETWORKPORTXMLNAME resolves to abs_srcdir/virnetworkportxml2xmldata/NETWORKPORTXMLNAME.xml */ static virNetworkPtr @@ -286,7 +286,7 @@ fakeNetworkLookupByName(virConnectPtr conn, return NULL; } - path = g_strdup_printf(abs_srcdir "/networkxml2xmlin/%s.xml", netname); + path = g_strdup_printf(abs_srcdir "/networkxmlconfdata/%s.xml", netname); if (!virFileExists(path)) { virReportError(VIR_ERR_NO_NETWORK, "fake network '%s' not found", path); @@ -307,7 +307,7 @@ fakeNetworkGetXMLDesc(virNetworkPtr network, *(strchr(netname, ';')) = '\0'; - path = g_strdup_printf(abs_srcdir "/networkxml2xmlin/%s.xml", netname); + path = g_strdup_printf(abs_srcdir "/networkxmlconfdata/%s.xml", netname); 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[] = { static const struct testSchemaEntry schemaNetwork[] = { { .dir = "src/network" }, - { .dir = "tests/networkxml2xmlin" }, - { .dir = "tests/networkxml2xmlout" }, - { .dir = "tests/networkxml2confdata" }, + { .dir = "tests/networkxmlconfdata" }, { .dir = "examples/xml/test/", .dirRegex = "testnet.*" }, { .dir = "tests/networkxml2xmlupdateout" }, -- 2.52.0
