4 files changed, 58 insertions, 21 deletions
diff --git a/op-mode-definitions/ntp.xml.in b/op-mode-definitions/ntp.xml.in
new file mode 100644
index 000000000..b8d0c43ec
--- /dev/null
+++ b/op-mode-definitions/ntp.xml.in
@@ -0,0 +1,49 @@
+<?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>
+            <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>
+      </node>
+    </children>
+  </node>
+</interfaceDefinition>
diff --git a/op-mode-definitions/show-ip.xml.in b/op-mode-definitions/show-ip.xml.in
index d5dbb7850..3caf1f1ea 100644
--- a/op-mode-definitions/show-ip.xml.in
+++ b/op-mode-definitions/show-ip.xml.in
@@ -33,6 +33,12 @@
               </tagNode>
             </children>
           </node>
+          <leafNode name="nht">
+            <properties>
+              <help>Show IPv4 nexthop tracking table</help>
+            </properties>
+            <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+          </leafNode>
         </children>
       </node>
     </children>
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>
diff --git a/op-mode-definitions/show-techsupport_report.xml.in b/op-mode-definitions/show-techsupport_report.xml.in
index aa51eacd9..ef051e940 100644
--- a/op-mode-definitions/show-techsupport_report.xml.in
+++ b/op-mode-definitions/show-techsupport_report.xml.in
@@ -3,6 +3,9 @@
   <node name="show">
     <children>
       <node name="tech-support">
+        <properties>
+          <help>Show tech-support report</help>
+        </properties>
         <children>
           <node name="report">
             <properties>