From 29a43735334d823d89b8ec30a64fb65f5f1a20e2 Mon Sep 17 00:00:00 2001
From: Indrajit Raychaudhuri <irc@indrajit.com>
Date: Fri, 19 Jan 2024 15:33:00 -0600
Subject: ddclient: T5966: Adjust dynamic dns config address subpath

Modify the dynamic dns configuration 'address' subpath for better
clarity on how the address is obtained.

Additionally, remove `web-options` and fold those options under the
path `address web`.
---
 interface-definitions/service_dns_dynamic.xml.in | 47 +++++++++---------------
 1 file changed, 17 insertions(+), 30 deletions(-)

(limited to 'interface-definitions')

diff --git a/interface-definitions/service_dns_dynamic.xml.in b/interface-definitions/service_dns_dynamic.xml.in
index d1b0e90bb..75e5520b7 100644
--- a/interface-definitions/service_dns_dynamic.xml.in
+++ b/interface-definitions/service_dns_dynamic.xml.in
@@ -38,42 +38,29 @@
                       </constraint>
                     </properties>
                   </leafNode>
-                  <leafNode name="address">
+                  <node name="address">
                     <properties>
                       <help>Obtain IP address to send Dynamic DNS update for</help>
-                      <valueHelp>
-                        <format>txt</format>
-                        <description>Use interface to obtain the IP address</description>
-                      </valueHelp>
-                      <valueHelp>
-                        <format>web</format>
-                        <description>Use HTTP(S) web request to obtain the IP address</description>
-                      </valueHelp>
-                      <completionHelp>
-                        <script>${vyos_completion_dir}/list_interfaces</script>
-                        <list>web</list>
-                      </completionHelp>
-                      <constraint>
-                        #include <include/constraint/interface-name.xml.i>
-                        <regex>web</regex>
-                      </constraint>
-                    </properties>
-                  </leafNode>
-                  <node name="web-options">
-                    <properties>
-                      <help>Options when using HTTP(S) web request to obtain the IP address</help>
                     </properties>
                     <children>
-                      #include <include/url-http-https.xml.i>
-                      <leafNode name="skip">
+                      #include <include/generic-interface.xml.i>
+                      <node name="web">
                         <properties>
-                          <help>Pattern to skip from the HTTP(S) respose</help>
-                          <valueHelp>
-                            <format>txt</format>
-                            <description>Pattern to skip from the HTTP(S) respose to extract the external IP address</description>
-                          </valueHelp>
+                          <help>HTTP(S) web request to use</help>
                         </properties>
-                      </leafNode>
+                        <children>
+                          #include <include/url-http-https.xml.i>
+                          <leafNode name="skip">
+                            <properties>
+                              <help>Pattern to skip from the HTTP(S) respose</help>
+                              <valueHelp>
+                                <format>txt</format>
+                                <description>Pattern to skip from the HTTP(S) respose to extract the external IP address</description>
+                              </valueHelp>
+                            </properties>
+                          </leafNode>
+                        </children>
+                      </node>
                     </children>
                   </node>
                   <leafNode name="ip-version">
-- 
cgit v1.2.3