summaryrefslogtreecommitdiff
path: root/tests/networkxml2confdata
diff options
context:
space:
mode:
authorJán Tomko <jtomko@redhat.com>2013-07-30 14:36:08 +0200
committerJán Tomko <jtomko@redhat.com>2013-08-28 08:05:46 +0200
commitd8bd24a9ecce1eead3059621c4e3c5ad1c3a087f (patch)
tree30e11cd059089eb42d1a3e0b8d70372083e0b49e /tests/networkxml2confdata
parent63ee776f8cd876b7d1a618bf4ca1cba1b62c35bd (diff)
downloadlibvirt-d8bd24a9ecce1eead3059621c4e3c5ad1c3a087f.tar.gz
Remove the space before the slash in network XML
This matches the style we use elsewhere and allows nat-network-dns-srv-record{,-minimal}.xml to be tested in network XML -> XML test.
Diffstat (limited to 'tests/networkxml2confdata')
-rw-r--r--tests/networkxml2confdata/dhcp6-nat-network.xml20
-rw-r--r--tests/networkxml2confdata/dhcp6-network.xml14
-rw-r--r--tests/networkxml2confdata/dhcp6host-routed-network.xml16
-rw-r--r--tests/networkxml2confdata/isolated-network.xml4
-rw-r--r--tests/networkxml2confdata/nat-network-dns-hosts.xml2
-rw-r--r--tests/networkxml2confdata/nat-network-dns-srv-record-minimal.xml10
-rw-r--r--tests/networkxml2confdata/nat-network-dns-srv-record.xml10
-rw-r--r--tests/networkxml2confdata/nat-network-dns-txt-record.xml10
-rw-r--r--tests/networkxml2confdata/nat-network.xml8
-rw-r--r--tests/networkxml2confdata/netboot-network.xml8
-rw-r--r--tests/networkxml2confdata/netboot-proxy-network.xml6
-rw-r--r--tests/networkxml2confdata/routed-network.xml2
12 files changed, 55 insertions, 55 deletions
diff --git a/tests/networkxml2confdata/dhcp6-nat-network.xml b/tests/networkxml2confdata/dhcp6-nat-network.xml
index 4259173854..a67bde8f39 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 776737e26c..ae9ff1f32c 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 2693d872fc..42b9d3f16a 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 cc320a9d22..b22d4ea775 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 351df4fb57..9add45656a 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 forwardPlainNames='no'>
<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 f6f24e1208..13b1c247d5 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 4be85b50a0..3dd19e6698 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 bd1697608c..0a6bd595ae 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 eb71d9ea38..e44d35d83d 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 b8a4d996fb..8d5ad31a00 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 e11c50b3ee..a5b7c1e4e6 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 3aa810929f..6b0853a0b4 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>