Skip to content

L
libvirt

openeuler / libvirt

通知 3
Star 0
Fork 0
L
libvirt

体验新版 GitCode，发现更多精彩内容 >>

提交 37359814 编写于 作者: D Daniel P. Berrange
浏览文件
操作

rng: fix nwfilter rule contents 

The contents of a <rule> are a choice of exactly one union member. The
RNG schema, however, was allowing an arbitrary number of instances of every
union member at once.
Reviewed-by: NJohn Ferlan <jferlan@redhat.com>
Signed-off-by: NDaniel P. Berrange <berrange@redhat.com>
上级 7c7ec177
隐藏空白更改
内联 并排
Showing with 2 addition and 96 deletion
docs/schemas/nwfilter.rng
浏览文件 @ 37359814
...@@ -19,58 +19,37 @@ ...@@ -19,58 +19,37 @@
</element> </element>
<element name="rule"> <element name="rule">
<ref name="rule-node-attributes"/> <ref name="rule-node-attributes"/>
<optional> <choice>
<zeroOrMore>
<element name="mac"> <element name="mac">
<ref name="match-attribute"/> <ref name="match-attribute"/>
<ref name="common-l2-attributes"/> <ref name="common-l2-attributes"/>
<ref name="mac-attributes"/> <ref name="mac-attributes"/>
<ref name="comment-attribute"/> <ref name="comment-attribute"/>
</element> </element>
</zeroOrMore>
</optional>
<optional>
<zeroOrMore>
<element name="vlan"> <element name="vlan">
<ref name="match-attribute"/> <ref name="match-attribute"/>
<ref name="common-l2-attributes"/> <ref name="common-l2-attributes"/>
<ref name="vlan-attributes"/> <ref name="vlan-attributes"/>
<ref name="comment-attribute"/> <ref name="comment-attribute"/>
</element> </element>
</zeroOrMore>
</optional>
<optional>
<zeroOrMore>
<element name="stp"> <element name="stp">
<ref name="match-attribute"/> <ref name="match-attribute"/>
<ref name="srcmacandmask-attributes"/> <ref name="srcmacandmask-attributes"/>
<ref name="stp-attributes"/> <ref name="stp-attributes"/>
<ref name="comment-attribute"/> <ref name="comment-attribute"/>
</element> </element>
</zeroOrMore>
</optional>
<optional>
<zeroOrMore>
<element name="arp"> <element name="arp">
<ref name="match-attribute"/> <ref name="match-attribute"/>
<ref name="common-l2-attributes"/> <ref name="common-l2-attributes"/>
<ref name="arp-attributes"/> <ref name="arp-attributes"/>
<ref name="comment-attribute"/> <ref name="comment-attribute"/>
</element> </element>
</zeroOrMore>
</optional>
<optional>
<zeroOrMore>
<element name="rarp"> <element name="rarp">
<ref name="match-attribute"/> <ref name="match-attribute"/>
<ref name="common-l2-attributes"/> <ref name="common-l2-attributes"/>
<ref name="arp-attributes"/> <!-- same as arp --> <ref name="arp-attributes"/> <!-- same as arp -->
<ref name="comment-attribute"/> <ref name="comment-attribute"/>
</element> </element>
</zeroOrMore>
</optional>
<optional>
<zeroOrMore>
<element name="ip"> <element name="ip">
<ref name="match-attribute"/> <ref name="match-attribute"/>
<ref name="common-l2-attributes"/> <ref name="common-l2-attributes"/>
...@@ -80,10 +59,6 @@ ...@@ -80,10 +59,6 @@
<ref name="dscp-attribute"/> <ref name="dscp-attribute"/>
<ref name="comment-attribute"/> <ref name="comment-attribute"/>
</element> </element>
</zeroOrMore>
</optional>
<optional>
<zeroOrMore>
<element name="ipv6"> <element name="ipv6">
<ref name="match-attribute"/> <ref name="match-attribute"/>
<ref name="common-l2-attributes"/> <ref name="common-l2-attributes"/>
...@@ -93,10 +68,6 @@ ...@@ -93,10 +68,6 @@
<ref name="icmp-attribute-ranges"/> <ref name="icmp-attribute-ranges"/>
<ref name="comment-attribute"/> <ref name="comment-attribute"/>
</element> </element>
</zeroOrMore>
</optional>
<optional>
<zeroOrMore>
<element name="tcp"> <element name="tcp">
<ref name="match-attribute"/> <ref name="match-attribute"/>
<ref name="srcmac-attribute"/> <ref name="srcmac-attribute"/>
...@@ -106,10 +77,6 @@ ...@@ -106,10 +77,6 @@
<ref name="tcp-attributes"/> <ref name="tcp-attributes"/>
<ref name="comment-attribute"/> <ref name="comment-attribute"/>
</element> </element>
</zeroOrMore>
</optional>
<optional>
<zeroOrMore>
<element name="udp"> <element name="udp">
<ref name="match-attribute"/> <ref name="match-attribute"/>
<ref name="srcmac-attribute"/> <ref name="srcmac-attribute"/>
...@@ -118,10 +85,6 @@ ...@@ -118,10 +85,6 @@
<ref name="common-ip-attributes-p2"/> <ref name="common-ip-attributes-p2"/>
<ref name="comment-attribute"/> <ref name="comment-attribute"/>
</element> </element>
</zeroOrMore>
</optional>
<optional>
<zeroOrMore>
<element name="sctp"> <element name="sctp">
<ref name="match-attribute"/> <ref name="match-attribute"/>
<ref name="srcmac-attribute"/> <ref name="srcmac-attribute"/>
...@@ -130,10 +93,6 @@ ...@@ -130,10 +93,6 @@
<ref name="common-ip-attributes-p2"/> <ref name="common-ip-attributes-p2"/>
<ref name="comment-attribute"/> <ref name="comment-attribute"/>
</element> </element>
</zeroOrMore>
</optional>
<optional>
<zeroOrMore>
<element name="icmp"> <element name="icmp">
<ref name="match-attribute"/> <ref name="match-attribute"/>
<ref name="srcmac-attribute"/> <ref name="srcmac-attribute"/>
...@@ -142,10 +101,6 @@ ...@@ -142,10 +101,6 @@
<ref name="icmp-attributes"/> <ref name="icmp-attributes"/>
<ref name="comment-attribute"/> <ref name="comment-attribute"/>
</element> </element>
</zeroOrMore>
</optional>
<optional>
<zeroOrMore>
<element name="igmp"> <element name="igmp">
<ref name="match-attribute"/> <ref name="match-attribute"/>
<ref name="srcmac-attribute"/> <ref name="srcmac-attribute"/>
...@@ -153,10 +108,6 @@ ...@@ -153,10 +108,6 @@
<ref name="common-ip-attributes-p2"/> <ref name="common-ip-attributes-p2"/>
<ref name="comment-attribute"/> <ref name="comment-attribute"/>
</element> </element>
</zeroOrMore>
</optional>
<optional>
<zeroOrMore>
<element name="all"> <element name="all">
<ref name="match-attribute"/> <ref name="match-attribute"/>
<ref name="srcmac-attribute"/> <ref name="srcmac-attribute"/>
...@@ -164,10 +115,6 @@ ...@@ -164,10 +115,6 @@
<ref name="common-ip-attributes-p2"/> <ref name="common-ip-attributes-p2"/>
<ref name="comment-attribute"/> <ref name="comment-attribute"/>
</element> </element>
</zeroOrMore>
</optional>
<optional>
<zeroOrMore>
<element name="esp"> <element name="esp">
<ref name="match-attribute"/> <ref name="match-attribute"/>
<ref name="srcmac-attribute"/> <ref name="srcmac-attribute"/>
...@@ -175,10 +122,6 @@ ...@@ -175,10 +122,6 @@
<ref name="common-ip-attributes-p2"/> <ref name="common-ip-attributes-p2"/>
<ref name="comment-attribute"/> <ref name="comment-attribute"/>
</element> </element>
</zeroOrMore>
</optional>
<optional>
<zeroOrMore>
<element name="ah"> <element name="ah">
<ref name="match-attribute"/> <ref name="match-attribute"/>
<ref name="srcmac-attribute"/> <ref name="srcmac-attribute"/>
...@@ -186,10 +129,6 @@ ...@@ -186,10 +129,6 @@
<ref name="common-ip-attributes-p2"/> <ref name="common-ip-attributes-p2"/>
<ref name="comment-attribute"/> <ref name="comment-attribute"/>
</element> </element>
</zeroOrMore>
</optional>
<optional>
<zeroOrMore>
<element name="udplite"> <element name="udplite">
<ref name="match-attribute"/> <ref name="match-attribute"/>
<ref name="srcmac-attribute"/> <ref name="srcmac-attribute"/>
...@@ -197,10 +136,6 @@ ...@@ -197,10 +136,6 @@
<ref name="common-ip-attributes-p2"/> <ref name="common-ip-attributes-p2"/>
<ref name="comment-attribute"/> <ref name="comment-attribute"/>
</element> </element>
</zeroOrMore>
</optional>
<optional>
<zeroOrMore>
<element name="tcp-ipv6"> <element name="tcp-ipv6">
<ref name="match-attribute"/> <ref name="match-attribute"/>
<ref name="srcmac-attribute"/> <ref name="srcmac-attribute"/>
...@@ -210,10 +145,6 @@ ...@@ -210,10 +145,6 @@
<ref name="tcp-attributes"/> <ref name="tcp-attributes"/>
<ref name="comment-attribute"/> <ref name="comment-attribute"/>
</element> </element>
</zeroOrMore>
</optional>
<optional>
<zeroOrMore>
<element name="udp-ipv6"> <element name="udp-ipv6">
<ref name="match-attribute"/> <ref name="match-attribute"/>
<ref name="srcmac-attribute"/> <ref name="srcmac-attribute"/>
...@@ -222,10 +153,6 @@ ...@@ -222,10 +153,6 @@
<ref name="common-ipv6-attributes-p2"/> <ref name="common-ipv6-attributes-p2"/>
<ref name="comment-attribute"/> <ref name="comment-attribute"/>
</element> </element>
</zeroOrMore>
</optional>
<optional>
<zeroOrMore>
<element name="sctp-ipv6"> <element name="sctp-ipv6">
<ref name="match-attribute"/> <ref name="match-attribute"/>
<ref name="srcmac-attribute"/> <ref name="srcmac-attribute"/>
...@@ -234,10 +161,6 @@ ...@@ -234,10 +161,6 @@
<ref name="common-ipv6-attributes-p2"/> <ref name="common-ipv6-attributes-p2"/>
<ref name="comment-attribute"/> <ref name="comment-attribute"/>
</element> </element>
</zeroOrMore>
</optional>
<optional>
<zeroOrMore>
<element name="icmpv6"> <element name="icmpv6">
<ref name="match-attribute"/> <ref name="match-attribute"/>
<ref name="srcmac-attribute"/> <ref name="srcmac-attribute"/>
...@@ -246,10 +169,6 @@ ...@@ -246,10 +169,6 @@
<ref name="icmp-attributes"/> <ref name="icmp-attributes"/>
<ref name="comment-attribute"/> <ref name="comment-attribute"/>
</element> </element>
</zeroOrMore>
</optional>
<optional>
<zeroOrMore>
<element name="all-ipv6"> <element name="all-ipv6">
<ref name="match-attribute"/> <ref name="match-attribute"/>
<ref name="srcmac-attribute"/> <ref name="srcmac-attribute"/>
...@@ -257,10 +176,6 @@ ...@@ -257,10 +176,6 @@
<ref name="common-ipv6-attributes-p2"/> <ref name="common-ipv6-attributes-p2"/>
<ref name="comment-attribute"/> <ref name="comment-attribute"/>
</element> </element>
</zeroOrMore>
</optional>
<optional>
<zeroOrMore>
<element name="esp-ipv6"> <element name="esp-ipv6">
<ref name="match-attribute"/> <ref name="match-attribute"/>
<ref name="srcmac-attribute"/> <ref name="srcmac-attribute"/>
...@@ -268,10 +183,6 @@ ...@@ -268,10 +183,6 @@
<ref name="common-ipv6-attributes-p2"/> <ref name="common-ipv6-attributes-p2"/>
<ref name="comment-attribute"/> <ref name="comment-attribute"/>
</element> </element>
</zeroOrMore>
</optional>
<optional>
<zeroOrMore>
<element name="ah-ipv6"> <element name="ah-ipv6">
<ref name="match-attribute"/> <ref name="match-attribute"/>
<ref name="srcmac-attribute"/> <ref name="srcmac-attribute"/>
...@@ -279,10 +190,6 @@ ...@@ -279,10 +190,6 @@
<ref name="common-ipv6-attributes-p2"/> <ref name="common-ipv6-attributes-p2"/>
<ref name="comment-attribute"/> <ref name="comment-attribute"/>
</element> </element>
</zeroOrMore>
</optional>
<optional>
<zeroOrMore>
<element name="udplite-ipv6"> <element name="udplite-ipv6">
<ref name="match-attribute"/> <ref name="match-attribute"/>
<ref name="srcmac-attribute"/> <ref name="srcmac-attribute"/>
...@@ -290,8 +197,7 @@ ...@@ -290,8 +197,7 @@
<ref name="common-ipv6-attributes-p2"/> <ref name="common-ipv6-attributes-p2"/>
<ref name="comment-attribute"/> <ref name="comment-attribute"/>
</element> </element>
</zeroOrMore> </choice>
</optional>
</element> </element>
</choice> </choice>
</zeroOrMore> </zeroOrMore>
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或