diff options
| author | Christian Breunig <christian@breunig.cc> | 2024-04-01 20:27:24 +0200 |
|---|---|---|
| committer | Mergify <37929162+mergify[bot]@users.noreply.github.com> | 2024-04-02 16:33:58 +0000 |
| commit | 9f831714ef0f32264e7046a5ecb86d74f24ec4ac (patch) | |
| tree | 264938d4ecb19ad07e0e5d3f312bca8cc011e4b5 | |
| parent | 0cb21915164551b3d2eaab79ed6339184957c326 (diff) | |
| download | vyos-1x-9f831714ef0f32264e7046a5ecb86d74f24ec4ac.tar.gz vyos-1x-9f831714ef0f32264e7046a5ecb86d74f24ec4ac.zip | |
xml: T5738: extend VRF building blocks with common constraint definition
(cherry picked from commit 32d6a693de99021d2cd44fb4235e929caf7b4a6d)
| -rw-r--r-- | interface-definitions/include/constraint/vrf.xml.i | 6 | ||||
| -rw-r--r-- | interface-definitions/include/interface/vrf.xml.i | 1 | ||||
| -rw-r--r-- | interface-definitions/vrf.xml.in | 5 |
3 files changed, 8 insertions, 4 deletions
diff --git a/interface-definitions/include/constraint/vrf.xml.i b/interface-definitions/include/constraint/vrf.xml.i new file mode 100644 index 000000000..a1922bb6d --- /dev/null +++ b/interface-definitions/include/constraint/vrf.xml.i @@ -0,0 +1,6 @@ +<!-- include start from constraint/vrf.xml.i --> +<constraint> + <validator name="vrf-name"/> +</constraint> +<constraintErrorMessage>VRF instance name must be 15 characters or less and can not\nbe named as regular network interfaces.\nA name must starts from a letter.\n</constraintErrorMessage> +<!-- include end --> diff --git a/interface-definitions/include/interface/vrf.xml.i b/interface-definitions/include/interface/vrf.xml.i index 8605f56e8..ef0058f86 100644 --- a/interface-definitions/include/interface/vrf.xml.i +++ b/interface-definitions/include/interface/vrf.xml.i @@ -9,6 +9,7 @@ <completionHelp> <path>vrf name</path> </completionHelp> + #include <include/constraint/vrf.xml.i> </properties> </leafNode> <!-- include end --> diff --git a/interface-definitions/vrf.xml.in b/interface-definitions/vrf.xml.in index 25f26d0cc..94ed96e4b 100644 --- a/interface-definitions/vrf.xml.in +++ b/interface-definitions/vrf.xml.in @@ -16,10 +16,7 @@ <tagNode name="name"> <properties> <help>Virtual Routing and Forwarding instance</help> - <constraint> - <validator name="vrf-name"/> - </constraint> - <constraintErrorMessage>VRF instance name must be 15 characters or less and can not\nbe named as regular network interfaces.\nA name must starts from a letter.\n</constraintErrorMessage> + #include <include/constraint/vrf.xml.i> <valueHelp> <format>txt</format> <description>VRF instance name</description> |