From: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Date: Wed, 17 Aug 2022 05:59:50 +0000 (+1200)
Subject: samba-tool dns: NAME_DOES_NOT_EXIST errors; add docstring
X-Git-Tag: talloc-2.4.0~1170
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=36241042dd6ef241e9a674c92131f17e317f78f4;p=thirdparty%2Fsamba.git

samba-tool dns: NAME_DOES_NOT_EXIST errors; add docstring

In practice, these always refer to zones.

We're adding the docstring now, because it made no sense when
default_messages was empty.

Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
---

diff --git a/python/samba/netcmd/dns.py b/python/samba/netcmd/dns.py
index 137e52acfd5..10374ade45e 100644
--- a/python/samba/netcmd/dns.py
+++ b/python/samba/netcmd/dns.py
@@ -59,12 +59,42 @@ def dns_connect(server, lp, creds):
 class DnsConnWrapper:
     """A wrapper around a dnsserver.dnsserver connection that makes it
     harder not to report friendly messages.
+
+    If, rather than
+
+        dns_conn = dns_connect(server, lp, creds)
+
+    you use
+
+        dns_conn = DnsConnWrapper(server, lp, creds)
+
+    then various common errors (for example, mispelled zones) on
+    common operations will raise CommandErrors that turn into
+    relatively nice messages (when compared to tracebacks).
+
+    In addition, if you provide a messages keyword argument, it will
+    override the defaults. Note that providing None will turn off the
+    default, letting the original exception shine through.
+
+        messages = {
+            werror.WERR_DNS_ERROR_ZONE_DOES_NOT_EXIST: (
+                f'Zone {zone} does not exist and so could not be deleted.'),
+            werror.WERR_DNS_ERROR_NAME_DOES_NOT_EXIST: None
+        }
+        res = dns_conn.DnssrvOperation2( # ...
+                                        messages=messages)
+
+    This example changes the message for ZONE_DOES_NOT_EXIST and
+    avoids catching NAME_DOES_NOT_EXIST.
+
+    Only WERRORErrors are intercepted.
     """
 
     default_messages = {
         werror.WERR_DNS_ERROR_DS_UNAVAILABLE: "Could not contact RPC server",
         werror.WERR_DNS_ERROR_ZONE_ALREADY_EXISTS: 'Zone already exists',
         werror.WERR_DNS_ERROR_RECORD_DOES_NOT_EXIST: 'The record does not exist',
+        werror.WERR_DNS_ERROR_NAME_DOES_NOT_EXIST:  'The zone does not exist',
     }
 
     def __init__(self, server, lp, creds):