[Cluster-devel] [PATCH] config: make altname validation position indipendent

[Cluster-devel] [PATCH] config: make altname validation position indipendent

[Fabio M. Di Nitto]

From: "Fabio M. Di Nitto" <fdinitto@redhat.com>

Resolves: rhbz#740552

Signed-off-by: Fabio M. Di Nitto <fdinitto@redhat.com>
---
 config/tools/xml/cluster.rng.in.head |   55 +++++++++++++++++++---------------
 1 files changed, 31 insertions(+), 24 deletions(-)

diff --git a/config/tools/xml/cluster.rng.in.head b/config/tools/xml/cluster.rng.in.head
index e6e4633..11d5052 100644
--- a/config/tools/xml/cluster.rng.in.head
+++ b/config/tools/xml/cluster.rng.in.head
@@ -785,32 +785,11 @@ To validate your cluster.conf against this schema, run:
         dlm_controld(8)"/>
    </optional>
 
-   <optional>
-    <element name="altname" rha:description="Defines a second network
-        interface to use for corosync redundant ring mode. cman(5)">
-
-     <attribute name="name" rha:description="A second hostname or IP
-        address of the node. cman(5)"/>
-
-     <optional>
-      <attribute name="port" rha:description="The network port to use
-          on the second interface. cman(5)"/>
-     </optional>
-
-     <optional>
-      <attribute name="mcast" rha:description="The multicast address
-          to use on the second interface. cman(5)"/>
-     </optional>
-
-     <optional>
-      <attribute name="ttl" rha:description="The multicast TTL 
-          to use on the second interface. cman(5)"/>
-     </optional>
-    </element>
-   </optional>
-
    <interleave>
     <optional>
+     <ref name="ALTNAME"/>
+    </optional>
+    <optional>
      <ref name="FENCE"/>
     </optional>
     <optional>
@@ -1034,6 +1013,34 @@ To validate your cluster.conf against this schema, run:
 </element> <!-- cluster end -->
 </start>
 
+<!-- begin node altname definitions -->
+
+ <define name="ALTNAME">
+    <element name="altname" rha:description="Defines a second network
+        interface to use for corosync redundant ring mode. cman(5)">
+
+     <attribute name="name" rha:description="A second hostname or IP
+        address of the node. cman(5)"/>
+
+     <optional>
+      <attribute name="port" rha:description="The network port to use
+          on the second interface. cman(5)"/>
+     </optional>
+
+     <optional>
+      <attribute name="mcast" rha:description="The multicast address
+          to use on the second interface. cman(5)"/>
+     </optional>
+
+     <optional>
+      <attribute name="ttl" rha:description="The multicast TTL 
+          to use on the second interface. cman(5)"/>
+     </optional>
+    </element>
+ </define>
+
+<!-- end node altname definitions -->
+
 <!-- begin node fence definitions -->
 
  <define name="FENCE">
-- 
1.7.7.3

[Cluster-devel] [PATCH] config: make altname validation position indipendent

[Lon Hohberger]

On 11/28/2011 04:50 AM, Fabio M. Di Nitto wrote:
> From: "Fabio M. Di Nitto"<fdinitto@redhat.com>
>
> Resolves: rhbz#740552
>
> Signed-off-by: Fabio M. Di Nitto<fdinitto@redhat.com

You didn't strictly have to make an ALTNAME ref block if you didn't want 
to.  The FENCE block is used in two places, IIRC (which is why it's 
passed by ref.

It certainly doesn't hurt things, though, so ACK

-- Lon




> ---
>   config/tools/xml/cluster.rng.in.head |   55 +++++++++++++++++++---------------
>   1 files changed, 31 insertions(+), 24 deletions(-)
>
> diff --git a/config/tools/xml/cluster.rng.in.head b/config/tools/xml/cluster.rng.in.head
> index e6e4633..11d5052 100644
> --- a/config/tools/xml/cluster.rng.in.head
> +++ b/config/tools/xml/cluster.rng.in.head
> @@ -785,32 +785,11 @@ To validate your cluster.conf against this schema, run:
>           dlm_controld(8)"/>
>      </optional>
>
> -<optional>
> -<element name="altname" rha:description="Defines a second network
> -        interface to use for corosync redundant ring mode. cman(5)">
> -
> -<attribute name="name" rha:description="A second hostname or IP
> -        address of the node. cman(5)"/>
> -
> -<optional>
> -<attribute name="port" rha:description="The network port to use
> -          on the second interface. cman(5)"/>
> -</optional>
> -
> -<optional>
> -<attribute name="mcast" rha:description="The multicast address
> -          to use on the second interface. cman(5)"/>
> -</optional>
> -
> -<optional>
> -<attribute name="ttl" rha:description="The multicast TTL
> -          to use on the second interface. cman(5)"/>
> -</optional>
> -</element>
> -</optional>
> -
>      <interleave>
>       <optional>
> +<ref name="ALTNAME"/>
> +</optional>
> +<optional>
>        <ref name="FENCE"/>
>       </optional>
>       <optional>
> @@ -1034,6 +1013,34 @@ To validate your cluster.conf against this schema, run:
>   </element>  <!-- cluster end -->
>   </start>
>
> +<!-- begin node altname definitions -->
> +
> +<define name="ALTNAME">
> +<element name="altname" rha:description="Defines a second network
> +        interface to use for corosync redundant ring mode. cman(5)">
> +
> +<attribute name="name" rha:description="A second hostname or IP
> +        address of the node. cman(5)"/>
> +
> +<optional>
> +<attribute name="port" rha:description="The network port to use
> +          on the second interface. cman(5)"/>
> +</optional>
> +
> +<optional>
> +<attribute name="mcast" rha:description="The multicast address
> +          to use on the second interface. cman(5)"/>
> +</optional>
> +
> +<optional>
> +<attribute name="ttl" rha:description="The multicast TTL
> +          to use on the second interface. cman(5)"/>
> +</optional>
> +</element>
> +</define>
> +
> +<!-- end node altname definitions -->
> +
>   <!-- begin node fence definitions -->
>
>    <define name="FENCE">