From 9db289a02892cd4dc02e8233c699428a6febc64f Mon Sep 17 00:00:00 2001
From: Daniil Baturin <daniil@baturin.org>
Date: Wed, 13 Sep 2023 19:10:41 +0100
Subject: op mode: T5582: Add 'force ntp synchronization'

(cherry picked from commit 8e5931c94a4ee409424ba092777a1a9ce03768d7)
---
 op-mode-definitions/ntp.xml.in      | 38 +++++++++++++++++++++++++++++++++++++
 op-mode-definitions/show-ntp.xml.in | 21 --------------------
 2 files changed, 38 insertions(+), 21 deletions(-)
 create mode 100644 op-mode-definitions/ntp.xml.in
 delete mode 100644 op-mode-definitions/show-ntp.xml.in

diff --git a/op-mode-definitions/ntp.xml.in b/op-mode-definitions/ntp.xml.in
new file mode 100644
index 000000000..ca0e5db08
--- /dev/null
+++ b/op-mode-definitions/ntp.xml.in
@@ -0,0 +1,38 @@
+<?xml version="1.0"?>
+<interfaceDefinition>
+  <node name="show">
+    <children>
+      <node name="ntp">
+        <properties>
+          <help>Show peer status of NTP daemon</help>
+        </properties>
+        <command>${vyos_op_scripts_dir}/show_ntp.sh --sourcestats</command>
+        <children>
+          <node name="system">
+            <properties>
+              <help>Show parameters about the system clock performance</help>
+            </properties>
+            <command>${vyos_op_scripts_dir}/show_ntp.sh --tracking</command>
+          </node>
+        </children>
+      </node>
+    </children>
+  </node>
+  <node name="force">
+    <children>
+      <node name="ntp">
+        <properties>
+          <help>NTP (Network Time Protocol) operations</help>
+        </properties>
+        <children>
+          <node name="synchronization">
+            <properties>
+              <help>Force NTP time synchronization</help>
+            </properties>
+            <command>sudo chronyc makestep</command>
+          </node>
+        </children>
+      </node>
+    </children>
+  </node>
+</interfaceDefinition>
diff --git a/op-mode-definitions/show-ntp.xml.in b/op-mode-definitions/show-ntp.xml.in
deleted file mode 100644
index 0907722af..000000000
--- a/op-mode-definitions/show-ntp.xml.in
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0"?>
-<interfaceDefinition>
-  <node name="show">
-    <children>
-      <node name="ntp">
-        <properties>
-          <help>Show peer status of NTP daemon</help>
-        </properties>
-        <command>${vyos_op_scripts_dir}/show_ntp.sh --sourcestats</command>
-        <children>
-          <node name="system">
-            <properties>
-              <help>Show parameters about the system clock performance</help>
-            </properties>
-            <command>${vyos_op_scripts_dir}/show_ntp.sh --tracking</command>
-          </node>
-        </children>
-      </node>
-    </children>
-  </node>
-</interfaceDefinition>
-- 
cgit v1.2.3


From 7009ef08a00658eea67f1080711fa28e603a5b3a Mon Sep 17 00:00:00 2001
From: Christian Breunig <christian@breunig.cc>
Date: Thu, 14 Sep 2023 19:03:27 +0200
Subject: T5582: make "force ntp synchronisation" command VRF aware

(cherry picked from commit c27b0ca1816bc9fcbb88b05ae3193d765b798d81)
---
 op-mode-definitions/ntp.xml.in | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/op-mode-definitions/ntp.xml.in b/op-mode-definitions/ntp.xml.in
index ca0e5db08..b8d0c43ec 100644
--- a/op-mode-definitions/ntp.xml.in
+++ b/op-mode-definitions/ntp.xml.in
@@ -29,6 +29,17 @@
             <properties>
               <help>Force NTP time synchronization</help>
             </properties>
+            <children>
+              <tagNode name="vrf">
+                <properties>
+                  <help>Force NTP time synchronization in given VRF</help>
+                  <completionHelp>
+                    <path>vrf name</path>
+                  </completionHelp>
+                </properties>
+                <command>sudo ip vrf exec $5 chronyc makestep</command>
+              </tagNode>
+            </children>
             <command>sudo chronyc makestep</command>
           </node>
         </children>
-- 
cgit v1.2.3