[libvirt] [PATCH] docs: Add missed RNG schema for interface

We support <interface> of type "mcast", "server", and "client", but the RNG schema for them are missed. --- docs/schemas/domaincommon.rng | 44 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 44 insertions(+), 0 deletions(-) diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index e93ae77..2caa781 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -1295,6 +1295,50 @@ <ref name="interface-options"/> </interleave> </group> + <group> + <attribute name="type"> + <value>mcast</value> + </attribute> + <element name="source"> + <attribute name="address"> + <ref name="ipv4Addr"/> + </attribute> + <attribute name="port"> + <ref name="PortNumber"/> + </attribute> + <empty/> + </element> + </group> + <group> + <attribute name="type"> + <value>client</value> + </attribute> + <element name="source"> + <attribute name="address"> + <ref name="ipv4Addr"/> + </attribute> + <attribute name="port"> + <ref name="PortNumber"/> + </attribute> + <empty/> + </element> + </group> + <group> + <attribute name="type"> + <value>server</value> + </attribute> + <element name="source"> + <optional> + <attribute name="address"> + <ref name="ipv4Addr"/> + </attribute> + </optional> + <attribute name="port"> + <ref name="PortNumber"/> + </attribute> + <empty/> + </element> + </group> </choice> </element> </define> -- 1.7.7.3

