From 0fb8c4142d7910e14fff71f6365c64865b4d0d0b Mon Sep 17 00:00:00 2001
From: Indrajit Raychaudhuri <irc@indrajit.com>
Date: Fri, 29 Dec 2023 15:06:27 -0600
Subject: system: T5877: Shorten system domain-search config path

Shorten and simplify `system domain-search` config path from:
```
set system domain-search domain <domain1>
```
to:
```
set system domain-search <domain1>
```

This will shorten the path and also make consistent with `domain-search`
config in other places (like `dhcp-server`).

(cherry picked from commit f77bf573c608b6c09182e1bad4312c4dd1e5195e)
---
 interface-definitions/dns-domain-name.xml.in        | 21 +++++++--------------
 .../include/version/system-version.xml.i            |  2 +-
 2 files changed, 8 insertions(+), 15 deletions(-)

(limited to 'interface-definitions')

diff --git a/interface-definitions/dns-domain-name.xml.in b/interface-definitions/dns-domain-name.xml.in
index ef34ecbf5..b5b3692b1 100644
--- a/interface-definitions/dns-domain-name.xml.in
+++ b/interface-definitions/dns-domain-name.xml.in
@@ -45,24 +45,17 @@
           </constraint>
         </properties>
       </leafNode>
-      <node name="domain-search" owner="${vyos_conf_scripts_dir}/host_name.py">
+      <leafNode name="domain-search" owner="${vyos_conf_scripts_dir}/host_name.py">
         <properties>
           <help>Domain Name Server (DNS) domain completion order</help>
           <priority>400</priority>
+          <constraint>
+            <validator name="fqdn"/>
+          </constraint>
+          <constraintErrorMessage>Invalid domain name (RFC 1123 section 2).\nMay only contain letters, numbers and period.</constraintErrorMessage>
+          <multi/>
         </properties>
-        <children>
-          <leafNode name="domain">
-            <properties>
-              <help>DNS domain completion order</help>
-              <constraint>
-                <regex>[-a-zA-Z0-9.]+</regex>
-              </constraint>
-              <constraintErrorMessage>Invalid domain name</constraintErrorMessage>
-              <multi/>
-            </properties>
-          </leafNode>
-        </children>
-      </node>
+      </leafNode>
       <node name="static-host-mapping" owner="${vyos_conf_scripts_dir}/host_name.py">
         <properties>
           <help>Map host names to addresses</help>
diff --git a/interface-definitions/include/version/system-version.xml.i b/interface-definitions/include/version/system-version.xml.i
index 73df8bd8e..fcb24abe2 100644
--- a/interface-definitions/include/version/system-version.xml.i
+++ b/interface-definitions/include/version/system-version.xml.i
@@ -1,3 +1,3 @@
 <!-- include start from include/version/system-version.xml.i -->
-<syntaxVersion component='system' version='26'></syntaxVersion>
+<syntaxVersion component='system' version='27'></syntaxVersion>
 <!-- include end -->
-- 
cgit v1.2.3