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.

diff --git a/src/conf/network_conf.c b/src/conf/network_conf.c
index 8aef6098309e3c6078474775e938e0961e483636..10e6592308ee2b9c5946c27101a1b1d9fbaad29c 100644 (file)
--- a/src/conf/network_conf.c
+++ b/src/conf/network_conf.c
@@ -2283,7 +2283,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);
     }
@@ -2362,7 +2362,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)) {
@@ -2379,36 +2379,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");
@@ -2656,12 +2656,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 9cfc01ed78047f47f9e3c3bd1cc0951057b242bf..d7241d0c16271bb7598b5bc1bb90d8145183de50 100644 (file)
--- 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 d7b2e40a7acf3f308f7e51884c27a76c3200e890..c2256188dfeece01fbd7cdab9aefca2f7247ba16 100644 (file)
--- 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/networkxml2confdata/dhcp6-nat-network.xml b/tests/networkxml2confdata/dhcp6-nat-network.xml
index 4259173854ef94a2b1f80c49ef1397a9142bf367..a67bde8f39e06ec5529b8fe61e61b2b0e4d9f896 100644 (file)
--- 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 776737e26c26734ad5f8116a42c73d0696ae5044..ae9ff1f32cd2f49108d2751298a02496741709d7 100644 (file)
--- 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 2693d872fc3c4da71f9d5caa819424962dd66f3c..42b9d3f16a1caf145aa276712d859cfcd1a308ed 100644 (file)
--- 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 cc320a9d22b9f6c08dcc1ea10ecbe66b6405eb81..b22d4ea775b9d4dbcaa5813b6addaf79d54b820d 100644 (file)
--- 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 351df4fb5721004379ff76adcb28cc46c896e16f..9add45656aaf1063ab4192edc3512b471bb3466a 100644 (file)
--- 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 f6f24e1208b56a0cf4e00ea157bb49addb0f0caf..13b1c247d55203710e61e622cbf938927aef6d09 100644 (file)
--- 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 4be85b50a0c9e8131d4d7b18d3b0d80fcdd8b9ee..3dd19e6698284c76d8ae1a3be433ca08ff885a36 100644 (file)
--- 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 bd1697608c7253e1ecfb3627c1cdc25e8ed79fe3..0a6bd595ae4fa34f724a2eb43a9e5def00e4aa96 100644 (file)
--- 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 eb71d9ea382e001fba20d9b6467e83dba1656822..e44d35d83db57d8773481a7c42252360a3663dc6 100644 (file)
--- 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 b8a4d996fb394d9f853f4faf9ede0784e6df6a26..8d5ad31a0092e71afb712877d7c01f12147c8975 100644 (file)
--- 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 e11c50b3eee0d4ca018ae81f2da4ade4f8dceaa3..a5b7c1e4e6c4084b520a08abdb2144b98d6aee35 100644 (file)
--- 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 3aa810929fd2c6fed863402d91589f50a4a38fd4..6b0853a0b4dc1ab02cd0b9e4a7d863322ec34a73 100644 (file)
--- 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 555ee18662273a344f0f21dcf98f17744e76e4a5..5164a1e2c82e59641bdd1b839af05396b7bdabbb 100644 (file)
--- 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 40f6dfe90f8e4d2b7e1bde2949b24fa28a41e743..59f89e49b5ae2be71587ae85ac19bb9a4f58ec0f 100644 (file)
--- 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 9d1e4e44621100c65367687991ecabdb6933746d..78abfa34fdd805eb6447cda4dd21ee359fc1ddef 100644 (file)
--- 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 5aa88c12742292d3ee9d38a094e9a69174a377f3..0c51c64a575b617a401f24ed2c13f18d82efb668 100644 (file)
--- 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 954c9dbc9ef870f1e6593915810dd470622aff31..da65267ec58ab20447e93a080cc68e5336df50f2 100644 (file)
--- 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 forwardPlainNames='no'>
     <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 e9b7680603ce27cb67b9fb3bbe7c987edbcf9bff..a18afae2fd18ecffe465b7cc344205a797ba380b 100644 (file)
--- 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 4be85b50a0c9e8131d4d7b18d3b0d80fcdd8b9ee..3dd19e6698284c76d8ae1a3be433ca08ff885a36 100644 (file)
--- 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 bd1697608c7253e1ecfb3627c1cdc25e8ed79fe3..0a6bd595ae4fa34f724a2eb43a9e5def00e4aa96 100644 (file)
--- 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 23f7fcb1b264d3eb32ee56fde5443fee115c9b33..4fdde7950f0b4597159aba61692a915ea6def71e 100644 (file)
--- 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 ed756630534aa3487c6d6977eba734a426a711a0..0db79e3bef062cc94a8683a2dee5a3f1c0dadd29 100644 (file)
--- 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 ecb6738694fdda5e4ee8877087cc9f1590aed810..0f02ceee7c7f916f10578ea226a5d8fb4fd44136 100644 (file)
--- 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 61d73c0b865fcb2c46374e5f7e0b53ed88812bf7..ab5e15b1f6487449875b2aeee8d9969de55d936b 100644 (file)
--- 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 c0c8ac388210bd7f5fda4d9a3d5918c4d409b6fe..7294ae1a107a597fd3449532762bfa58a53f8001 100644 (file)
--- 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 fc8666b2580bff96f394ed4b7f16ba4b5bf22d1f..b275afa001427442b83d6ffac7f4f6929820c996 100644 (file)
--- 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 53e4fa7f8a92439e9eb90a997ef009741d90442d..f35528527355a32eca473494c36c32cbbba1934e 100644 (file)
--- 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 84992a923ed732b6164e36211c3285d5150e4e59..c76d64a5d68934a3caa3cfd81d477739b9cce3bd 100644 (file)
--- 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 9ff1f55d665c7668856b991fadb22474629567ec..e2c62834bdae4c326e54b1efa73ecf7c5afb4aa4 100644 (file)
--- 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-forward-plain.xml b/tests/networkxml2xmlout/nat-network-dns-forward-plain.xml
index 3b50828ae1295032e94299babcf22e542481cc84..7522f6ae1cf09b8a5b4127dae5646a28c8e580b6 100644 (file)
--- a/tests/networkxml2xmlout/nat-network-dns-forward-plain.xml
+++ b/tests/networkxml2xmlout/nat-network-dns-forward-plain.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 forwardPlainNames='yes'/>
   <ip address='192.168.122.1' netmask='255.255.255.0'>
   </ip>

diff --git a/tests/networkxml2xmlout/nat-network-dns-hosts.xml b/tests/networkxml2xmlout/nat-network-dns-hosts.xml
index b26fa03be1de694fe2a42fa078d36b3d5c9f7c5a..a2f46da8c15144d8dacf63f19dc8b325d81a6325 100644 (file)
--- 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 e9b7680603ce27cb67b9fb3bbe7c987edbcf9bff..a18afae2fd18ecffe465b7cc344205a797ba380b 100644 (file)
--- 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 4be85b50a0c9e8131d4d7b18d3b0d80fcdd8b9ee..3dd19e6698284c76d8ae1a3be433ca08ff885a36 100644 (file)
--- 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 f767f486b4cf9a3c8045daff7a9ccedc2a25daff..a4590119ef2a66ed84e36807a03adc005110bb65 100644 (file)
--- 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 02d68495c244f06d0b06518ce44b2053ed30085c..93bc7db51d15e63fe28bbf877acc14ac85265298 100644 (file)
--- 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 b8a4d996fb394d9f853f4faf9ede0784e6df6a26..8d5ad31a0092e71afb712877d7c01f12147c8975 100644 (file)
--- 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 e11c50b3eee0d4ca018ae81f2da4ade4f8dceaa3..a5b7c1e4e6c4084b520a08abdb2144b98d6aee35 100644 (file)
--- 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 cb81bae8a5e7dd67cb352a3fb3c0c425f5cdf155..81abf06e9fa32f5dd27c50e7e3d9e762e26826c9 100644 (file)
--- 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>

diff --git a/tests/networkxml2xmltest.c b/tests/networkxml2xmltest.c
index 11b3f02228f76c667d3c44e132c905a00f64651f..dbf12b0ef7ca0ad13bbad9140b3636784ffae765 100644 (file)
--- 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("nat-network-dns-forward-plain");
     DO_TEST("8021Qbh-net");