3:42 a.m.
This matches the style we use elsewhere and allows
nat-network-dns-srv-record{,-minimal}.xml to be tested in
network XML -> XML test.
---
src/conf/network_conf.c | 24 +++++++++++-----------
src/network/default.xml | 4 ++--
src/test/test_driver.c | 4 ++--
tests/networkxml2xmltest.c | 2 ++
tests/networkxml2confdata/dhcp6-nat-network.xml | 20 +++++++++---------
tests/networkxml2confdata/dhcp6-network.xml | 14 ++++++-------
.../dhcp6host-routed-network.xml | 16 +++++++--------
tests/networkxml2confdata/isolated-network.xml | 4 ++--
.../networkxml2confdata/nat-network-dns-hosts.xml | 2 +-
.../nat-network-dns-srv-record-minimal.xml | 10 ++++-----
.../nat-network-dns-srv-record.xml | 10 ++++-----
.../nat-network-dns-txt-record.xml | 10 ++++-----
tests/networkxml2confdata/nat-network.xml | 8 ++++----
tests/networkxml2confdata/netboot-network.xml | 8 ++++----
.../networkxml2confdata/netboot-proxy-network.xml | 6 +++---
tests/networkxml2confdata/routed-network.xml | 2 +-
tests/networkxml2xmlin/bandwidth-network.xml | 4 ++--
.../networkxml2xmlin/dhcp6host-routed-network.xml | 16 +++++++--------
tests/networkxml2xmlin/empty-allow-ipv6.xml | 2 +-
tests/networkxml2xmlin/isolated-network.xml | 4 ++--
tests/networkxml2xmlin/nat-network-dns-hosts.xml | 2 +-
.../nat-network-dns-srv-record-minimal.xml | 10 ++++-----
.../nat-network-dns-srv-record.xml | 10 ++++-----
.../nat-network-dns-txt-record.xml | 10 ++++-----
tests/networkxml2xmlin/nat-network.xml | 8 ++++----
tests/networkxml2xmlin/netboot-network.xml | 6 +++---
tests/networkxml2xmlin/netboot-proxy-network.xml | 4 ++--
tests/networkxml2xmlin/routed-network.xml | 2 +-
tests/networkxml2xmlout/bandwidth-network.xml | 4 ++--
.../networkxml2xmlout/dhcp6host-routed-network.xml | 16 +++++++--------
tests/networkxml2xmlout/empty-allow-ipv6.xml | 2 +-
tests/networkxml2xmlout/host-bridge-net.xml | 2 +-
tests/networkxml2xmlout/isolated-network.xml | 4 ++--
tests/networkxml2xmlout/nat-network-dns-hosts.xml | 2 +-
.../nat-network-dns-srv-record-minimal.xml | 10 ++++-----
.../nat-network-dns-srv-record.xml | 10 ++++-----
.../nat-network-dns-txt-record.xml | 10 ++++-----
tests/networkxml2xmlout/nat-network.xml | 8 ++++----
tests/networkxml2xmlout/netboot-network.xml | 8 ++++----
tests/networkxml2xmlout/netboot-proxy-network.xml | 6 +++---
tests/networkxml2xmlout/routed-network.xml | 2 +-
41 files changed, 154 insertions(+), 152 deletions(-)
diff --git a/src/conf/network_conf.c b/src/conf/network_conf.c
index e3998f3..0bf72e8 100644
--- a/src/conf/network_conf.c
+++ b/src/conf/network_conf.c
@@ -2259,7 +2259,7 @@ virNetworkDNSDefFormat(virBufferPtr buf,
virBufferAdjustIndent(buf, 2);
for (i = 0; i < def->ntxts; i++) {
- virBufferAsprintf(buf, "<txt name='%s' value='%s'
/>\n",
+ virBufferAsprintf(buf, "<txt name='%s'
value='%s'/>\n",
def->txts[i].name,
def->txts[i].value);
}
@@ -2338,7 +2338,7 @@ virNetworkIpDefFormat(virBufferPtr buf,
virBufferAdjustIndent(buf, 2);
if (def->tftproot) {
- virBufferEscapeString(buf, "<tftp root='%s' />\n",
+ virBufferEscapeString(buf, "<tftp root='%s'/>\n",
def->tftproot);
}
if ((def->nranges || def->nhosts)) {
@@ -2355,36 +2355,36 @@ virNetworkIpDefFormat(virBufferPtr buf,
VIR_FREE(saddr);
goto error;
}
- virBufferAsprintf(buf, "<range start='%s' end='%s'
/>\n",
+ virBufferAsprintf(buf, "<range start='%s'
end='%s'/>\n",
saddr, eaddr);
VIR_FREE(saddr);
VIR_FREE(eaddr);
}
for (i = 0; i < def->nhosts; i++) {
- virBufferAddLit(buf, "<host ");
+ virBufferAddLit(buf, "<host");
if (def->hosts[i].mac)
- virBufferAsprintf(buf, "mac='%s' ",
def->hosts[i].mac);
+ virBufferAsprintf(buf, " mac='%s'",
def->hosts[i].mac);
if (def->hosts[i].id)
- virBufferAsprintf(buf, "id='%s' ",
def->hosts[i].id);
+ virBufferAsprintf(buf, " id='%s'",
def->hosts[i].id);
if (def->hosts[i].name)
- virBufferAsprintf(buf, "name='%s' ",
def->hosts[i].name);
+ virBufferAsprintf(buf, " name='%s'",
def->hosts[i].name);
if (VIR_SOCKET_ADDR_VALID(&def->hosts[i].ip)) {
char *ipaddr = virSocketAddrFormat(&def->hosts[i].ip);
if (!ipaddr)
goto error;
- virBufferAsprintf(buf, "ip='%s' ", ipaddr);
+ virBufferAsprintf(buf, " ip='%s'", ipaddr);
VIR_FREE(ipaddr);
}
virBufferAddLit(buf, "/>\n");
}
if (def->bootfile) {
- virBufferEscapeString(buf, "<bootp file='%s' ",
+ virBufferEscapeString(buf, "<bootp file='%s'",
def->bootfile);
if (VIR_SOCKET_ADDR_VALID(&def->bootserver)) {
char *ipaddr = virSocketAddrFormat(&def->bootserver);
if (!ipaddr)
goto error;
- virBufferEscapeString(buf, "server='%s' ", ipaddr);
+ virBufferEscapeString(buf, " server='%s'", ipaddr);
VIR_FREE(ipaddr);
}
virBufferAddLit(buf, "/>\n");
@@ -2632,12 +2632,12 @@ virNetworkDefFormatInternal(virBufferPtr buf,
virBufferAddLit(buf, "<bridge");
if (def->bridge)
virBufferEscapeString(buf, " name='%s'", def->bridge);
- virBufferAsprintf(buf, " stp='%s' delay='%ld'
/>\n",
+ virBufferAsprintf(buf, " stp='%s' delay='%ld'/>\n",
def->stp ? "on" : "off",
def->delay);
} else if (def->forward.type == VIR_NETWORK_FORWARD_BRIDGE &&
def->bridge) {
- virBufferEscapeString(buf, "<bridge name='%s' />\n",
def->bridge);
+ virBufferEscapeString(buf, "<bridge name='%s'/>\n",
def->bridge);
}
diff --git a/src/network/default.xml b/src/network/default.xml
index 9cfc01e..d7241d0 100644
--- a/src/network/default.xml
+++ b/src/network/default.xml
@@ -1,10 +1,10 @@
<network>
<name>default</name>
- <bridge name="virbr0" />
+ <bridge name="virbr0"/>
<forward/>
<ip address="192.168.122.1" netmask="255.255.255.0">
<dhcp>
- <range start="192.168.122.2" end="192.168.122.254" />
+ <range start="192.168.122.2" end="192.168.122.254"/>
</dhcp>
</ip>
</network>
diff --git a/src/test/test_driver.c b/src/test/test_driver.c
index f7eaf06..db89f2f 100644
--- a/src/test/test_driver.c
+++ b/src/test/test_driver.c
@@ -250,11 +250,11 @@ static const char *defaultNetworkXML =
"<network>"
" <name>default</name>"
" <uuid>dd8fe884-6c02-601e-7551-cca97df1c5df</uuid>"
-" <bridge name='virbr0' />"
+" <bridge name='virbr0'/>"
" <forward/>"
" <ip address='192.168.122.1' netmask='255.255.255.0'>"
" <dhcp>"
-" <range start='192.168.122.2' end='192.168.122.254'
/>"
+" <range start='192.168.122.2'
end='192.168.122.254'/>"
" </dhcp>"
" </ip>"
"</network>";
diff --git a/tests/networkxml2xmltest.c b/tests/networkxml2xmltest.c
index 0dfed16..bb8a9ad 100644
--- a/tests/networkxml2xmltest.c
+++ b/tests/networkxml2xmltest.c
@@ -103,6 +103,8 @@ mymain(void)
DO_TEST("netboot-network");
DO_TEST("netboot-proxy-network");
DO_TEST("nat-network-dns-txt-record");
+ DO_TEST("nat-network-dns-srv-record");
+ DO_TEST("nat-network-dns-srv-record-minimal");
DO_TEST("nat-network-dns-hosts");
DO_TEST("8021Qbh-net");
DO_TEST("direct-net");
diff --git a/tests/networkxml2confdata/dhcp6-nat-network.xml
b/tests/networkxml2confdata/dhcp6-nat-network.xml
index 4259173..a67bde8 100644
--- a/tests/networkxml2confdata/dhcp6-nat-network.xml
+++ b/tests/networkxml2confdata/dhcp6-nat-network.xml
@@ -2,24 +2,24 @@
<name>default</name>
<uuid>81ff0d90-c91e-6742-64da-4a736edb9a9b</uuid>
<forward dev='eth1' mode='nat'/>
- <bridge name='virbr0' stp='on' delay='0' />
+ <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' />
+ <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: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' />
+ <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'>
diff --git a/tests/networkxml2confdata/dhcp6-network.xml
b/tests/networkxml2confdata/dhcp6-network.xml
index 776737e..ae9ff1f 100644
--- a/tests/networkxml2confdata/dhcp6-network.xml
+++ b/tests/networkxml2confdata/dhcp6-network.xml
@@ -2,16 +2,16 @@
<name>default</name>
<uuid>81ff0d90-c91e-6742-64da-4a736edb9a9b</uuid>
<forward dev='eth1' mode='nat'/>
- <bridge name='virbr0' stp='on' delay='0' />
+ <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' />
+ <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/networkxml2confdata/dhcp6host-routed-network.xml
b/tests/networkxml2confdata/dhcp6host-routed-network.xml
index 2693d87..42b9d3f 100644
--- a/tests/networkxml2confdata/dhcp6host-routed-network.xml
+++ b/tests/networkxml2confdata/dhcp6host-routed-network.xml
@@ -2,21 +2,21 @@
<name>local</name>
<uuid>81ff0d90-c91e-6742-64da-4a736edb9a9b</uuid>
<forward dev='eth1' mode='route'/>
- <bridge name='virbr1' stp='on' delay='0' />
+ <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' />
+ <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' />
+ <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
index cc320a9..b22d4ea 100644
--- a/tests/networkxml2confdata/isolated-network.xml
+++ b/tests/networkxml2confdata/isolated-network.xml
@@ -1,11 +1,11 @@
<network>
<name>private</name>
<uuid>81ff0d90-c91e-6742-64da-4a736edb9a9b</uuid>
- <bridge name='virbr2' stp='on' delay='0' />
+ <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' />
+ <range start='192.168.152.2' end='192.168.152.254'/>
</dhcp>
</ip>
</network>
diff --git a/tests/networkxml2confdata/nat-network-dns-hosts.xml
b/tests/networkxml2confdata/nat-network-dns-hosts.xml
index 2180a5d..d634e5e 100644
--- a/tests/networkxml2confdata/nat-network-dns-hosts.xml
+++ b/tests/networkxml2confdata/nat-network-dns-hosts.xml
@@ -2,7 +2,7 @@
<name>default</name>
<uuid>81ff0d90-c91e-6742-64da-4a736edb9a9c</uuid>
<forward dev='eth0' mode='nat'/>
- <bridge name='virbr0' stp='on' delay='0' />
+ <bridge name='virbr0' stp='on' delay='0'/>
<domain name="example.com"/>
<dns>
<host ip='192.168.122.1'>
diff --git a/tests/networkxml2confdata/nat-network-dns-srv-record-minimal.xml
b/tests/networkxml2confdata/nat-network-dns-srv-record-minimal.xml
index f6f24e1..13b1c24 100644
--- a/tests/networkxml2confdata/nat-network-dns-srv-record-minimal.xml
+++ b/tests/networkxml2confdata/nat-network-dns-srv-record-minimal.xml
@@ -4,15 +4,15 @@
<forward dev='eth1' mode='nat'>
<interface dev='eth1'/>
</forward>
- <bridge name='virbr0' stp='on' delay='0' />
+ <bridge name='virbr0' stp='on' delay='0'/>
<dns>
- <srv service='name' protocol='tcp' />
+ <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'/>
+ <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'>
diff --git a/tests/networkxml2confdata/nat-network-dns-srv-record.xml
b/tests/networkxml2confdata/nat-network-dns-srv-record.xml
index 4be85b5..3dd19e6 100644
--- a/tests/networkxml2confdata/nat-network-dns-srv-record.xml
+++ b/tests/networkxml2confdata/nat-network-dns-srv-record.xml
@@ -4,15 +4,15 @@
<forward dev='eth1' mode='nat'>
<interface dev='eth1'/>
</forward>
- <bridge name='virbr0' stp='on' delay='0' />
+ <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='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' />
- <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'/>
+ <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'>
diff --git a/tests/networkxml2confdata/nat-network-dns-txt-record.xml
b/tests/networkxml2confdata/nat-network-dns-txt-record.xml
index bd16976..0a6bd59 100644
--- a/tests/networkxml2confdata/nat-network-dns-txt-record.xml
+++ b/tests/networkxml2confdata/nat-network-dns-txt-record.xml
@@ -2,15 +2,15 @@
<name>default</name>
<uuid>81ff0d90-c91e-6742-64da-4a736edb9a9b</uuid>
<forward dev='eth1' mode='nat'/>
- <bridge name='virbr0' stp='on' delay='0' />
+ <bridge name='virbr0' stp='on' delay='0'/>
<dns>
- <txt name='example' value='example value' />
+ <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' />
+ <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'>
diff --git a/tests/networkxml2confdata/nat-network.xml
b/tests/networkxml2confdata/nat-network.xml
index eb71d9e..e44d35d 100644
--- a/tests/networkxml2confdata/nat-network.xml
+++ b/tests/networkxml2confdata/nat-network.xml
@@ -2,12 +2,12 @@
<name>default</name>
<uuid>81ff0d90-c91e-6742-64da-4a736edb9a9b</uuid>
<forward dev='eth1' mode='nat'/>
- <bridge name='virbr0' stp='on' delay='0' />
+ <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' />
+ <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'>
diff --git a/tests/networkxml2confdata/netboot-network.xml
b/tests/networkxml2confdata/netboot-network.xml
index b8a4d99..8d5ad31 100644
--- a/tests/networkxml2confdata/netboot-network.xml
+++ b/tests/networkxml2confdata/netboot-network.xml
@@ -2,13 +2,13 @@
<name>netboot</name>
<uuid>81ff0d90-c91e-6742-64da-4a736edb9a9b</uuid>
<forward mode='nat'/>
- <bridge name='virbr1' stp='off' delay='1' />
+ <bridge name='virbr1' stp='off' delay='1'/>
<domain name='example.com'/>
<ip address='192.168.122.1' netmask='255.255.255.0'>
- <tftp root='/var/lib/tftproot' />
+ <tftp root='/var/lib/tftproot'/>
<dhcp>
- <range start='192.168.122.2' end='192.168.122.254' />
- <bootp file='pxeboot.img' />
+ <range start='192.168.122.2' end='192.168.122.254'/>
+ <bootp file='pxeboot.img'/>
</dhcp>
</ip>
</network>
diff --git a/tests/networkxml2confdata/netboot-proxy-network.xml
b/tests/networkxml2confdata/netboot-proxy-network.xml
index e11c50b..a5b7c1e 100644
--- a/tests/networkxml2confdata/netboot-proxy-network.xml
+++ b/tests/networkxml2confdata/netboot-proxy-network.xml
@@ -2,12 +2,12 @@
<name>netboot</name>
<uuid>81ff0d90-c91e-6742-64da-4a736edb9a9b</uuid>
<forward mode='nat'/>
- <bridge name='virbr1' stp='off' delay='1' />
+ <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' />
+ <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/routed-network.xml
b/tests/networkxml2confdata/routed-network.xml
index 3aa8109..6b0853a 100644
--- a/tests/networkxml2confdata/routed-network.xml
+++ b/tests/networkxml2confdata/routed-network.xml
@@ -2,7 +2,7 @@
<name>local</name>
<uuid>81ff0d90-c91e-6742-64da-4a736edb9a9b</uuid>
<forward dev='eth1' mode='route'/>
- <bridge name='virbr1' stp='on' delay='0' />
+ <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>
diff --git a/tests/networkxml2xmlin/bandwidth-network.xml
b/tests/networkxml2xmlin/bandwidth-network.xml
index 555ee18..5164a1e 100644
--- a/tests/networkxml2xmlin/bandwidth-network.xml
+++ b/tests/networkxml2xmlin/bandwidth-network.xml
@@ -2,7 +2,7 @@
<name>test-net</name>
<uuid>986fed9e-a488-186d-ef2d-17ebfd1993f8</uuid>
<forward mode='nat'/>
- <bridge name='virbr1' stp='on' delay='0' />
+ <bridge name='virbr1' stp='on' delay='0'/>
<mac address='52:54:00:E6:A2:C9'/>
<bandwidth>
<inbound average='1000' peak='2000' burst='1024'/>
@@ -10,7 +10,7 @@
</bandwidth>
<ip address='192.168.120.1' netmask='255.255.255.0'>
<dhcp>
- <range start='192.168.120.2' end='192.168.120.254' />
+ <range start='192.168.120.2' end='192.168.120.254'/>
</dhcp>
</ip>
</network>
diff --git a/tests/networkxml2xmlin/dhcp6host-routed-network.xml
b/tests/networkxml2xmlin/dhcp6host-routed-network.xml
index 40f6dfe..59f89e4 100644
--- a/tests/networkxml2xmlin/dhcp6host-routed-network.xml
+++ b/tests/networkxml2xmlin/dhcp6host-routed-network.xml
@@ -2,21 +2,21 @@
<name>local</name>
<uuid>81ff0d90-c91e-6742-64da-4a736edb9a9b</uuid>
<forward dev='eth1' mode='route'/>
- <bridge name='virbr1' stp='on' delay='0' />
+ <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' />
+ <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' />
+ <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>
<route address="192.168.222.0" netmask="255.255.255.0"
gateway="192.168.122.10"/>
diff --git a/tests/networkxml2xmlin/empty-allow-ipv6.xml
b/tests/networkxml2xmlin/empty-allow-ipv6.xml
index 9d1e4e4..78abfa3 100644
--- a/tests/networkxml2xmlin/empty-allow-ipv6.xml
+++ b/tests/networkxml2xmlin/empty-allow-ipv6.xml
@@ -1,6 +1,6 @@
<network ipv6='yes'>
<name>empty</name>
<uuid>81ff0d90-c91e-6742-64da-4a736edb9a9c</uuid>
- <bridge name='virbr7' />
+ <bridge name='virbr7'/>
<mac address='52:54:00:17:3F:47'/>
</network>
diff --git a/tests/networkxml2xmlin/isolated-network.xml
b/tests/networkxml2xmlin/isolated-network.xml
index 5aa88c1..0c51c64 100644
--- a/tests/networkxml2xmlin/isolated-network.xml
+++ b/tests/networkxml2xmlin/isolated-network.xml
@@ -1,11 +1,11 @@
<network ipv6='no'>
<name>private</name>
<uuid>81ff0d90-c91e-6742-64da-4a736edb9a9b</uuid>
- <bridge name="virbr2" />
+ <bridge name="virbr2"/>
<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" />
+ <range start="192.168.152.2" end="192.168.152.254"/>
</dhcp>
</ip>
</network>
diff --git a/tests/networkxml2xmlin/nat-network-dns-hosts.xml
b/tests/networkxml2xmlin/nat-network-dns-hosts.xml
index 9a83fed..3babb5c 100644
--- a/tests/networkxml2xmlin/nat-network-dns-hosts.xml
+++ b/tests/networkxml2xmlin/nat-network-dns-hosts.xml
@@ -2,7 +2,7 @@
<name>default</name>
<uuid>81ff0d90-c91e-6742-64da-4a736edb9a9c</uuid>
<forward dev='eth0' mode='nat'/>
- <bridge name='virbr0' stp='on' delay='0' />
+ <bridge name='virbr0' stp='on' delay='0'/>
<dns>
<host ip='192.168.122.1'>
<hostname>host</hostname>
diff --git a/tests/networkxml2xmlin/nat-network-dns-srv-record-minimal.xml
b/tests/networkxml2xmlin/nat-network-dns-srv-record-minimal.xml
index e9b7680..a18afae 100644
--- a/tests/networkxml2xmlin/nat-network-dns-srv-record-minimal.xml
+++ b/tests/networkxml2xmlin/nat-network-dns-srv-record-minimal.xml
@@ -4,15 +4,15 @@
<forward dev='eth1' mode='nat'>
<interface dev='eth1'/>
</forward>
- <bridge name='virbr0' stp='on' delay='0' />
+ <bridge name='virbr0' stp='on' delay='0'/>
<dns>
- <srv service='name' protocol='tcp' />
+ <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'/>
+ <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'>
diff --git a/tests/networkxml2xmlin/nat-network-dns-srv-record.xml
b/tests/networkxml2xmlin/nat-network-dns-srv-record.xml
index 4be85b5..3dd19e6 100644
--- a/tests/networkxml2xmlin/nat-network-dns-srv-record.xml
+++ b/tests/networkxml2xmlin/nat-network-dns-srv-record.xml
@@ -4,15 +4,15 @@
<forward dev='eth1' mode='nat'>
<interface dev='eth1'/>
</forward>
- <bridge name='virbr0' stp='on' delay='0' />
+ <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='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' />
- <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'/>
+ <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'>
diff --git a/tests/networkxml2xmlin/nat-network-dns-txt-record.xml
b/tests/networkxml2xmlin/nat-network-dns-txt-record.xml
index bd16976..0a6bd59 100644
--- a/tests/networkxml2xmlin/nat-network-dns-txt-record.xml
+++ b/tests/networkxml2xmlin/nat-network-dns-txt-record.xml
@@ -2,15 +2,15 @@
<name>default</name>
<uuid>81ff0d90-c91e-6742-64da-4a736edb9a9b</uuid>
<forward dev='eth1' mode='nat'/>
- <bridge name='virbr0' stp='on' delay='0' />
+ <bridge name='virbr0' stp='on' delay='0'/>
<dns>
- <txt name='example' value='example value' />
+ <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' />
+ <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'>
diff --git a/tests/networkxml2xmlin/nat-network.xml
b/tests/networkxml2xmlin/nat-network.xml
index 23f7fcb..4fdde79 100644
--- a/tests/networkxml2xmlin/nat-network.xml
+++ b/tests/networkxml2xmlin/nat-network.xml
@@ -1,13 +1,13 @@
<network>
<name>default</name>
<uuid>81ff0d90-c91e-6742-64da-4a736edb9a9b</uuid>
- <bridge name="virbr0" />
+ <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" />
- <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"/>
+ <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">
diff --git a/tests/networkxml2xmlin/netboot-network.xml
b/tests/networkxml2xmlin/netboot-network.xml
index ed75663..0db79e3 100644
--- a/tests/networkxml2xmlin/netboot-network.xml
+++ b/tests/networkxml2xmlin/netboot-network.xml
@@ -5,10 +5,10 @@
<domain name="example.com"/>
<forward/>
<ip address="192.168.122.1" netmask="255.255.255.0">
- <tftp root="/var/lib/tftproot" />
+ <tftp root="/var/lib/tftproot"/>
<dhcp>
- <range start="192.168.122.2" end="192.168.122.254" />
- <bootp file="pxeboot.img" />
+ <range start="192.168.122.2" end="192.168.122.254"/>
+ <bootp file="pxeboot.img"/>
</dhcp>
</ip>
</network>
diff --git a/tests/networkxml2xmlin/netboot-proxy-network.xml
b/tests/networkxml2xmlin/netboot-proxy-network.xml
index ecb6738..0f02cee 100644
--- a/tests/networkxml2xmlin/netboot-proxy-network.xml
+++ b/tests/networkxml2xmlin/netboot-proxy-network.xml
@@ -6,8 +6,8 @@
<forward/>
<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" />
+ <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/networkxml2xmlin/routed-network.xml
b/tests/networkxml2xmlin/routed-network.xml
index 61d73c0..ab5e15b 100644
--- a/tests/networkxml2xmlin/routed-network.xml
+++ b/tests/networkxml2xmlin/routed-network.xml
@@ -1,7 +1,7 @@
<network>
<name>local</name>
<uuid>81ff0d90-c91e-6742-64da-4a736edb9a9b</uuid>
- <bridge name="virbr1" />
+ <bridge name="virbr1"/>
<mac address='12:34:56:78:9A:BC'/>
<forward mode="route" dev="eth1"/>
<ip address="192.168.122.1" netmask="255.255.255.0">
diff --git a/tests/networkxml2xmlout/bandwidth-network.xml
b/tests/networkxml2xmlout/bandwidth-network.xml
index c0c8ac3..7294ae1 100644
--- a/tests/networkxml2xmlout/bandwidth-network.xml
+++ b/tests/networkxml2xmlout/bandwidth-network.xml
@@ -2,7 +2,7 @@
<name>test-net</name>
<uuid>986fed9e-a488-186d-ef2d-17ebfd1993f8</uuid>
<forward mode='nat'/>
- <bridge name='virbr1' stp='on' delay='0' />
+ <bridge name='virbr1' stp='on' delay='0'/>
<mac address='52:54:00:e6:a2:c9'/>
<bandwidth>
<inbound average='1000' peak='2000' burst='1024'/>
@@ -10,7 +10,7 @@
</bandwidth>
<ip address='192.168.120.1' netmask='255.255.255.0'>
<dhcp>
- <range start='192.168.120.2' end='192.168.120.254' />
+ <range start='192.168.120.2' end='192.168.120.254'/>
</dhcp>
</ip>
</network>
diff --git a/tests/networkxml2xmlout/dhcp6host-routed-network.xml
b/tests/networkxml2xmlout/dhcp6host-routed-network.xml
index fc8666b..b275afa 100644
--- a/tests/networkxml2xmlout/dhcp6host-routed-network.xml
+++ b/tests/networkxml2xmlout/dhcp6host-routed-network.xml
@@ -4,21 +4,21 @@
<forward dev='eth1' mode='route'>
<interface dev='eth1'/>
</forward>
- <bridge name='virbr1' stp='on' delay='0' />
+ <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' />
+ <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' />
+ <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>
<route address='192.168.222.0' netmask='255.255.255.0'
gateway='192.168.122.10'/>
diff --git a/tests/networkxml2xmlout/empty-allow-ipv6.xml
b/tests/networkxml2xmlout/empty-allow-ipv6.xml
index 53e4fa7..f355285 100644
--- a/tests/networkxml2xmlout/empty-allow-ipv6.xml
+++ b/tests/networkxml2xmlout/empty-allow-ipv6.xml
@@ -1,6 +1,6 @@
<network ipv6='yes'>
<name>empty</name>
<uuid>81ff0d90-c91e-6742-64da-4a736edb9a9c</uuid>
- <bridge name='virbr7' stp='on' delay='0' />
+ <bridge name='virbr7' stp='on' delay='0'/>
<mac address='52:54:00:17:3f:47'/>
</network>
diff --git a/tests/networkxml2xmlout/host-bridge-net.xml
b/tests/networkxml2xmlout/host-bridge-net.xml
index 84992a9..c76d64a 100644
--- a/tests/networkxml2xmlout/host-bridge-net.xml
+++ b/tests/networkxml2xmlout/host-bridge-net.xml
@@ -2,5 +2,5 @@
<name>host-bridge-net</name>
<uuid>81ff0d90-c91e-6742-64da-4a736edb9a8e</uuid>
<forward mode='bridge'/>
- <bridge name='br0' />
+ <bridge name='br0'/>
</network>
diff --git a/tests/networkxml2xmlout/isolated-network.xml
b/tests/networkxml2xmlout/isolated-network.xml
index 9ff1f55..e2c6283 100644
--- a/tests/networkxml2xmlout/isolated-network.xml
+++ b/tests/networkxml2xmlout/isolated-network.xml
@@ -1,11 +1,11 @@
<network>
<name>private</name>
<uuid>81ff0d90-c91e-6742-64da-4a736edb9a9b</uuid>
- <bridge name='virbr2' stp='on' delay='0' />
+ <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' />
+ <range start='192.168.152.2' end='192.168.152.254'/>
</dhcp>
</ip>
</network>
diff --git a/tests/networkxml2xmlout/nat-network-dns-hosts.xml
b/tests/networkxml2xmlout/nat-network-dns-hosts.xml
index b26fa03..a2f46da 100644
--- a/tests/networkxml2xmlout/nat-network-dns-hosts.xml
+++ b/tests/networkxml2xmlout/nat-network-dns-hosts.xml
@@ -4,7 +4,7 @@
<forward dev='eth0' mode='nat'>
<interface dev='eth0'/>
</forward>
- <bridge name='virbr0' stp='on' delay='0' />
+ <bridge name='virbr0' stp='on' delay='0'/>
<dns>
<host ip='192.168.122.1'>
<hostname>host</hostname>
diff --git a/tests/networkxml2xmlout/nat-network-dns-srv-record-minimal.xml
b/tests/networkxml2xmlout/nat-network-dns-srv-record-minimal.xml
index e9b7680..a18afae 100644
--- a/tests/networkxml2xmlout/nat-network-dns-srv-record-minimal.xml
+++ b/tests/networkxml2xmlout/nat-network-dns-srv-record-minimal.xml
@@ -4,15 +4,15 @@
<forward dev='eth1' mode='nat'>
<interface dev='eth1'/>
</forward>
- <bridge name='virbr0' stp='on' delay='0' />
+ <bridge name='virbr0' stp='on' delay='0'/>
<dns>
- <srv service='name' protocol='tcp' />
+ <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'/>
+ <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'>
diff --git a/tests/networkxml2xmlout/nat-network-dns-srv-record.xml
b/tests/networkxml2xmlout/nat-network-dns-srv-record.xml
index 4be85b5..3dd19e6 100644
--- a/tests/networkxml2xmlout/nat-network-dns-srv-record.xml
+++ b/tests/networkxml2xmlout/nat-network-dns-srv-record.xml
@@ -4,15 +4,15 @@
<forward dev='eth1' mode='nat'>
<interface dev='eth1'/>
</forward>
- <bridge name='virbr0' stp='on' delay='0' />
+ <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='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' />
- <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'/>
+ <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'>
diff --git a/tests/networkxml2xmlout/nat-network-dns-txt-record.xml
b/tests/networkxml2xmlout/nat-network-dns-txt-record.xml
index f767f48..a459011 100644
--- a/tests/networkxml2xmlout/nat-network-dns-txt-record.xml
+++ b/tests/networkxml2xmlout/nat-network-dns-txt-record.xml
@@ -4,15 +4,15 @@
<forward dev='eth1' mode='nat'>
<interface dev='eth1'/>
</forward>
- <bridge name='virbr0' stp='on' delay='0' />
+ <bridge name='virbr0' stp='on' delay='0'/>
<dns>
- <txt name='example' value='example value' />
+ <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' />
+ <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'>
diff --git a/tests/networkxml2xmlout/nat-network.xml
b/tests/networkxml2xmlout/nat-network.xml
index 02d6849..93bc7db 100644
--- a/tests/networkxml2xmlout/nat-network.xml
+++ b/tests/networkxml2xmlout/nat-network.xml
@@ -4,12 +4,12 @@
<forward dev='eth1' mode='nat'>
<interface dev='eth1'/>
</forward>
- <bridge name='virbr0' stp='on' delay='0' />
+ <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' />
+ <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'>
diff --git a/tests/networkxml2xmlout/netboot-network.xml
b/tests/networkxml2xmlout/netboot-network.xml
index b8a4d99..8d5ad31 100644
--- a/tests/networkxml2xmlout/netboot-network.xml
+++ b/tests/networkxml2xmlout/netboot-network.xml
@@ -2,13 +2,13 @@
<name>netboot</name>
<uuid>81ff0d90-c91e-6742-64da-4a736edb9a9b</uuid>
<forward mode='nat'/>
- <bridge name='virbr1' stp='off' delay='1' />
+ <bridge name='virbr1' stp='off' delay='1'/>
<domain name='example.com'/>
<ip address='192.168.122.1' netmask='255.255.255.0'>
- <tftp root='/var/lib/tftproot' />
+ <tftp root='/var/lib/tftproot'/>
<dhcp>
- <range start='192.168.122.2' end='192.168.122.254' />
- <bootp file='pxeboot.img' />
+ <range start='192.168.122.2' end='192.168.122.254'/>
+ <bootp file='pxeboot.img'/>
</dhcp>
</ip>
</network>
diff --git a/tests/networkxml2xmlout/netboot-proxy-network.xml
b/tests/networkxml2xmlout/netboot-proxy-network.xml
index e11c50b..a5b7c1e 100644
--- a/tests/networkxml2xmlout/netboot-proxy-network.xml
+++ b/tests/networkxml2xmlout/netboot-proxy-network.xml
@@ -2,12 +2,12 @@
<name>netboot</name>
<uuid>81ff0d90-c91e-6742-64da-4a736edb9a9b</uuid>
<forward mode='nat'/>
- <bridge name='virbr1' stp='off' delay='1' />
+ <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' />
+ <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/networkxml2xmlout/routed-network.xml
b/tests/networkxml2xmlout/routed-network.xml
index cb81bae..81abf06 100644
--- a/tests/networkxml2xmlout/routed-network.xml
+++ b/tests/networkxml2xmlout/routed-network.xml
@@ -4,7 +4,7 @@
<forward dev='eth1' mode='route'>
<interface dev='eth1'/>
</forward>
- <bridge name='virbr1' stp='on' delay='0' />
+ <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>
--
1.8.1.5