From 0d35a866ba12e66e504e1f575a04429c5d8cb9be Mon Sep 17 00:00:00 2001
From: Christian Breunig <christian@breunig.cc>
Date: Fri, 13 Jan 2023 22:07:34 +0100
Subject: ntp: T3008: migrate from ntpd to chrony

* Move CLI from "system ntp" -> "service ntp"
* Drop NTP server option preempt as not supported by chrony
---
 .../include/version/ntp-version.xml.i              |  2 +-
 interface-definitions/ntp.xml.in                   | 25 ++++++++++++----------
 2 files changed, 15 insertions(+), 12 deletions(-)

(limited to 'interface-definitions')

diff --git a/interface-definitions/include/version/ntp-version.xml.i b/interface-definitions/include/version/ntp-version.xml.i
index cc4ff9a1c..9eafbf7f0 100644
--- a/interface-definitions/include/version/ntp-version.xml.i
+++ b/interface-definitions/include/version/ntp-version.xml.i
@@ -1,3 +1,3 @@
 <!-- include start from include/version/ntp-version.xml.i -->
-<syntaxVersion component='ntp' version='1'></syntaxVersion>
+<syntaxVersion component='ntp' version='2'></syntaxVersion>
 <!-- include end -->
diff --git a/interface-definitions/ntp.xml.in b/interface-definitions/ntp.xml.in
index 85636a50f..65e40ee32 100644
--- a/interface-definitions/ntp.xml.in
+++ b/interface-definitions/ntp.xml.in
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!-- NTP configuration -->
 <interfaceDefinition>
-  <node name="system">
+  <node name="service">
     <children>
       <node name="ntp" owner="${vyos_conf_scripts_dir}/ntp.py">
         <properties>
@@ -43,12 +43,6 @@
                   <valueless/>
                 </properties>
               </leafNode>
-              <leafNode name="preempt">
-                <properties>
-                  <help>Specifies the association as preemptable rather than the default persistent</help>
-                  <valueless/>
-                </properties>
-              </leafNode>
               <leafNode name="prefer">
                 <properties>
                   <help>Marks the server as preferred</help>
@@ -57,24 +51,33 @@
               </leafNode>
             </children>
           </tagNode>
-          <node name="allow-clients">
+          <node name="allow-client">
             <properties>
-              <help>Network Time Protocol (NTP) server options</help>
+              <help>Specify NTP clients allowed to access the server</help>
             </properties>
             <children>
               <leafNode name="address">
                 <properties>
                   <help>IP address</help>
+                  <valueHelp>
+                    <format>ipv4</format>
+                    <description>Allowed IPv4 address</description>
+                  </valueHelp>
                   <valueHelp>
                     <format>ipv4net</format>
-                    <description>IP address and prefix length</description>
+                    <description>Allowed IPv4 prefix</description>
+                  </valueHelp>
+                  <valueHelp>
+                    <format>ipv6</format>
+                    <description>Allowed IPv6 address</description>
                   </valueHelp>
                   <valueHelp>
                     <format>ipv6net</format>
-                    <description>IPv6 address and prefix length</description>
+                    <description>Allowed IPv6 prefix</description>
                   </valueHelp>
                   <multi/>
                   <constraint>
+                    <validator name="ip-address"/>
                     <validator name="ip-prefix"/>
                   </constraint>
                 </properties>
-- 
cgit v1.2.3