diff options
| author | Christian Breunig <christian@breunig.cc> | 2023-02-28 22:24:38 +0100 |
|---|---|---|
| committer | Christian Poessinger <christian@poessinger.com> | 2023-03-01 08:28:41 +0100 |
| commit | 3fbe35c8ab0e5dc5fd7af1a5fc8b39e848655d36 (patch) | |
| tree | d9646ac6cf567b5773bcfd523690aa9ec1e0a21b | |
| parent | 4bcc364559beb0943a725ff6be737630ee78d527 (diff) | |
| download | vyos-1x-3fbe35c8ab0e5dc5fd7af1a5fc8b39e848655d36.tar.gz vyos-1x-3fbe35c8ab0e5dc5fd7af1a5fc8b39e848655d36.zip | |
T4967: xml: provide re-usable constraint for CLI host-name definitions
(cherry picked from commit d14a6814acb173cdc6df13212620f7da330434ed)
| -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 4614bc892..91fb4dba0 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 a599a75cc..d77c94898 100644 --- a/interface-definitions/dns-domain-name.xml.in +++ b/interface-definitions/dns-domain-name.xml.in @@ -33,7 +33,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 -->
|