[libvirt] [PATCH v2 2/5] schema: Let elements in /network/ip be specified in any order

[Laine Stump]

On 12/13/2016 08:52 AM, Jiri Denemark wrote:
> Signed-off-by: Jiri Denemark <jdenemar at redhat.com>
> ---
>   docs/schemas/network.rng                        | 80 +++++++++++++------------
>   tests/networkxml2confdata/dhcp6-nat-network.xml |  2 +-
>   tests/networkxml2confdata/netboot-network.xml   |  2 +-
>   3 files changed, 44 insertions(+), 40 deletions(-)
>
> diff --git a/docs/schemas/network.rng b/docs/schemas/network.rng
> index 9d8c803ff..986119596 100644
> --- a/docs/schemas/network.rng
> +++ b/docs/schemas/network.rng
> @@ -339,48 +339,52 @@
>               <optional>
>                 <attribute name="family"><ref name="addr-family"/></attribute>
>               </optional>
> -            <optional>
> -              <element name="tftp">
> -                <attribute name="root"><text/></attribute>
> -              </element>
> -            </optional>
> -            <optional>
> -              <!-- Define the range(s) of IP addresses that the DHCP
> -                   server should hand out -->
> -              <element name="dhcp">
> -                <zeroOrMore>
> -                  <element name="range">
> -                    <attribute name="start"><ref name="ipAddr"/></attribute>
> -                    <attribute name="end"><ref name="ipAddr"/></attribute>
> -                  </element>
> -                </zeroOrMore>
> -                <zeroOrMore>
> -                  <element name="host">
> -                    <choice>
> -                      <group>
> +            <interleave>
> +              <optional>
> +                <element name="tftp">
> +                  <attribute name="root"><text/></attribute>
> +                </element>
> +              </optional>
> +              <optional>
> +                <!-- 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>
> +                        <attribute name="end"><ref name="ipAddr"/></attribute>
> +                      </element>
> +                    </zeroOrMore>
> +                    <zeroOrMore>
> +                      <element name="host">

[etc]

ACK ("git log -p -w" is my friend of the day :-)