diff options
| author | John Estabrook <jestabro@vyos.io> | 2021-08-12 11:09:58 -0500 |
|---|---|---|
| committer | John Estabrook <jestabro@vyos.io> | 2021-08-12 11:09:58 -0500 |
| commit | d19b35d668184fdac00a8ef56ff58c0748f22816 (patch) | |
| tree | 1a5de49dcba9fe12911322809715e7db399e05a5 /schema/interface_definition.rng | |
| parent | e75db1c0c23bb8615dea92316148871edd18749e (diff) | |
| download | vyos-1x-d19b35d668184fdac00a8ef56ff58c0748f22816.tar.gz vyos-1x-d19b35d668184fdac00a8ef56ff58c0748f22816.zip | |
T3574: add constraintGroup for combining validators with logical AND
(cherry picked from commit 591b8bcadd8b6bbd46c61484193d2bf7e16bd1ae
commit 31553283aaa929da63147082e85513e8d4dacf0e
commit 59a4aadfe419eca16e6288b37d6c51acd9789903)
Diffstat (limited to 'schema/interface_definition.rng')
| -rw-r--r-- | schema/interface_definition.rng | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/schema/interface_definition.rng b/schema/interface_definition.rng index 22e886006..3ff60cf18 100644 --- a/schema/interface_definition.rng +++ b/schema/interface_definition.rng @@ -161,6 +161,9 @@ <ref name="constraint"/> </optional> <zeroOrMore> + <ref name="constraintGroup"/> + </zeroOrMore> + <zeroOrMore> <ref name="valueHelp"/> </zeroOrMore> <optional> @@ -244,6 +247,24 @@ </oneOrMore> </element> </define> + <!-- + Tag and leaf nodes may have constraintGroups on their names and + values (respectively). + When multiple constraints are listed within a group, they work as + logical AND + --> + <define name="constraintGroup"> + <element name="constraintGroup"> + <oneOrMore> + <choice> + <element name="regex"> + <text/> + </element> + <ref name="validator"/> + </choice> + </oneOrMore> + </element> + </define> <!-- A constraint may also use an external validator rather than regex --> <define name="validator"> <element name="validator"> |