tests: Rename networkxml2xmltest to networkxmlconftest

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 <mprivozn@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>

diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c
index 665eeecedbe2b4e30c44e71f9afe3811e09c825a..d50d42c98c233f9d84c323b3240f821a01b40a5a 100644 (file)
--- 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 00c81877afa2dd3b524c7177682c737f0a52a7fd..b28ad4a65b53844ae484b558d88f27b57ababba2 100644 (file)
--- 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 (file)
index 42b9d3f..0000000
--- 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 (file)
index b22d4ea..0000000
--- 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 (file)
index d84576b..0000000
--- 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 (file)
index 9add456..0000000
--- 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 (file)
index 87b214e..0000000
--- 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 (file)
index e44d35d..0000000
--- 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 (file)
index ec06c30..0000000
--- 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 (file)
index a5b7c1e..0000000
--- 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 (file)
index e0b3f03..0000000
--- 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 (file)
index 6b0853a..0000000
--- 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 (file)
index cab0700..0000000
--- 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 (file)
index ae9ff1f..0000000
--- 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 (file)
index 35a87b8..0000000
--- 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 (symlink)
index 5a6bed3..0000000
--- 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 (symlink)
index 706e4cd..0000000
--- 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 (symlink)
index 2c19b06..0000000
--- 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 (symlink)
index f182cfa..0000000
--- 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 (file)
index 10bacb5..0000000
--- 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 (file)
index 9661ce5..0000000
--- 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 (file)
index a92d71f..0000000
--- 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 (file)
index 83838d0..0000000
--- 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 (file)
index 0369f4c..0000000
--- 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 (file)
index 0a6bd59..0000000
--- 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 (file)
index eba75d2..0000000
--- 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 (symlink)
index 1487de5..0000000
--- 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 (file)
index 7fe12dc..0000000
--- 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 (symlink)
index d3cf0fb..0000000
--- 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 (symlink)
index 2390f7a..0000000
--- 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 (symlink)
index 09ebdb9..0000000
--- 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 (symlink)
index 7036ca6..0000000
--- 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 (symlink)
index 1487de5..0000000
--- 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 60931a2eba6dea759b8e106b269a03e52df685b9..b017922d9444f04a6531503321b3a1b0e80f7890 100644 (file)
--- 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 (symlink)
index 0000000..9ba0abf
--- /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 (symlink)
index 0000000..8862319
--- /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 (symlink)
index 0000000..ef86e9c
--- /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 (symlink)
index 0000000..e7944dc
--- /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 (symlink)
index 0000000..eb3b28d
--- /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 5961084c67dcd0474377b7170a0f991a62fd082b..b32a39c5532bc4f9c0a682356dd5dec3988b5db6 100644 (file)
--- a/tests/networkxml2xmltest.c
+++ b/tests/networkxmlconftest.c
@@ -243,11 +243,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 6f1f816cba19cfe173075a29c6f5f912cc0c0d6b..486d3d47ec75a9bbbcdbd21e73bec3deb21399f5 100644 (file)
--- 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 57a49c270ccf7defed25b41e1f632d2ba3204239..4faac8d9768d28da7e4563f3a5ee5b55a0abc218 100644 (file)
--- 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" },