schema: Let elements in /network/ip be specified in any order

Signed-off-by: NJiri Denemark <jdenemar@redhat.com>

docs/schemas/network.rng

@@ -339,6 +339,7 @@
             <optional>
               <attribute name="family"><ref name="addr-family"/></attribute>
             </optional>
+            <interleave>
               <optional>
                 <element name="tftp">
                   <attribute name="root"><text/></attribute>
@@ -348,6 +349,7 @@
                 <!-- Define the range(s) of IP addresses that the DHCP
                      server should hand out -->
                 <element name="dhcp">
+                  <interleave>
                     <zeroOrMore>
                       <element name="range">
                         <attribute name="start"><ref name="ipAddr"/></attribute>
@@ -379,8 +381,10 @@
                         </optional>
                       </element>
                     </optional>
+                  </interleave>
                 </element>
               </optional>
+            </interleave>
           </element>
         </zeroOrMore>
         <!-- <route> element -->

tests/networkxml2confdata/dhcp6-nat-network.xml

@@ -5,9 +5,9 @@
   <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'/>
     </dhcp>
   </ip>
   <ip family='ipv4' address='192.168.123.1' netmask='255.255.255.0'>

tests/networkxml2confdata/netboot-network.xml

@@ -5,10 +5,10 @@
   <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'/>
     <dhcp>
       <range start='192.168.122.2' end='192.168.122.254'/>
       <bootp file='pxeboot.img'/>
     </dhcp>
+    <tftp root='/var/lib/tftproot'/>
   </ip>
 </network>