From 2080f8edd69cdf7eed4bcfb739e68300faf0681f Mon Sep 17 00:00:00 2001
From: Indrajit Raychaudhuri <irc@indrajit.com>
Date: Fri, 19 Jan 2024 23:47:46 -0600
Subject: ddclient: T5966: Streamline dynamic dns op-mode configuration

Update op-mode for dynamic dns to standardize on `vyos.opmode`. All
methods of `op_mode/dns_dynamic.py` are now available in standardized
`op_mode/dns.py`.

Move op-mode command `update dns dynamic` to `reset dns dynamic` to
reflect that it is not an update but a reset of the dynamic dns service.

Also, make the help texts more consistent for all op-mode commands for
`dns dynamic` and `dns forwarding`.
---
 op-mode-definitions/dns-dynamic.xml.in    | 25 +++++++++++--------------
 op-mode-definitions/dns-forwarding.xml.in |  2 +-
 2 files changed, 12 insertions(+), 15 deletions(-)

(limited to 'op-mode-definitions')

diff --git a/op-mode-definitions/dns-dynamic.xml.in b/op-mode-definitions/dns-dynamic.xml.in
index 79478f392..45d58e2e8 100644
--- a/op-mode-definitions/dns-dynamic.xml.in
+++ b/op-mode-definitions/dns-dynamic.xml.in
@@ -4,7 +4,7 @@
     <children>
       <node name="dns">
         <properties>
-          <help>Clear Domain Name System</help>
+          <help>Clear Domain Name System (DNS) related service state</help>
         </properties>
         <children>
           <node name="dynamic">
@@ -30,7 +30,7 @@
         <children>
           <node name="dns">
             <properties>
-              <help>Monitor last lines of Domain Name System related services</help>
+              <help>Monitor last lines of Domain Name System (DNS) related services</help>
             </properties>
             <children>
               <node name="dynamic">
@@ -51,7 +51,7 @@
         <children>
           <node name="dns">
             <properties>
-              <help>Show log for Domain Name System related services</help>
+              <help>Show log for Domain Name System (DNS) related services</help>
             </properties>
             <children>
               <node name="dynamic">
@@ -66,7 +66,7 @@
       </node>
       <node name="dns">
         <properties>
-          <help>Show Domain Name System related information</help>
+          <help>Show Domain Name System (DNS) related information</help>
         </properties>
         <children>
           <node name="dynamic">
@@ -78,7 +78,7 @@
                 <properties>
                   <help>Show Dynamic DNS status</help>
                 </properties>
-                <command>sudo ${vyos_op_scripts_dir}/dns_dynamic.py --status</command>
+                <command>sudo ${vyos_op_scripts_dir}/dns.py show_dynamic_status</command>
               </leafNode>
             </children>
           </node>
@@ -90,34 +90,31 @@
     <children>
       <node name="dns">
         <properties>
-          <help>Restart specific Domain Name System related service</help>
+          <help>Restart specific Domain Name System (DNS) related service</help>
         </properties>
         <children>
           <node name="dynamic">
             <properties>
               <help>Restart Dynamic DNS service</help>
             </properties>
-            <command>sudo ${vyos_op_scripts_dir}/dns_dynamic.py --update</command>
+            <command>if cli-shell-api existsActive service dns dynamic; then sudo systemctl restart ddclient.service; else echo "Dynamic DNS not configured"; fi</command>
           </node>
         </children>
       </node>
     </children>
   </node>
-  <node name="update">
-    <properties>
-      <help>Update data for a service</help>
-    </properties>
+  <node name="reset">
     <children>
       <node name="dns">
         <properties>
-          <help>Update Domain Name System related information</help>
+          <help>Reset Domain Name System (DNS) related service state</help>
         </properties>
         <children>
           <node name="dynamic">
             <properties>
-              <help>Update Dynamic DNS information</help>
+              <help>Reset Dynamic DNS information</help>
             </properties>
-            <command>sudo ${vyos_op_scripts_dir}/dns_dynamic.py --update</command>
+            <command>sudo ${vyos_op_scripts_dir}/dns.py reset_dynamic</command>
           </node>
         </children>
       </node>
diff --git a/op-mode-definitions/dns-forwarding.xml.in b/op-mode-definitions/dns-forwarding.xml.in
index ebedae6eb..29bfc61cf 100644
--- a/op-mode-definitions/dns-forwarding.xml.in
+++ b/op-mode-definitions/dns-forwarding.xml.in
@@ -11,7 +11,7 @@
             <children>
               <node name="forwarding">
                 <properties>
-                  <help>Monitor last lines of DNS Forwarding</help>
+                  <help>Monitor last lines of DNS Forwarding service</help>
                 </properties>
                 <command>journalctl --no-hostname --follow --boot --unit pdns-recursor.service</command>
               </node>
-- 
cgit v1.2.3


From 323994ed0fc40b67a0aa7c839229864ccb6b0e33 Mon Sep 17 00:00:00 2001
From: Indrajit Raychaudhuri <irc@indrajit.com>
Date: Sun, 21 Jan 2024 18:56:18 -0600
Subject: op-mode: T5966: Ensure top level property to avoid empty node

Since, we don't have op-mode operation for 'dns dynamic' anymore, we need
to add a top level property to avoid empty `templates-op/update/node.def`.
---
 op-mode-definitions/container.xml.in | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'op-mode-definitions')

diff --git a/op-mode-definitions/container.xml.in b/op-mode-definitions/container.xml.in
index f581d39fa..96c582a83 100644
--- a/op-mode-definitions/container.xml.in
+++ b/op-mode-definitions/container.xml.in
@@ -154,6 +154,9 @@
     </children>
   </node>
   <node name="update">
+    <properties>
+      <help>Update data for a service</help>
+    </properties>
     <children>
       <node name="container">
         <properties>
-- 
cgit v1.2.3