From: Jan Pokorný <jpokorny@redhat.com>
To: cluster-devel.redhat.com
Subject: [Cluster-devel] [PATCHv3 4/6] rgmanager: ra2rng.xsl: ip-*: datatype/restrict the params
Date: Mon, 9 Dec 2013 21:44:11 +0100 [thread overview]
Message-ID: <1386621851-6490-1-git-send-email-jpokorny@redhat.com> (raw)
In-Reply-To: <1386273754-28722-1-git-send-email-jpokorny@redhat.com>
NB: https://bugzilla.redhat.com/1039119#ip-sh--monitor_link--add-on-off-as-a-valid-value
Signed-off-by: Jan Pokorn? <jpokorny@redhat.com>
---
rgmanager/src/resources/ra2rng.xsl | 67 ++++++++++++++++++++++++++++++++++++++
1 file changed, 67 insertions(+)
diff --git a/rgmanager/src/resources/ra2rng.xsl b/rgmanager/src/resources/ra2rng.xsl
index d781dbe..1745460 100644
--- a/rgmanager/src/resources/ra2rng.xsl
+++ b/rgmanager/src/resources/ra2rng.xsl
@@ -15,6 +15,73 @@
<int:agent-parameter-specialization>
<!-- int:agent @name="..." > int:parameter @name="..." > PATTERN -->
+ <!-- IP -->
+ <int:agent name="ip">
+ <int:parameter name="address">
+ <data type="token">
+ <!-- only approximate regexp -->
+ <param name="pattern">[0-9A-Fa-f.:]+([/][0-9]+)?</param>
+ </data>
+ </int:parameter>
+ <int:parameter name="family">
+ <choice>
+ <!-- note: "auto" is more like original expectation, but
+ enforce it to prevent arbitrary non-senses in this
+ context like uppercased INET6 -->
+ <value type="token">auto</value>
+ <value type="token">inet</value>
+ <value type="token">inet6</value>
+ </choice>
+ </int:parameter>
+ <int:parameter name="monitor_link">
+ <choice>
+ <!-- note: a bit stricter than what the code enforces -->
+ <value type="string">0</value>
+ <value type="string">1</value>
+ <value type="string">no</value>
+ <value type="string">yes</value>
+ <value type="string">off</value>
+ <value type="string">on</value>
+ </choice>
+ </int:parameter>
+ <int:parameter name="nfslock">
+ <choice>
+ <!-- note: a bit stricter than what the code enforces -->
+ <value type="string">0</value>
+ <value type="string">1</value>
+ <value type="string">no</value>
+ <value type="string">yes</value>
+ </choice>
+ </int:parameter>
+ <int:parameter name="sleeptime">
+ <data type="int">
+ <param name="minInclusive">0</param>
+ </data>
+ </int:parameter>
+ <int:parameter name="disable_rdisc">
+ <choice>
+ <!-- note: a bit stricter than what the code enforces -->
+ <value type="string">0</value>
+ <value type="string">1</value>
+ <value type="string">no</value>
+ <value type="string">yes</value>
+ </choice>
+ </int:parameter>
+ <int:parameter name="prefer_interface">
+ <data type="string">
+ <!-- note: can be up to max(IFNAMSIZ,IFALIASZ) - 1 characters
+ where from include/linux/if.h IFNAMSIZ = 16, IFALIASZ = 256
+ and the terminating null character is subtracted:
+ http://www.gnu.org/software/libc/manual/html_node/Interface-Naming.html
+ resulting in 255 characters (at least one has to be given,
+ @least it would be a bit insane to have an interface
+ called "") -->
+ <param name="minLength">1</param>
+ <param name="maxLength">255</param>
+ <param name="pattern">[\p{IsBasicLatin}\p{IsLatin-1Supplement}-[\s]]+</param>
+ </data>
+ </int:parameter>
+ </int:agent>
<!-- SCRIPT -->
<int:agent name="script">
<int:parameter name="file">
--
1.8.1.4
next prev parent reply other threads:[~2013-12-09 20:44 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-12-05 17:24 [Cluster-devel] [resource-agents][PATCH 0/6] rgmanager: ra2rng.xsl: IP+FS params datatyping Jan Pokorný
2013-12-05 17:24 ` [Cluster-devel] [PATCH 1/6] rgmanager: ra2rng.xsl: adjust pretty-print to capture full node Jan Pokorný
2013-12-09 20:41 ` [Cluster-devel] [PATCHv2 " Jan Pokorný
2013-12-05 17:24 ` [Cluster-devel] [PATCH 2/6] rgmanager: ra2rng.xsl: common params: finish datatyping/constraints Jan Pokorný
2013-12-09 20:42 ` [Cluster-devel] [PATCHv2 " Jan Pokorný
2013-12-05 17:24 ` [Cluster-devel] [PATCH 3/6] rgmanager: ra2rng.xsl: common params: just refer to named pattern Jan Pokorný
2013-12-09 20:43 ` [Cluster-devel] [PATCHv2 " Jan Pokorný
2013-12-05 17:24 ` [Cluster-devel] [PATCH 4/6] rgmanager: ra2rng.xsl: ip-*: datatype/restrict the params Jan Pokorný
2013-12-05 20:02 ` [Cluster-devel] [PATCHv2 " Jan Pokorný
2013-12-09 20:44 ` Jan Pokorný [this message]
2013-12-05 17:24 ` [Cluster-devel] [PATCH 5/6] rgmanager: ra2rng.xsl: fs-*: " Jan Pokorný
2013-12-06 14:02 ` [Cluster-devel] [PATCHv2 " Jan Pokorný
2013-12-09 20:45 ` [Cluster-devel] [PATCHv3 " Jan Pokorný
2013-12-05 17:24 ` [Cluster-devel] [PATCH 6/6] rgmanager: ra2rng.xsl: {ip, fs}-nfslock: use common wildcard block Jan Pokorný
2013-12-05 17:31 ` [Cluster-devel] [PATCHv2 " Jan Pokorný
2013-12-05 20:03 ` [Cluster-devel] [PATCHv3 " Jan Pokorný
2013-12-05 21:07 ` [Cluster-devel] [PATCHv4 " Jan Pokorný
2013-12-06 14:13 ` [Cluster-devel] [PATCHv5 " Jan Pokorný
2013-12-09 20:45 ` [Cluster-devel] [PATCHv6 " Jan Pokorný
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1386621851-6490-1-git-send-email-jpokorny@redhat.com \
--to=jpokorny@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).