|
 |
60de42 |
From cad6b2007800516e466440a536cd11bd4bac19ab Mon Sep 17 00:00:00 2001
|
|
|
60de42 |
From: =?UTF-8?q?Jan=20Pokorn=C3=BD?= <jpokorny@redhat.com>
|
|
|
60de42 |
Date: Wed, 3 May 2017 11:55:10 +0200
|
|
|
60de42 |
Subject: [PATCH] Low: xml: relax the strict element order within the bundle
|
|
|
60de42 |
body
|
|
|
60de42 |
|
|
|
60de42 |
Technically, there's no need to require particular order as
|
|
|
60de42 |
unpack_container always sticks with the first occurrence of
|
|
|
60de42 |
the element carrying particular name.
|
|
|
60de42 |
---
|
|
|
60de42 |
xml/resources-2.8.rng | 156 +++++++++++++++++++++++++-------------------------
|
|
|
60de42 |
1 file changed, 79 insertions(+), 77 deletions(-)
|
|
|
60de42 |
|
|
|
60de42 |
diff --git a/xml/resources-2.8.rng b/xml/resources-2.8.rng
|
|
|
60de42 |
index b64fe27..e20215b 100644
|
|
|
60de42 |
--- a/xml/resources-2.8.rng
|
|
|
60de42 |
+++ b/xml/resources-2.8.rng
|
|
|
60de42 |
@@ -72,83 +72,85 @@
|
|
|
60de42 |
<optional>
|
|
|
60de42 |
<attribute name="description"><text/></attribute>
|
|
|
60de42 |
</optional>
|
|
|
60de42 |
- <choice>
|
|
|
60de42 |
- <element name="docker">
|
|
|
60de42 |
- <attribute name="image"><text/></attribute>
|
|
|
60de42 |
- <optional>
|
|
|
60de42 |
- <attribute name="replicas"><data type="integer"/></attribute>
|
|
|
60de42 |
- </optional>
|
|
|
60de42 |
- <optional>
|
|
|
60de42 |
- <attribute name="replicas-per-host"><data type="integer"/></attribute>
|
|
|
60de42 |
- </optional>
|
|
|
60de42 |
- <optional>
|
|
|
60de42 |
- <attribute name="masters"><data type="integer"/></attribute>
|
|
|
60de42 |
- </optional>
|
|
|
60de42 |
- <optional>
|
|
|
60de42 |
- <attribute name="run-command"> <text/></attribute>
|
|
|
60de42 |
- </optional>
|
|
|
60de42 |
- <optional>
|
|
|
60de42 |
- <attribute name="network"><text/></attribute>
|
|
|
60de42 |
- </optional>
|
|
|
60de42 |
- <optional>
|
|
|
60de42 |
- <attribute name="options"><text/></attribute>
|
|
|
60de42 |
- </optional>
|
|
|
60de42 |
- </element>
|
|
|
60de42 |
- </choice>
|
|
|
60de42 |
- <optional>
|
|
|
60de42 |
- <element name="network">
|
|
|
60de42 |
- <optional>
|
|
|
60de42 |
- <attribute name="ip-range-start"><text/></attribute>
|
|
|
60de42 |
- </optional>
|
|
|
60de42 |
- <optional>
|
|
|
60de42 |
- <attribute name="control-port"><data type="integer"/></attribute>
|
|
|
60de42 |
- </optional>
|
|
|
60de42 |
- <optional>
|
|
|
60de42 |
- <attribute name="host-interface"><text/></attribute>
|
|
|
60de42 |
- </optional>
|
|
|
60de42 |
- <optional>
|
|
|
60de42 |
- <attribute name="host-netmask"><data type="integer"/></attribute>
|
|
|
60de42 |
- </optional>
|
|
|
60de42 |
- <zeroOrMore>
|
|
|
60de42 |
- <element name="port-mapping">
|
|
|
60de42 |
- <attribute name="id"><data type="ID"/></attribute>
|
|
|
60de42 |
- <choice>
|
|
|
60de42 |
- <group>
|
|
|
60de42 |
- <attribute name="port"><data type="integer"/></attribute>
|
|
|
60de42 |
- <optional>
|
|
|
60de42 |
- <attribute name="internal-port"><data type="integer"/></attribute>
|
|
|
60de42 |
- </optional>
|
|
|
60de42 |
- </group>
|
|
|
60de42 |
- <attribute name="range">
|
|
|
60de42 |
- <data type="string">
|
|
|
60de42 |
- <param name="pattern">([0-9\-]+)</param>
|
|
|
60de42 |
- </data>
|
|
|
60de42 |
- </attribute>
|
|
|
60de42 |
- </choice>
|
|
|
60de42 |
- </element>
|
|
|
60de42 |
- </zeroOrMore>
|
|
|
60de42 |
- </element>
|
|
|
60de42 |
- </optional>
|
|
|
60de42 |
- <optional>
|
|
|
60de42 |
- <element name="storage">
|
|
|
60de42 |
- <zeroOrMore>
|
|
|
60de42 |
- <element name="storage-mapping">
|
|
|
60de42 |
- <attribute name="id"><data type="ID"/></attribute>
|
|
|
60de42 |
- <choice>
|
|
|
60de42 |
- <attribute name="source-dir"><text/></attribute>
|
|
|
60de42 |
- <attribute name="source-dir-root"><text/></attribute>
|
|
|
60de42 |
- </choice>
|
|
|
60de42 |
- <attribute name="target-dir"><text/></attribute>
|
|
|
60de42 |
- <optional>
|
|
|
60de42 |
- <attribute name="options"><text/></attribute>
|
|
|
60de42 |
- </optional>
|
|
|
60de42 |
- </element>
|
|
|
60de42 |
- </zeroOrMore>
|
|
|
60de42 |
- </element>
|
|
|
60de42 |
- </optional>
|
|
|
60de42 |
- <optional>
|
|
|
60de42 |
- <ref name="element-primitive"/>
|
|
|
60de42 |
- </optional>
|
|
|
60de42 |
+ <interleave>
|
|
|
60de42 |
+ <choice>
|
|
|
60de42 |
+ <element name="docker">
|
|
|
60de42 |
+ <attribute name="image"><text/></attribute>
|
|
|
60de42 |
+ <optional>
|
|
|
60de42 |
+ <attribute name="replicas"><data type="integer"/></attribute>
|
|
|
60de42 |
+ </optional>
|
|
|
60de42 |
+ <optional>
|
|
|
60de42 |
+ <attribute name="replicas-per-host"><data type="integer"/></attribute>
|
|
|
60de42 |
+ </optional>
|
|
|
60de42 |
+ <optional>
|
|
|
60de42 |
+ <attribute name="masters"><data type="integer"/></attribute>
|
|
|
60de42 |
+ </optional>
|
|
|
60de42 |
+ <optional>
|
|
|
60de42 |
+ <attribute name="run-command"> <text/></attribute>
|
|
|
60de42 |
+ </optional>
|
|
|
60de42 |
+ <optional>
|
|
|
60de42 |
+ <attribute name="network"><text/></attribute>
|
|
|
60de42 |
+ </optional>
|
|
|
60de42 |
+ <optional>
|
|
|
60de42 |
+ <attribute name="options"><text/></attribute>
|
|
|
60de42 |
+ </optional>
|
|
|
60de42 |
+ </element>
|
|
|
60de42 |
+ </choice>
|
|
|
60de42 |
+ <optional>
|
|
|
60de42 |
+ <element name="network">
|
|
|
60de42 |
+ <optional>
|
|
|
60de42 |
+ <attribute name="ip-range-start"><text/></attribute>
|
|
|
60de42 |
+ </optional>
|
|
|
60de42 |
+ <optional>
|
|
|
60de42 |
+ <attribute name="control-port"><data type="integer"/></attribute>
|
|
|
60de42 |
+ </optional>
|
|
|
60de42 |
+ <optional>
|
|
|
60de42 |
+ <attribute name="host-interface"><text/></attribute>
|
|
|
60de42 |
+ </optional>
|
|
|
60de42 |
+ <optional>
|
|
|
60de42 |
+ <attribute name="host-netmask"><data type="integer"/></attribute>
|
|
|
60de42 |
+ </optional>
|
|
|
60de42 |
+ <zeroOrMore>
|
|
|
60de42 |
+ <element name="port-mapping">
|
|
|
60de42 |
+ <attribute name="id"><data type="ID"/></attribute>
|
|
|
60de42 |
+ <choice>
|
|
|
60de42 |
+ <group>
|
|
|
60de42 |
+ <attribute name="port"><data type="integer"/></attribute>
|
|
|
60de42 |
+ <optional>
|
|
|
60de42 |
+ <attribute name="internal-port"><data type="integer"/></attribute>
|
|
|
60de42 |
+ </optional>
|
|
|
60de42 |
+ </group>
|
|
|
60de42 |
+ <attribute name="range">
|
|
|
60de42 |
+ <data type="string">
|
|
|
60de42 |
+ <param name="pattern">([0-9\-]+)</param>
|
|
|
60de42 |
+ </data>
|
|
|
60de42 |
+ </attribute>
|
|
|
60de42 |
+ </choice>
|
|
|
60de42 |
+ </element>
|
|
|
60de42 |
+ </zeroOrMore>
|
|
|
60de42 |
+ </element>
|
|
|
60de42 |
+ </optional>
|
|
|
60de42 |
+ <optional>
|
|
|
60de42 |
+ <element name="storage">
|
|
|
60de42 |
+ <zeroOrMore>
|
|
|
60de42 |
+ <element name="storage-mapping">
|
|
|
60de42 |
+ <attribute name="id"><data type="ID"/></attribute>
|
|
|
60de42 |
+ <choice>
|
|
|
60de42 |
+ <attribute name="source-dir"><text/></attribute>
|
|
|
60de42 |
+ <attribute name="source-dir-root"><text/></attribute>
|
|
|
60de42 |
+ </choice>
|
|
|
60de42 |
+ <attribute name="target-dir"><text/></attribute>
|
|
|
60de42 |
+ <optional>
|
|
|
60de42 |
+ <attribute name="options"><text/></attribute>
|
|
|
60de42 |
+ </optional>
|
|
|
60de42 |
+ </element>
|
|
|
60de42 |
+ </zeroOrMore>
|
|
|
60de42 |
+ </element>
|
|
|
60de42 |
+ </optional>
|
|
|
60de42 |
+ <optional>
|
|
|
60de42 |
+ <ref name="element-primitive"/>
|
|
|
60de42 |
+ </optional>
|
|
|
60de42 |
+ </interleave>
|
|
|
60de42 |
</element>
|
|
|
60de42 |
</define>
|
|
|
60de42 |
|
|
|
60de42 |
--
|
|
|
60de42 |
1.8.3.1
|
|
|
60de42 |
|