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 /python | |
| 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 'python')
| -rw-r--r-- | python/vyos/xml/load.py | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/python/vyos/xml/load.py b/python/vyos/xml/load.py index 0965d4220..37479c6e1 100644 --- a/python/vyos/xml/load.py +++ b/python/vyos/xml/load.py @@ -225,6 +225,9 @@ def _format_node(inside, conf, xml): else: _fatal(constraint) + elif 'constraintGroup' in properties: + properties.pop('constraintGroup') + elif 'constraintErrorMessage' in properties: r[kw.error] = properties.pop('constraintErrorMessage') |