On 01/11/2012 08:39 AM, Osier Yang wrote:
We support<interface> of type "mcast", "server", and "client", but the RNG schema for them are missed.
Right you are! ACK. (A test case with one of each in the xml2argv test would be nice, though - that would have prevented this omission. anticipatory ACK on adding that to this patch before you push.) (did you actually use this type of interface? It's, um, interesting I guess, but sounds pretty inefficient.)
--- docs/schemas/domaincommon.rng | 44 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 44 insertions(+), 0 deletions(-)
diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index e93ae77..2caa781 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -1295,6 +1295,50 @@ <ref name="interface-options"/> </interleave> </group> +<group> +<attribute name="type"> +<value>mcast</value> +</attribute> +<element name="source"> +<attribute name="address"> +<ref name="ipv4Addr"/> +</attribute> +<attribute name="port"> +<ref name="PortNumber"/> +</attribute> +<empty/> +</element> +</group> +<group> +<attribute name="type"> +<value>client</value> +</attribute> +<element name="source"> +<attribute name="address"> +<ref name="ipv4Addr"/> +</attribute> +<attribute name="port"> +<ref name="PortNumber"/> +</attribute> +<empty/> +</element> +</group> +<group> +<attribute name="type"> +<value>server</value> +</attribute> +<element name="source"> +<optional> +<attribute name="address"> +<ref name="ipv4Addr"/> +</attribute> +</optional> +<attribute name="port"> +<ref name="PortNumber"/> +</attribute> +<empty/> +</element> +</group> </choice> </element> </define>

On 01/11/2012 10:25 AM, Laine Stump wrote:
On 01/11/2012 08:39 AM, Osier Yang wrote:
We support<interface> of type "mcast", "server", and "client", but the RNG schema for them are missed.
Right you are! ACK. (A test case with one of each in the xml2argv test would be nice, though - that would have prevented this omission. anticipatory ACK on adding that to this patch before you push.)
(did you actually use this type of interface? It's, um, interesting I guess, but sounds pretty inefficient.)
Before you push,
--- docs/schemas/domaincommon.rng | 44 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 44 insertions(+), 0 deletions(-)
diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index e93ae77..2caa781 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -1295,6 +1295,50 @@ <ref name="interface-options"/> </interleave> </group>
[aargh - stupid thunderbird for killing indentation]
</group> + <group> + <attribute name="type"> + <value>mcast</value> + </attribute> + <element name="source"> + <attribute name="address"> + <ref name="ipv4Addr"/> + </attribute> + <attribute name="port"> + <ref name="PortNumber"/> + </attribute> + <empty/> + </element> + </group> + <group> + <attribute name="type"> + <value>client</value> + </attribute> + <element name="source"> + <attribute name="address"> + <ref name="ipv4Addr"/> + </attribute> + <attribute name="port"> + <ref name="PortNumber"/> + </attribute> + <empty/> + </element> + </group>
This looks rather redundant. Why not go with the simpler: <group> <attribute name="type"> <choice> <value>mcast</value> <value>client</value> <value>server</value> </choice> </attribute> <element name="source"> <attribute name="address"> <ref name="ipv4Addr"/> </attribute> <attribute name="port"> <ref name="PortNumber"/> </attribute> <empty/> </element> </group> or even merge that <choice> of values into an earlier <group>? -- Eric Blake eblake@redhat.com +1-919-301-3266 Libvirt virtualization library http://libvirt.org

On 2012年01月12日 01:37, Eric Blake wrote:
On 01/11/2012 10:25 AM, Laine Stump wrote:
On 01/11/2012 08:39 AM, Osier Yang wrote:
We support<interface> of type "mcast", "server", and "client", but the RNG schema for them are missed.
Right you are! ACK. (A test case with one of each in the xml2argv test would be nice, though - that would have prevented this omission. anticipatory ACK on adding that to this patch before you push.)
(did you actually use this type of interface? It's, um, interesting I guess, but sounds pretty inefficient.)
Before you push,
--- docs/schemas/domaincommon.rng | 44 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 44 insertions(+), 0 deletions(-)
diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index e93ae77..2caa781 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -1295,6 +1295,50 @@ <ref name="interface-options"/> </interleave> </group>
[aargh - stupid thunderbird for killing indentation]
</group> +<group> +<attribute name="type"> +<value>mcast</value> +</attribute> +<element name="source"> +<attribute name="address"> +<ref name="ipv4Addr"/> +</attribute> +<attribute name="port"> +<ref name="PortNumber"/> +</attribute> +<empty/> +</element> +</group> +<group> +<attribute name="type"> +<value>client</value> +</attribute> +<element name="source"> +<attribute name="address"> +<ref name="ipv4Addr"/> +</attribute> +<attribute name="port"> +<ref name="PortNumber"/> +</attribute> +<empty/> +</element> +</group>
This looks rather redundant. Why not go with the simpler:
<group> <attribute name="type"> <choice> <value>mcast</value> <value>client</value> <value>server</value> </choice> </attribute> <element name="source"> <attribute name="address"> <ref name="ipv4Addr"/> </attribute> <attribute name="port"> <ref name="PortNumber"/> </attribute> <empty/> </element> </group>
mcast and client could be merged together. But for "server" type, attr "address" is optional. I don't see any earlier <group> which these 3 could be merged into. :) v2 with tests is coming. Osier

On 2012年01月12日 01:25, Laine Stump wrote:
On 01/11/2012 08:39 AM, Osier Yang wrote:
We support<interface> of type "mcast", "server", and "client", but the RNG schema for them are missed.
Right you are! ACK. (A test case with one of each in the xml2argv test would be nice, though - that would have prevented this omission. anticipatory ACK on adding that to this patch before you push.)
Ah, yes. The test cases are needed.
(did you actually use this type of interface? It's, um, interesting I guess, but sounds pretty inefficient.)
No, found it when creating patches for domiflist.
--- docs/schemas/domaincommon.rng | 44 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 44 insertions(+), 0 deletions(-)
diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index e93ae77..2caa781 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -1295,6 +1295,50 @@ <ref name="interface-options"/> </interleave> </group> +<group> +<attribute name="type"> +<value>mcast</value> +</attribute> +<element name="source"> +<attribute name="address"> +<ref name="ipv4Addr"/> +</attribute> +<attribute name="port"> +<ref name="PortNumber"/> +</attribute> +<empty/> +</element> +</group> +<group> +<attribute name="type"> +<value>client</value> +</attribute> +<element name="source"> +<attribute name="address"> +<ref name="ipv4Addr"/> +</attribute> +<attribute name="port"> +<ref name="PortNumber"/> +</attribute> +<empty/> +</element> +</group> +<group> +<attribute name="type"> +<value>server</value> +</attribute> +<element name="source"> +<optional> +<attribute name="address"> +<ref name="ipv4Addr"/> +</attribute> +</optional> +<attribute name="port"> +<ref name="PortNumber"/> +</attribute> +<empty/> +</element> +</group> </choice> </element> </define>
-- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list
participants (3)
-
Eric Blake
-
Laine Stump
-
Osier Yang