This is the mail archive of the cluster-cvs@sourceware.org mailing list for the cluster.

Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

cluster: STABLE3 - config: Type checking fixups in schemas

Gitweb:        http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=c95cf4b05ba0c7b81559f06a5ee825389d8c70ce
Commit:        c95cf4b05ba0c7b81559f06a5ee825389d8c70ce
Parent:        a292ce5347b3c985a24fa3abfe631cc32527dc48
Author:        Lon Hohberger <lhh@redhat.com>
AuthorDate:    Fri Mar 27 11:09:04 2009 -0400
Committer:     Lon Hohberger <lhh@redhat.com>
CommitterDate: Fri Mar 27 11:09:04 2009 -0400

config: Type checking fixups in schemas

Signed-off-by: Lon Hohberger <lhh@redhat.com>
---
 config/plugins/ldap/99cluster.ldif |   54 ++++++++++++++++++------------------
 config/tools/xml/cluster.rng       |   20 ++++++++++---
 2 files changed, 42 insertions(+), 32 deletions(-)

diff --git a/config/plugins/ldap/99cluster.ldif b/config/plugins/ldap/99cluster.ldif
index 1faf129..e9c0320 100644
--- a/config/plugins/ldap/99cluster.ldif
+++ b/config/plugins/ldap/99cluster.ldif
@@ -1,9 +1,9 @@
-# Auto-generated from cluster.rng
+# Auto-generated from ../../tools/xml/cluster.rng
 dn: cn=schema
 attributeTypes: (
   1.3.6.1.4.1.2312.8.1.1.1 NAME 'rhcsConfig-version'
-  EQUALITY caseExactIA5Match
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
+  EQUALITY integerMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.27
   SINGLE-VALUE
   )
 attributeTypes: (
@@ -20,26 +20,26 @@ attributeTypes: (
   )
 attributeTypes: (
   1.3.6.1.4.1.2312.8.1.1.6 NAME 'rhcsExpected-votes'
-  EQUALITY caseExactIA5Match
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
+  EQUALITY integerMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.27
   SINGLE-VALUE
   )
 attributeTypes: (
   1.3.6.1.4.1.2312.8.1.1.16 NAME 'rhcsQuorum-dev-poll'
-  EQUALITY caseExactIA5Match
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
+  EQUALITY integerMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.27
   SINGLE-VALUE
   )
 attributeTypes: (
   1.3.6.1.4.1.2312.8.1.1.17 NAME 'rhcsShutdown-timeout'
-  EQUALITY caseExactIA5Match
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
+  EQUALITY integerMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.27
   SINGLE-VALUE
   )
 attributeTypes: (
   1.3.6.1.4.1.2312.8.1.1.18 NAME 'rhcsCcsd-poll'
-  EQUALITY caseExactIA5Match
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
+  EQUALITY integerMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.27
   SINGLE-VALUE
   )
 attributeTypes: (
@@ -50,8 +50,8 @@ attributeTypes: (
   )
 attributeTypes: (
   1.3.6.1.4.1.2312.8.1.1.13 NAME 'rhcsPort'
-  EQUALITY caseExactIA5Match
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
+  EQUALITY integerMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.27
   SINGLE-VALUE
   )
 attributeTypes: (
@@ -62,14 +62,14 @@ attributeTypes: (
   )
 attributeTypes: (
   1.3.6.1.4.1.2312.8.1.1.4 NAME 'rhcsVotes'
-  EQUALITY caseExactIA5Match
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
+  EQUALITY integerMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.27
   SINGLE-VALUE
   )
 attributeTypes: (
   1.3.6.1.4.1.2312.8.1.1.2 NAME 'rhcsNodeid'
-  EQUALITY caseExactIA5Match
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
+  EQUALITY integerMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.27
   SINGLE-VALUE
   )
 attributeTypes: (
@@ -488,32 +488,32 @@ attributeTypes: (
   )
 attributeTypes: (
   1.3.6.1.4.1.2312.8.1.1.87 NAME 'rhcsLog-level'
-  EQUALITY caseExactIA5Match
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
+  EQUALITY integerMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.27
   SINGLE-VALUE
   )
 attributeTypes: (
   1.3.6.1.4.1.2312.8.1.1.88 NAME 'rhcsStatusmax'
-  EQUALITY caseExactIA5Match
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
+  EQUALITY integerMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.27
   SINGLE-VALUE
   )
 attributeTypes: (
   1.3.6.1.4.1.2312.8.1.1.89 NAME 'rhcsStatus-poll-interval'
-  EQUALITY caseExactIA5Match
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
+  EQUALITY integerMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.27
   SINGLE-VALUE
   )
 attributeTypes: (
   1.3.6.1.4.1.2312.8.1.1.90 NAME 'rhcsTransition-throttling'
-  EQUALITY caseExactIA5Match
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
+  EQUALITY integerMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.27
   SINGLE-VALUE
   )
 attributeTypes: (
   1.3.6.1.4.1.2312.8.1.1.91 NAME 'rhcsCentral-processing'
-  EQUALITY caseExactIA5Match
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
+  EQUALITY integerMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.27
   SINGLE-VALUE
   )
 attributeTypes: (
diff --git a/config/tools/xml/cluster.rng b/config/tools/xml/cluster.rng
index 24b6ee8..7958069 100644
--- a/config/tools/xml/cluster.rng
+++ b/config/tools/xml/cluster.rng
@@ -30,7 +30,9 @@ To validate your cluster.conf against this schema, run:
 <start>
 <element name="cluster">
  <attribute name="name"/>
- <attribute name="config_version"/>
+ <attribute name="config_version">
+  <data type="positiveInteger"/>
+ </attribute>
  <optional>
   <attribute name="alias"/>
  </optional>
@@ -49,19 +51,27 @@ To validate your cluster.conf against this schema, run:
     </attribute>
    </optional>
    <optional>
-    <attribute name="quorum_dev_poll"/>
+    <attribute name="quorum_dev_poll">
+     <data type="positiveInteger"/>
+    </attribute>
    </optional>
    <optional>
-    <attribute name="shutdown_timeout"/>
+    <attribute name="shutdown_timeout">
+     <data type="nonNegativeInteger"/>
+    </attribute>
    </optional>
    <optional>
-    <attribute name="ccsd_poll"/>
+    <attribute name="ccsd_poll">
+     <data type="positiveInteger"/>
+    </attribute>
    </optional>
    <optional>
     <attribute name="debug_mask"/>
    </optional>
    <optional>
-    <attribute name="port"/>
+    <attribute name="port">
+     <data type="nonNegativeInteger"/>
+    </attribute>
    </optional>
    <optional>
     <element name="multicast">
Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]