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`.

4 files changed, 120 insertions, 148 deletions

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>
diff --git a/src/op_mode/dns.py b/src/op_mode/dns.py
index 309bef3b9..16c462f23 100755
--- a/src/op_mode/dns.py
+++ b/src/op_mode/dns.py
@@ -15,14 +15,33 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
-import typing
+import os
 import sys
+import time
+import typing
 import vyos.opmode
 
 from tabulate import tabulate
 from vyos.configquery import ConfigTreeQuery
 from vyos.utils.process import cmd, rc_cmd
+from vyos.template import is_ipv4, is_ipv6
+
+_dynamic_cache_file = r'/run/ddclient/ddclient.cache'
+
+_dynamic_status_columns = {
+    'host':        'Hostname',
+    'ipv4':        'IPv4 address',
+    'status-ipv4': 'IPv4 status',
+    'ipv6':        'IPv6 address',
+    'status-ipv6': 'IPv6 status',
+    'mtime':       'Last update',
+}
 
+_forwarding_statistics_columns = {
+    'cache-entries':     'Cache entries',
+    'max-cache-entries': 'Max cache entries',
+    'cache-size':        'Cache size',
+}
 
 def _forwarding_data_to_dict(data, sep="\t") -> dict:
     """
@@ -50,37 +69,106 @@ def _forwarding_data_to_dict(data, sep="\t") -> dict:
             dictionary[key] = value
     return dictionary
 
+def _get_dynamic_host_records_raw() -> dict:
+
+    data = []
+
+    if os.path.isfile(_dynamic_cache_file): # A ddclient status file might not always exist
+        with open(_dynamic_cache_file, 'r') as f:
+            for line in f:
+                if line.startswith('#'):
+                    continue
+
+                props = {}
+                # ddclient cache rows have properties in 'key=value' format separated by comma
+                # we pick up the ones we are interested in
+                for kvraw in line.split(' ')[0].split(','):
+                    k, v = kvraw.split('=')
+                    if k in list(_dynamic_status_columns.keys()) + ['ip', 'status']:  # ip and status are legacy keys
+                        props[k] = v
+
+                # Extract IPv4 and IPv6 address and status from legacy keys
+                # Dual-stack isn't supported in legacy format, 'ip' and 'status' are for one of IPv4 or IPv6
+                if 'ip' in props:
+                    if is_ipv4(props['ip']):
+                        props['ipv4'] = props['ip']
+                        props['status-ipv4'] = props['status']
+                    elif is_ipv6(props['ip']):
+                        props['ipv6'] = props['ip']
+                        props['status-ipv6'] = props['status']
+                    del props['ip']
+
+                # Convert mtime to human readable format
+                if 'mtime' in props:
+                    props['mtime'] = time.strftime(
+                        "%Y-%m-%d %H:%M:%S", time.localtime(int(props['mtime'], base=10)))
+
+                data.append(props)
+
+    return data
+
+def _get_dynamic_host_records_formatted(data):
+    data_entries = []
+    for entry in data:
+        data_entries.append([entry.get(key) for key in _dynamic_status_columns.keys()])
+    header = _dynamic_status_columns.values()
+    output = tabulate(data_entries, header, numalign='left')
+    return output
 
 def _get_forwarding_statistics_raw() -> dict:
     command = cmd('rec_control get-all')
     data = _forwarding_data_to_dict(command)
-    data['cache-size'] = "{0:.2f}".format( int(
+    data['cache-size'] = "{0:.2f} kbytes".format( int(
         cmd('rec_control get cache-bytes')) / 1024 )
     return data
 
-
 def _get_forwarding_statistics_formatted(data):
-    cache_entries = data.get('cache-entries')
-    max_cache_entries = data.get('max-cache-entries')
-    cache_size = data.get('cache-size')
-    data_entries = [[cache_entries, max_cache_entries, f'{cache_size} kbytes']]
-    headers = ["Cache entries", "Max cache entries" , "Cache size"]
-    output = tabulate(data_entries, headers, numalign="left")
+    data_entries = []
+    data_entries.append([data.get(key) for key in _forwarding_statistics_columns.keys()])
+    header = _forwarding_statistics_columns.values()
+    output = tabulate(data_entries, header, numalign='left')
     return output
 
-def _verify_forwarding(func):
-    """Decorator checks if DNS Forwarding config exists"""
+def _verify(target):
+    """Decorator checks if config for DNS related service exists"""
     from functools import wraps
 
-    @wraps(func)
-    def _wrapper(*args, **kwargs):
-        config = ConfigTreeQuery()
-        if not config.exists('service dns forwarding'):
-            raise vyos.opmode.UnconfiguredSubsystem('DNS Forwarding is not configured')
-        return func(*args, **kwargs)
-    return _wrapper
+    if target not in ['dynamic', 'forwarding']:
+        raise ValueError('Invalid target')
+
+    def _verify_target(func):
+        @wraps(func)
+        def _wrapper(*args, **kwargs):
+            config = ConfigTreeQuery()
+            if not config.exists(f'service dns {target}'):
+                _prefix = f'Dynamic DNS' if target == 'dynamic' else 'DNS Forwarding'
+                raise vyos.opmode.UnconfiguredSubsystem(f'{_prefix} is not configured')
+            return func(*args, **kwargs)
+        return _wrapper
+    return _verify_target
+
+@_verify('dynamic')
+def show_dynamic_status(raw: bool):
+    host_data = _get_dynamic_host_records_raw()
+    if raw:
+        return host_data
+    else:
+        return _get_dynamic_host_records_formatted(host_data)
 
-@_verify_forwarding
+@_verify('dynamic')
+def reset_dynamic():
+    """
+    Reset Dynamic DNS cache
+    """
+    if os.path.exists(_dynamic_cache_file):
+        os.remove(_dynamic_cache_file)
+    rc, output = rc_cmd('systemctl restart ddclient.service')
+    if rc != 0:
+        print(output)
+        return None
+    print(f'Dynamic DNS state reset!')
+
+@_verify('forwarding')
 def show_forwarding_statistics(raw: bool):
     dns_data = _get_forwarding_statistics_raw()
     if raw:
@@ -88,7 +176,7 @@ def show_forwarding_statistics(raw: bool):
     else:
         return _get_forwarding_statistics_formatted(dns_data)
 
-@_verify_forwarding
+@_verify('forwarding')
 def reset_forwarding(all: bool, domain: typing.Optional[str]):
     """
     Reset DNS Forwarding cache
diff --git a/src/op_mode/dns_dynamic.py b/src/op_mode/dns_dynamic.py
deleted file mode 100755
index 12aa5494a..000000000
--- a/src/op_mode/dns_dynamic.py
+++ /dev/null
@@ -1,113 +0,0 @@
-#!/usr/bin/env python3
-#
-# Copyright (C) 2018-2023 VyOS maintainers and contributors
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License version 2 or later as
-# published by the Free Software Foundation.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-import os
-import argparse
-import sys
-import time
-from tabulate import tabulate
-
-from vyos.config import Config
-from vyos.template import is_ipv4, is_ipv6
-from vyos.utils.process import call
-
-cache_file = r'/run/ddclient/ddclient.cache'
-
-columns = {
-    'host':        'Hostname',
-    'ipv4':        'IPv4 address',
-    'status-ipv4': 'IPv4 status',
-    'ipv6':        'IPv6 address',
-    'status-ipv6': 'IPv6 status',
-    'mtime':       'Last update',
-}
-
-
-def _get_formatted_host_records(host_data):
-    data_entries = []
-    for entry in host_data:
-        data_entries.append([entry.get(key) for key in columns.keys()])
-
-    header = columns.values()
-    output = tabulate(data_entries, header, numalign='left')
-    return output
-
-
-def show_status():
-    # A ddclient status file might not always exist
-    if not os.path.exists(cache_file):
-        sys.exit(0)
-
-    data = []
-
-    with open(cache_file, 'r') as f:
-        for line in f:
-            if line.startswith('#'):
-                continue
-
-            props = {}
-            # ddclient cache rows have properties in 'key=value' format separated by comma
-            # we pick up the ones we are interested in
-            for kvraw in line.split(' ')[0].split(','):
-                k, v = kvraw.split('=')
-                if k in list(columns.keys()) + ['ip', 'status']:  # ip and status are legacy keys
-                    props[k] = v
-
-            # Extract IPv4 and IPv6 address and status from legacy keys
-            # Dual-stack isn't supported in legacy format, 'ip' and 'status' are for one of IPv4 or IPv6
-            if 'ip' in props:
-                if is_ipv4(props['ip']):
-                    props['ipv4'] = props['ip']
-                    props['status-ipv4'] = props['status']
-                elif is_ipv6(props['ip']):
-                    props['ipv6'] = props['ip']
-                    props['status-ipv6'] = props['status']
-                del props['ip']
-
-            # Convert mtime to human readable format
-            if 'mtime' in props:
-                props['mtime'] = time.strftime(
-                    "%Y-%m-%d %H:%M:%S", time.localtime(int(props['mtime'], base=10)))
-
-            data.append(props)
-
-    print(_get_formatted_host_records(data))
-
-
-def update_ddns():
-    call('systemctl stop ddclient.service')
-    if os.path.exists(cache_file):
-        os.remove(cache_file)
-    call('systemctl start ddclient.service')
-
-
-if __name__ == '__main__':
-    parser = argparse.ArgumentParser()
-    group = parser.add_mutually_exclusive_group()
-    group.add_argument("--status", help="Show DDNS status", action="store_true")
-    group.add_argument("--update", help="Update DDNS on a given interface", action="store_true")
-    args = parser.parse_args()
-
-    # Do nothing if service is not configured
-    c = Config()
-    if not c.exists_effective('service dns dynamic'):
-        print("Dynamic DNS not configured")
-        sys.exit(1)
-
-    if args.status:
-        show_status()
-    elif args.update:
-        update_ddns()