From d19b35d668184fdac00a8ef56ff58c0748f22816 Mon Sep 17 00:00:00 2001 From: John Estabrook Date: Thu, 12 Aug 2021 11:09:58 -0500 Subject: T3574: add constraintGroup for combining validators with logical AND (cherry picked from commit 591b8bcadd8b6bbd46c61484193d2bf7e16bd1ae commit 31553283aaa929da63147082e85513e8d4dacf0e commit 59a4aadfe419eca16e6288b37d6c51acd9789903) --- python/vyos/xml/load.py | 3 +++ 1 file changed, 3 insertions(+) (limited to 'python/vyos/xml/load.py') 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') -- cgit v1.2.3