diff options
| author | Christian Breunig <christian@breunig.cc> | 2023-02-28 22:24:38 +0100 |
|---|---|---|
| committer | Christian Breunig <christian@breunig.cc> | 2023-02-28 22:24:38 +0100 |
| commit | d14a6814acb173cdc6df13212620f7da330434ed (patch) | |
| tree | 7b794f7f00e978da006acee060eca02e5389c9b6 /interface-definitions | |
| parent | 851364c00e0521a0afee4b449b0a31de442016f3 (diff) | |
| download | vyos-1x-d14a6814acb173cdc6df13212620f7da330434ed.tar.gz vyos-1x-d14a6814acb173cdc6df13212620f7da330434ed.zip | |
T4967: xml: provide re-usable constraint for CLI host-name definitions
Diffstat (limited to 'interface-definitions')
| -rw-r--r-- | interface-definitions/container.xml.in | 2 | ||||
| -rw-r--r-- | interface-definitions/dns-domain-name.xml.in | 2 | ||||
| -rw-r--r-- | interface-definitions/include/constraint/host-name.xml.in | 3 |
3 files changed, 5 insertions, 2 deletions
diff --git a/interface-definitions/container.xml.in b/interface-definitions/container.xml.in index 0e5fdea78..a5940ae17 100644 --- a/interface-definitions/container.xml.in +++ b/interface-definitions/container.xml.in @@ -117,7 +117,7 @@ <properties> <help>Container host name</help> <constraint> - <regex>[A-Za-z0-9][-.A-Za-z0-9]*[A-Za-z0-9]</regex> + #include <include/constraint/host-name.xml.in> </constraint> <constraintErrorMessage>Host-name must be alphanumeric and can contain hyphens</constraintErrorMessage> </properties> diff --git a/interface-definitions/dns-domain-name.xml.in b/interface-definitions/dns-domain-name.xml.in index 9aca38735..e4d8c0f90 100644 --- a/interface-definitions/dns-domain-name.xml.in +++ b/interface-definitions/dns-domain-name.xml.in @@ -34,7 +34,7 @@ <properties> <help>System host name (default: vyos)</help> <constraint> - <regex>[A-Za-z0-9][-.A-Za-z0-9]*[A-Za-z0-9]</regex> + #include <include/constraint/host-name.xml.in> </constraint> </properties> </leafNode> diff --git a/interface-definitions/include/constraint/host-name.xml.in b/interface-definitions/include/constraint/host-name.xml.in new file mode 100644 index 000000000..202c200f4 --- /dev/null +++ b/interface-definitions/include/constraint/host-name.xml.in @@ -0,0 +1,3 @@ +<!-- include start from constraint/host-name.xml.in -->
+<regex>[A-Za-z0-9][-.A-Za-z0-9]*[A-Za-z0-9]</regex>
+<!-- include end -->
|