From: Michal Privoznik <mprivozn@redhat.com>
The networkxml2xmltest does basic parse -> format tests.
The networkxml2conftest does parse -> conf tests.
Now, majority of XMLs are the same. That is, output XMLs of
networkxml2xmltest and input XMls of networkxml2conftest. There
are only a few differences. This is actually great, because it
will allow either tests to do both test cases.
There are some (subtle) differences in individual test cases
though:
1) some test cases exist only in networkxml2conftest and not
networkxml2xmltest, or
2) some test cases in networkxml2conftest have more values, i.e.
extra elements, extra attributes. or
3) some test cases in networkxml2conftest have less values.
For cases from 1) they were just copied over. For cases from 2)
those extra elements/attributes were added, and for cases from 3)
those extra attributes were removed (to minimize changes to .conf
files in near future).
One caveat though: networkxml2xmlupdatetest uses input XMLs of
networkxml2xmltest too (hence changes under
networkxml2xmlupdateout/ dir). This means that the
"delete-srv-record-protocol" test started failing, because the
input network XML now has more <srv/> records than the test case
anticipated. But this is easy to fix - hence seemingly unrelated
change under networkxml2xmlupdatein/ dir.
Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
---
.../nat-network-dns-srv-record-minimal.conf | 2 +-
.../nat-network-dns-srv-record-minimal.xml | 2 +-
.../nat-network-dns-srv-record.conf | 2 +-
.../nat-network-dns-srv-record.xml | 2 +-
...cord-minimal.xml => dhcp6-nat-network.xml} | 19 ++++++++-------
.../dhcp6-network.xml} | 24 +++++++------------
.../nat-network-dns-forwarders.xml | 3 ++-
.../nat-network-dns-hosts.xml | 1 +
...s.xml => nat-network-dns-local-domain.xml} | 7 +-----
.../nat-network-dns-srv-record-minimal.xml | 2 +-
.../nat-network-dns-srv-record.xml | 6 +++++
.../nat-network-name-with-quotes.xml} | 2 +-
.../ptr-domains-auto.xml} | 10 ++++----
...s-srv-record.xml => dhcp6-nat-network.xml} | 13 ++++++----
...v-record-minimal.xml => dhcp6-network.xml} | 23 +++++++-----------
.../nat-network-dns-forwarders.xml | 3 ++-
.../nat-network-dns-hosts.xml | 1 +
...s.xml => nat-network-dns-local-domain.xml} | 7 +-----
.../nat-network-dns-srv-record-minimal.xml | 2 +-
.../nat-network-dns-srv-record.xml | 6 +++++
.../nat-network-name-with-quotes.xml} | 3 ++-
...ecord-minimal.xml => ptr-domains-auto.xml} | 9 +++----
tests/networkxml2xmltest.c | 6 ++++-
.../srv-record-protocol.xml | 2 +-
.../nat-network-dns-hosts-modified.xml | 1 +
.../nat-network-dns-more-hosts.xml | 1 +
.../nat-network-dns-srv-records.xml | 6 +++++
.../nat-network-forward-ifaces.xml | 6 +++++
.../nat-network-no-forward-ifaces.xml | 6 +++++
.../nat-network-no-hosts.xml | 1 +
tests/networkxml2xmlupdateout/nat-network.xml | 8 +++++++
31 files changed, 106 insertions(+), 80 deletions(-)
copy tests/networkxml2xmlin/{nat-network-dns-srv-record-minimal.xml => dhcp6-nat-network.xml} (53%)
copy tests/{networkxml2xmlupdateout/nat-network.xml => networkxml2xmlin/dhcp6-network.xml} (29%)
copy tests/networkxml2xmlin/{nat-network-dns-forwarders.xml => nat-network-dns-local-domain.xml} (55%)
copy tests/{networkxml2confdata/nat-network-dns-srv-record-minimal.xml => networkxml2xmlin/nat-network-name-with-quotes.xml} (95%)
copy tests/{networkxml2xmlupdateout/nat-network.xml => networkxml2xmlin/ptr-domains-auto.xml} (74%)
copy tests/networkxml2xmlout/{nat-network-dns-srv-record.xml => dhcp6-nat-network.xml} (59%)
copy tests/networkxml2xmlout/{nat-network-dns-srv-record-minimal.xml => dhcp6-network.xml} (39%)
copy tests/networkxml2xmlout/{nat-network-dns-forwarders.xml => nat-network-dns-local-domain.xml} (62%)
copy tests/{networkxml2confdata/nat-network-dns-srv-record-minimal.xml => networkxml2xmlout/nat-network-name-with-quotes.xml} (90%)
copy tests/networkxml2xmlout/{nat-network-dns-srv-record-minimal.xml => ptr-domains-auto.xml} (79%)
diff --git a/tests/networkxml2confdata/nat-network-dns-srv-record-minimal.conf b/tests/networkxml2confdata/nat-network-dns-srv-record-minimal.conf
index bd560ba3f4..4757f824da 100644
--- a/tests/networkxml2confdata/nat-network-dns-srv-record-minimal.conf
+++ b/tests/networkxml2confdata/nat-network-dns-srv-record-minimal.conf
@@ -15,5 +15,5 @@ dhcp-authoritative
dhcp-lease-max=253
dhcp-hostsfile=/var/lib/libvirt/dnsmasq/default.hostsfile
addn-hosts=/var/lib/libvirt/dnsmasq/default.addnhosts
-dhcp-range=fc00:db8:ac10:fe01::1,ra-only
+dhcp-range=2001:db8:ac10:fe01::1,ra-only
dhcp-range=fc00:db8:ac10:fd01::1,ra-only
diff --git a/tests/networkxml2confdata/nat-network-dns-srv-record-minimal.xml b/tests/networkxml2confdata/nat-network-dns-srv-record-minimal.xml
index 13b1c247d5..83838d01d3 100644
--- a/tests/networkxml2confdata/nat-network-dns-srv-record-minimal.xml
+++ b/tests/networkxml2confdata/nat-network-dns-srv-record-minimal.xml
@@ -17,7 +17,7 @@
</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 family='ipv6' address='2001:db8:ac10:fe01::1' prefix='64'>
</ip>
<ip family='ipv6' address='fc00:db8:ac10:fd01::1' prefix='64'>
</ip>
diff --git a/tests/networkxml2confdata/nat-network-dns-srv-record.conf b/tests/networkxml2confdata/nat-network-dns-srv-record.conf
index 22bf3b1de9..c83148cc0a 100644
--- a/tests/networkxml2confdata/nat-network-dns-srv-record.conf
+++ b/tests/networkxml2confdata/nat-network-dns-srv-record.conf
@@ -8,7 +8,7 @@ strict-order
except-interface=lo
bind-dynamic
interface=virbr0
-srv-host=_name._tcp.test-domain-name.com,test.example.com,1111,11,111
+srv-host=_name._tcp.test-domain-name
srv-host=_name2._udp,test2.example.com,2222,22,222
srv-host=_name3._tcp.test3.com,test3.example.com,3333,33
srv-host=_name4._tcp.test4.com,test4.example.com,4444
diff --git a/tests/networkxml2confdata/nat-network-dns-srv-record.xml b/tests/networkxml2confdata/nat-network-dns-srv-record.xml
index d01b331fb1..0369f4caa9 100644
--- a/tests/networkxml2confdata/nat-network-dns-srv-record.xml
+++ b/tests/networkxml2confdata/nat-network-dns-srv-record.xml
@@ -6,7 +6,7 @@
</forward>
<bridge name='virbr0' stp='on' delay='0'/>
<dns>
- <srv service='name' protocol='tcp' domain='test-domain-name.com' target='test.example.com' port='1111' priority='11' weight='111'/>
+ <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'/>
diff --git a/tests/networkxml2xmlin/nat-network-dns-srv-record-minimal.xml b/tests/networkxml2xmlin/dhcp6-nat-network.xml
similarity index 53%
copy from tests/networkxml2xmlin/nat-network-dns-srv-record-minimal.xml
copy to tests/networkxml2xmlin/dhcp6-nat-network.xml
index a18afae2fd..cab0700f2b 100644
--- a/tests/networkxml2xmlin/nat-network-dns-srv-record-minimal.xml
+++ b/tests/networkxml2xmlin/dhcp6-nat-network.xml
@@ -1,25 +1,26 @@
<network>
<name>default</name>
<uuid>81ff0d90-c91e-6742-64da-4a736edb9a9b</uuid>
- <forward dev='eth1' mode='nat'>
- <interface dev='eth1'/>
- </forward>
+ <forward dev='eth1' mode='nat'/>
<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'/>
+ <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:fe01::1' prefix='64'>
- </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>
diff --git a/tests/networkxml2xmlupdateout/nat-network.xml b/tests/networkxml2xmlin/dhcp6-network.xml
similarity index 29%
copy from tests/networkxml2xmlupdateout/nat-network.xml
copy to tests/networkxml2xmlin/dhcp6-network.xml
index 93bc7db51d..ae9ff1f32c 100644
--- a/tests/networkxml2xmlupdateout/nat-network.xml
+++ b/tests/networkxml2xmlin/dhcp6-network.xml
@@ -1,23 +1,17 @@
<network>
<name>default</name>
<uuid>81ff0d90-c91e-6742-64da-4a736edb9a9b</uuid>
- <forward dev='eth1' mode='nat'>
- <interface dev='eth1'/>
- </forward>
+ <forward dev='eth1' mode='nat'/>
<bridge name='virbr0' stp='on' delay='0'/>
- <ip address='192.168.122.1' netmask='255.255.255.0'>
+ <domain name='mynet'/>
+ <ip family='ipv6' address='2001:db8:ac10:fd01::1' prefix='64'>
<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'/>
+ <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='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-forwarders.xml b/tests/networkxml2xmlin/nat-network-dns-forwarders.xml
index dd22b686ab..70123720b9 100644
--- a/tests/networkxml2xmlin/nat-network-dns-forwarders.xml
+++ b/tests/networkxml2xmlin/nat-network-dns-forwarders.xml
@@ -6,7 +6,8 @@
<dns>
<forwarder addr='8.8.8.8'/>
<forwarder addr='8.8.4.4'/>
- <forwarder domain='example.com' addr='192.168.1.1' port='1234'/>
+ <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'>
diff --git a/tests/networkxml2xmlin/nat-network-dns-hosts.xml b/tests/networkxml2xmlin/nat-network-dns-hosts.xml
index c28ebd8c4b..6c027423f4 100644
--- a/tests/networkxml2xmlin/nat-network-dns-hosts.xml
+++ b/tests/networkxml2xmlin/nat-network-dns-hosts.xml
@@ -3,6 +3,7 @@
<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.122'>
<hostname>pudding</hostname>
diff --git a/tests/networkxml2xmlin/nat-network-dns-forwarders.xml b/tests/networkxml2xmlin/nat-network-dns-local-domain.xml
similarity index 55%
copy from tests/networkxml2xmlin/nat-network-dns-forwarders.xml
copy to tests/networkxml2xmlin/nat-network-dns-local-domain.xml
index dd22b686ab..a92d71f1f2 100644
--- a/tests/networkxml2xmlin/nat-network-dns-forwarders.xml
+++ b/tests/networkxml2xmlin/nat-network-dns-local-domain.xml
@@ -3,12 +3,7 @@
<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' port='1234'/>
- <forwarder domain='www.example.com'/>
- </dns>
+ <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
index a18afae2fd..83838d01d3 100644
--- a/tests/networkxml2xmlin/nat-network-dns-srv-record-minimal.xml
+++ b/tests/networkxml2xmlin/nat-network-dns-srv-record-minimal.xml
@@ -19,7 +19,7 @@
</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 family='ipv6' address='fc00:db8:ac10:fd01::1' prefix='64'>
</ip>
<ip family='ipv4' address='10.24.10.1'>
</ip>
diff --git a/tests/networkxml2xmlin/nat-network-dns-srv-record.xml b/tests/networkxml2xmlin/nat-network-dns-srv-record.xml
index 3dd19e6698..0369f4caa9 100644
--- a/tests/networkxml2xmlin/nat-network-dns-srv-record.xml
+++ b/tests/networkxml2xmlin/nat-network-dns-srv-record.xml
@@ -7,6 +7,12 @@
<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>
diff --git a/tests/networkxml2confdata/nat-network-dns-srv-record-minimal.xml b/tests/networkxml2xmlin/nat-network-name-with-quotes.xml
similarity index 95%
copy from tests/networkxml2confdata/nat-network-dns-srv-record-minimal.xml
copy to tests/networkxml2xmlin/nat-network-name-with-quotes.xml
index 13b1c247d5..eba75d2e2d 100644
--- a/tests/networkxml2confdata/nat-network-dns-srv-record-minimal.xml
+++ b/tests/networkxml2xmlin/nat-network-name-with-quotes.xml
@@ -1,5 +1,5 @@
<network>
- <name>default</name>
+ <name>default"with"quotes"</name>
<uuid>81ff0d90-c91e-6742-64da-4a736edb9a9b</uuid>
<forward dev='eth1' mode='nat'>
<interface dev='eth1'/>
diff --git a/tests/networkxml2xmlupdateout/nat-network.xml b/tests/networkxml2xmlin/ptr-domains-auto.xml
similarity index 74%
copy from tests/networkxml2xmlupdateout/nat-network.xml
copy to tests/networkxml2xmlin/ptr-domains-auto.xml
index 93bc7db51d..7fe12dc671 100644
--- a/tests/networkxml2xmlupdateout/nat-network.xml
+++ b/tests/networkxml2xmlin/ptr-domains-auto.xml
@@ -1,20 +1,18 @@
<network>
<name>default</name>
<uuid>81ff0d90-c91e-6742-64da-4a736edb9a9b</uuid>
- <forward dev='eth1' mode='nat'>
- <interface dev='eth1'/>
- </forward>
+ <forward dev='eth1' mode='nat'/>
<bridge name='virbr0' stp='on' delay='0'/>
- <ip address='192.168.122.1' netmask='255.255.255.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'>
+ <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'>
+ <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>
diff --git a/tests/networkxml2xmlout/nat-network-dns-srv-record.xml b/tests/networkxml2xmlout/dhcp6-nat-network.xml
similarity index 59%
copy from tests/networkxml2xmlout/nat-network-dns-srv-record.xml
copy to tests/networkxml2xmlout/dhcp6-nat-network.xml
index 1486fc3224..44bb2d1f5d 100644
--- a/tests/networkxml2xmlout/nat-network-dns-srv-record.xml
+++ b/tests/networkxml2xmlout/dhcp6-nat-network.xml
@@ -6,9 +6,6 @@
</forward>
<bridge name='virbr0' stp='on' delay='0'/>
<mac address='52:54:00:00:00:00'/>
- <dns>
- <srv service='name' protocol='tcp' domain='test-domain-name' target='.' port='1024' priority='10' weight='10'/>
- </dns>
<ip address='192.168.122.1' netmask='255.255.255.0'>
<dhcp>
<range start='192.168.122.2' end='192.168.122.254'/>
@@ -18,9 +15,15 @@
</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'>
+ <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>
diff --git a/tests/networkxml2xmlout/nat-network-dns-srv-record-minimal.xml b/tests/networkxml2xmlout/dhcp6-network.xml
similarity index 39%
copy from tests/networkxml2xmlout/nat-network-dns-srv-record-minimal.xml
copy to tests/networkxml2xmlout/dhcp6-network.xml
index 50e968be9d..cabe833e03 100644
--- a/tests/networkxml2xmlout/nat-network-dns-srv-record-minimal.xml
+++ b/tests/networkxml2xmlout/dhcp6-network.xml
@@ -6,22 +6,15 @@
</forward>
<bridge name='virbr0' stp='on' delay='0'/>
<mac address='52:54:00:00:00:00'/>
- <dns>
- <srv service='name' protocol='tcp'/>
- </dns>
- <ip address='192.168.122.1' netmask='255.255.255.0'>
+ <domain name='mynet'/>
+ <ip family='ipv6' address='2001:db8:ac10:fd01::1' prefix='64'>
<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'/>
+ <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='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/networkxml2xmlout/nat-network-dns-forwarders.xml b/tests/networkxml2xmlout/nat-network-dns-forwarders.xml
index 170b043d09..ee8ba7b1dd 100644
--- a/tests/networkxml2xmlout/nat-network-dns-forwarders.xml
+++ b/tests/networkxml2xmlout/nat-network-dns-forwarders.xml
@@ -9,7 +9,8 @@
<dns>
<forwarder addr='8.8.8.8'/>
<forwarder addr='8.8.4.4'/>
- <forwarder domain='example.com' addr='192.168.1.1' port='1234'/>
+ <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'>
diff --git a/tests/networkxml2xmlout/nat-network-dns-hosts.xml b/tests/networkxml2xmlout/nat-network-dns-hosts.xml
index 548282e514..f8a609f9cb 100644
--- a/tests/networkxml2xmlout/nat-network-dns-hosts.xml
+++ b/tests/networkxml2xmlout/nat-network-dns-hosts.xml
@@ -6,6 +6,7 @@
</forward>
<bridge name='virbr0' stp='on' delay='0'/>
<mac address='52:54:00:00:00:00'/>
+ <domain name='example.com'/>
<dns forwardPlainNames='no'>
<host ip='192.168.122.122'>
<hostname>pudding</hostname>
diff --git a/tests/networkxml2xmlout/nat-network-dns-forwarders.xml b/tests/networkxml2xmlout/nat-network-dns-local-domain.xml
similarity index 62%
copy from tests/networkxml2xmlout/nat-network-dns-forwarders.xml
copy to tests/networkxml2xmlout/nat-network-dns-local-domain.xml
index 170b043d09..33f4bbfc32 100644
--- a/tests/networkxml2xmlout/nat-network-dns-forwarders.xml
+++ b/tests/networkxml2xmlout/nat-network-dns-local-domain.xml
@@ -6,12 +6,7 @@
</forward>
<bridge name='virbr0' stp='on' delay='0'/>
<mac address='52:54:00:00:00:00'/>
- <dns>
- <forwarder addr='8.8.8.8'/>
- <forwarder addr='8.8.4.4'/>
- <forwarder domain='example.com' addr='192.168.1.1' port='1234'/>
- <forwarder domain='www.example.com'/>
- </dns>
+ <domain name='example.com' localOnly='yes'/>
<ip address='192.168.122.1' netmask='255.255.255.0'>
</ip>
</network>
diff --git a/tests/networkxml2xmlout/nat-network-dns-srv-record-minimal.xml b/tests/networkxml2xmlout/nat-network-dns-srv-record-minimal.xml
index 50e968be9d..16032c9af2 100644
--- a/tests/networkxml2xmlout/nat-network-dns-srv-record-minimal.xml
+++ b/tests/networkxml2xmlout/nat-network-dns-srv-record-minimal.xml
@@ -20,7 +20,7 @@
</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 family='ipv6' address='fc00:db8:ac10:fd01::1' prefix='64'>
</ip>
<ip family='ipv4' address='10.24.10.1'>
</ip>
diff --git a/tests/networkxml2xmlout/nat-network-dns-srv-record.xml b/tests/networkxml2xmlout/nat-network-dns-srv-record.xml
index 1486fc3224..0f54a72f95 100644
--- a/tests/networkxml2xmlout/nat-network-dns-srv-record.xml
+++ b/tests/networkxml2xmlout/nat-network-dns-srv-record.xml
@@ -8,6 +8,12 @@
<mac address='52:54:00:00:00:00'/>
<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>
diff --git a/tests/networkxml2confdata/nat-network-dns-srv-record-minimal.xml b/tests/networkxml2xmlout/nat-network-name-with-quotes.xml
similarity index 90%
copy from tests/networkxml2confdata/nat-network-dns-srv-record-minimal.xml
copy to tests/networkxml2xmlout/nat-network-name-with-quotes.xml
index 13b1c247d5..c0a9cedc7d 100644
--- a/tests/networkxml2confdata/nat-network-dns-srv-record-minimal.xml
+++ b/tests/networkxml2xmlout/nat-network-name-with-quotes.xml
@@ -1,10 +1,11 @@
<network>
- <name>default</name>
+ <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'/>
+ <mac address='52:54:00:00:00:00'/>
<dns>
<srv service='name' protocol='tcp'/>
</dns>
diff --git a/tests/networkxml2xmlout/nat-network-dns-srv-record-minimal.xml b/tests/networkxml2xmlout/ptr-domains-auto.xml
similarity index 79%
copy from tests/networkxml2xmlout/nat-network-dns-srv-record-minimal.xml
copy to tests/networkxml2xmlout/ptr-domains-auto.xml
index 50e968be9d..fe2047b708 100644
--- a/tests/networkxml2xmlout/nat-network-dns-srv-record-minimal.xml
+++ b/tests/networkxml2xmlout/ptr-domains-auto.xml
@@ -6,19 +6,16 @@
</forward>
<bridge name='virbr0' stp='on' delay='0'/>
<mac address='52:54:00:00:00:00'/>
- <dns>
- <srv service='name' protocol='tcp'/>
- </dns>
- <ip address='192.168.122.1' netmask='255.255.255.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'>
+ <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'>
+ <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>
diff --git a/tests/networkxml2xmltest.c b/tests/networkxml2xmltest.c
index 4a4cf329e4..a8dacfe0f3 100644
--- a/tests/networkxml2xmltest.c
+++ b/tests/networkxml2xmltest.c
@@ -144,6 +144,8 @@ mymain(void)
#define DO_TEST_VALIDATE_ERROR(name) \
DO_TEST_FULL(name, 0, TEST_COMPARE_NET_XML2XML_RESULT_FAIL_VALIDATE)
+ DO_TEST("dhcp6-network");
+ DO_TEST("dhcp6-nat-network");
DO_TEST("dhcp6host-routed-network");
DO_TEST("empty-allow-ipv6");
DO_TEST("isolated-network");
@@ -164,9 +166,11 @@ mymain(void)
DO_TEST("nat-network-dns-forward-plain");
DO_TEST("nat-network-dns-forwarders");
DO_TEST("nat-network-dns-forwarder-no-resolv");
+ DO_TEST("nat-network-dns-local-domain");
DO_TEST("nat-network-forward-nat-ipv6");
DO_TEST("nat-network-forward-nat-address");
DO_TEST("nat-network-forward-nat-no-address");
+ DO_TEST("nat-network-name-with-quotes");
DO_TEST("nat-network-mtu");
DO_TEST("8021Qbh-net");
DO_TEST("direct-net");
@@ -178,7 +182,7 @@ mymain(void)
DO_TEST("hostdev");
DO_TEST_FLAGS("hostdev-pf", VIR_NETWORK_XML_INACTIVE);
DO_TEST_FLAGS("hostdev-pf-driver-model", VIR_NETWORK_XML_INACTIVE);
-
+ DO_TEST("ptr-domains-auto");
DO_TEST_VALIDATE_ERROR("passthrough-address-crash");
DO_TEST("nat-network-explicit-flood");
DO_TEST("host-bridge-no-flood");
diff --git a/tests/networkxml2xmlupdatein/srv-record-protocol.xml b/tests/networkxml2xmlupdatein/srv-record-protocol.xml
index 87478d033b..934a36a9be 100644
--- a/tests/networkxml2xmlupdatein/srv-record-protocol.xml
+++ b/tests/networkxml2xmlupdatein/srv-record-protocol.xml
@@ -1 +1 @@
-<srv protocol='tcp'/>
+<srv protocol='tcp' target='test7.example.com'/>
diff --git a/tests/networkxml2xmlupdateout/nat-network-dns-hosts-modified.xml b/tests/networkxml2xmlupdateout/nat-network-dns-hosts-modified.xml
index 8fcaad15d1..3183671376 100644
--- a/tests/networkxml2xmlupdateout/nat-network-dns-hosts-modified.xml
+++ b/tests/networkxml2xmlupdateout/nat-network-dns-hosts-modified.xml
@@ -5,6 +5,7 @@
<interface dev='eth0'/>
</forward>
<bridge name='virbr0' stp='on' delay='0'/>
+ <domain name='example.com'/>
<dns forwardPlainNames='no'>
<host ip='192.168.122.122'>
<hostname>pudding</hostname>
diff --git a/tests/networkxml2xmlupdateout/nat-network-dns-more-hosts.xml b/tests/networkxml2xmlupdateout/nat-network-dns-more-hosts.xml
index 7b8a451b67..21e4ebde5f 100644
--- a/tests/networkxml2xmlupdateout/nat-network-dns-more-hosts.xml
+++ b/tests/networkxml2xmlupdateout/nat-network-dns-more-hosts.xml
@@ -5,6 +5,7 @@
<interface dev='eth0'/>
</forward>
<bridge name='virbr0' stp='on' delay='0'/>
+ <domain name='example.com'/>
<dns forwardPlainNames='no'>
<host ip='f0:d::f0:d'>
<hostname>pudding</hostname>
diff --git a/tests/networkxml2xmlupdateout/nat-network-dns-srv-records.xml b/tests/networkxml2xmlupdateout/nat-network-dns-srv-records.xml
index eda9e20333..2bdd9321ff 100644
--- a/tests/networkxml2xmlupdateout/nat-network-dns-srv-records.xml
+++ b/tests/networkxml2xmlupdateout/nat-network-dns-srv-records.xml
@@ -7,6 +7,12 @@
<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'/>
<srv service='name' protocol='tcp' domain='donkey' target='.' port='404' priority='10' weight='10'/>
</dns>
<ip address='192.168.122.1' netmask='255.255.255.0'>
diff --git a/tests/networkxml2xmlupdateout/nat-network-forward-ifaces.xml b/tests/networkxml2xmlupdateout/nat-network-forward-ifaces.xml
index 6b87cd8789..13d1fdfa6d 100644
--- a/tests/networkxml2xmlupdateout/nat-network-forward-ifaces.xml
+++ b/tests/networkxml2xmlupdateout/nat-network-forward-ifaces.xml
@@ -8,6 +8,12 @@
<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>
diff --git a/tests/networkxml2xmlupdateout/nat-network-no-forward-ifaces.xml b/tests/networkxml2xmlupdateout/nat-network-no-forward-ifaces.xml
index ae49a3034e..79c97a508f 100644
--- a/tests/networkxml2xmlupdateout/nat-network-no-forward-ifaces.xml
+++ b/tests/networkxml2xmlupdateout/nat-network-no-forward-ifaces.xml
@@ -5,6 +5,12 @@
<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>
diff --git a/tests/networkxml2xmlupdateout/nat-network-no-hosts.xml b/tests/networkxml2xmlupdateout/nat-network-no-hosts.xml
index 679575973c..e3c88ff534 100644
--- a/tests/networkxml2xmlupdateout/nat-network-no-hosts.xml
+++ b/tests/networkxml2xmlupdateout/nat-network-no-hosts.xml
@@ -5,6 +5,7 @@
<interface dev='eth0'/>
</forward>
<bridge name='virbr0' stp='on' delay='0'/>
+ <domain name='example.com'/>
<dns forwardPlainNames='no'>
<host ip='192.168.122.122'>
<hostname>pudding</hostname>
diff --git a/tests/networkxml2xmlupdateout/nat-network.xml b/tests/networkxml2xmlupdateout/nat-network.xml
index 93bc7db51d..741352ef14 100644
--- a/tests/networkxml2xmlupdateout/nat-network.xml
+++ b/tests/networkxml2xmlupdateout/nat-network.xml
@@ -5,6 +5,14 @@
<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'/>
+ </dns>
<ip address='192.168.122.1' netmask='255.255.255.0'>
<dhcp>
<range start='192.168.122.2' end='192.168.122.254'/>
--
2.52.0© 2016 - 2026 Red Hat, Inc.