Merge pull request #2555 from indrajitr/sagitta-ddclient-backports

ddclient: T5573,T5574,T5612,T5708: Backport ddclient related changes

7 files changed, 84 insertions, 27 deletions

diff --git a/interface-definitions/dns-dynamic.xml.in b/interface-definitions/dns-dynamic.xml.in
index a0720f3aa..07b1bf1b8 100644
--- a/interface-definitions/dns-dynamic.xml.in
+++ b/interface-definitions/dns-dynamic.xml.in
@@ -61,6 +61,7 @@
                     <children>
                       #include <include/generic-description.xml.i>
                       #include <include/dns/dynamic-service-host-name-server.xml.i>
+                      #include <include/dns/dynamic-service-wait-expiry-time.xml.i>
                       <leafNode name="key">
                         <properties>
                           <help>File containing the TSIG secret key shared with remote DNS server</help>
@@ -74,18 +75,7 @@
                         </properties>
                       </leafNode>
                       #include <include/dns/time-to-live.xml.i>
-                      <leafNode name="zone">
-                        <properties>
-                          <help>Forwarding zone to be updated</help>
-                          <valueHelp>
-                            <format>txt</format>
-                            <description>RFC2136 Zone to be updated</description>
-                          </valueHelp>
-                          <constraint>
-                            <validator name="fqdn"/>
-                          </constraint>
-                        </properties>
-                      </leafNode>
+                      #include <include/dns/dynamic-service-zone.xml.i>
                     </children>
                   </tagNode>
                   <tagNode name="service">
@@ -99,8 +89,10 @@
                     <children>
                       #include <include/generic-description.xml.i>
                       #include <include/dns/dynamic-service-host-name-server.xml.i>
+                      #include <include/dns/dynamic-service-wait-expiry-time.xml.i>
                       #include <include/generic-username.xml.i>
                       #include <include/generic-password.xml.i>
+                      #include <include/dns/time-to-live.xml.i>
                       <leafNode name="protocol">
                         <properties>
                           <help>ddclient protocol used for Dynamic DNS service</help>
@@ -112,15 +104,7 @@
                           </constraint>
                         </properties>
                       </leafNode>
-                      <leafNode name="zone">
-                        <properties>
-                          <help>DNS zone to update (not used by all protocols)</help>
-                          <valueHelp>
-                            <format>txt</format>
-                            <description>Name of DNS zone</description>
-                          </valueHelp>
-                        </properties>
-                      </leafNode>
+                      #include <include/dns/dynamic-service-zone.xml.i>
                       <leafNode name="ip-version">
                         <properties>
                           <help>IP address version to use</help>
@@ -150,9 +134,9 @@
                   </tagNode>
                 </children>
               </tagNode>
-              <leafNode name="timeout">
+              <leafNode name="interval">
                 <properties>
-                  <help>Time in seconds to wait between DNS updates</help>
+                  <help>Interval in seconds to wait between Dynamic DNS updates</help>
                   <valueHelp>
                     <format>u32:60-3600</format>
                     <description>Time in seconds</description>
@@ -160,10 +144,11 @@
                   <constraint>
                     <validator name="numeric" argument="--range 60-3600"/>
                   </constraint>
-                  <constraintErrorMessage>Timeout must be between 60 and 3600 seconds</constraintErrorMessage>
+                  <constraintErrorMessage>Interval must be between 60 and 3600 seconds</constraintErrorMessage>
                 </properties>
                 <defaultValue>300</defaultValue>
               </leafNode>
+              #include <include/interface/vrf.xml.i>
             </children>
           </node>
         </children>
diff --git a/interface-definitions/dns-forwarding.xml.in b/interface-definitions/dns-forwarding.xml.in
index c00051c47..5ca02acef 100644
--- a/interface-definitions/dns-forwarding.xml.in
+++ b/interface-definitions/dns-forwarding.xml.in
@@ -158,6 +158,9 @@
                             </properties>
                           </leafNode>
                           #include <include/dns/time-to-live.xml.i>
+                          <leafNode name="ttl">
+                              <defaultValue>300</defaultValue>
+                          </leafNode>
                           #include <include/generic-disable-node.xml.i>
                         </children>
                       </tagNode>
@@ -195,6 +198,9 @@
                             </properties>
                           </leafNode>
                           #include <include/dns/time-to-live.xml.i>
+                          <leafNode name="ttl">
+                              <defaultValue>300</defaultValue>
+                          </leafNode>
                           #include <include/generic-disable-node.xml.i>
                         </children>
                       </tagNode>
@@ -227,6 +233,9 @@
                             </properties>
                           </leafNode>
                           #include <include/dns/time-to-live.xml.i>
+                          <leafNode name="ttl">
+                              <defaultValue>300</defaultValue>
+                          </leafNode>
                           #include <include/generic-disable-node.xml.i>
                         </children>
                       </tagNode>
@@ -274,6 +283,9 @@
                             </children>
                           </tagNode>
                           #include <include/dns/time-to-live.xml.i>
+                          <leafNode name="ttl">
+                              <defaultValue>300</defaultValue>
+                          </leafNode>
                           #include <include/generic-disable-node.xml.i>
                         </children>
                       </tagNode>
@@ -302,6 +314,9 @@
                             </properties>
                           </leafNode>
                           #include <include/dns/time-to-live.xml.i>
+                          <leafNode name="ttl">
+                              <defaultValue>300</defaultValue>
+                          </leafNode>
                           #include <include/generic-disable-node.xml.i>
                         </children>
                       </tagNode>
@@ -334,6 +349,9 @@
                             </properties>
                           </leafNode>
                           #include <include/dns/time-to-live.xml.i>
+                          <leafNode name="ttl">
+                              <defaultValue>300</defaultValue>
+                          </leafNode>
                           #include <include/generic-disable-node.xml.i>
                         </children>
                       </tagNode>
@@ -364,6 +382,9 @@
                             </properties>
                           </leafNode>
                           #include <include/dns/time-to-live.xml.i>
+                          <leafNode name="ttl">
+                              <defaultValue>300</defaultValue>
+                          </leafNode>
                           #include <include/generic-disable-node.xml.i>
                         </children>
                       </tagNode>
@@ -393,6 +414,9 @@
                             </properties>
                           </leafNode>
                           #include <include/dns/time-to-live.xml.i>
+                          <leafNode name="ttl">
+                              <defaultValue>300</defaultValue>
+                          </leafNode>
                           #include <include/generic-disable-node.xml.i>
                         </children>
                       </tagNode>
@@ -477,6 +501,9 @@
                             </children>
                           </tagNode>
                           #include <include/dns/time-to-live.xml.i>
+                          <leafNode name="ttl">
+                              <defaultValue>300</defaultValue>
+                          </leafNode>
                           #include <include/generic-disable-node.xml.i>
                         </children>
                       </tagNode>
@@ -585,6 +612,9 @@
                             </children>
                           </tagNode>
                           #include <include/dns/time-to-live.xml.i>
+                          <leafNode name="ttl">
+                              <defaultValue>300</defaultValue>
+                          </leafNode>
                           #include <include/generic-disable-node.xml.i>
                         </children>
                       </tagNode>
diff --git a/interface-definitions/include/dns/dynamic-service-host-name-server.xml.i b/interface-definitions/include/dns/dynamic-service-host-name-server.xml.i
index ee1af2a36..9dd14f97c 100644
--- a/interface-definitions/include/dns/dynamic-service-host-name-server.xml.i
+++ b/interface-definitions/include/dns/dynamic-service-host-name-server.xml.i
@@ -4,8 +4,9 @@
     <help>Hostname to register with Dynamic DNS service</help>
     <constraint>
         #include <include/constraint/host-name.xml.i>
+        <regex>(\@|\*)[-.A-Za-z0-9]*</regex>
     </constraint>
-    <constraintErrorMessage>Host-name must be alphanumeric and can contain hyphens</constraintErrorMessage>
+    <constraintErrorMessage>Host-name must be alphanumeric, can contain hyphens and can be prefixed with '@' or '*'</constraintErrorMessage>
     <multi/>
   </properties>
 </leafNode>
diff --git a/interface-definitions/include/dns/dynamic-service-wait-expiry-time.xml.i b/interface-definitions/include/dns/dynamic-service-wait-expiry-time.xml.i
new file mode 100644
index 000000000..866690cbe
--- /dev/null
+++ b/interface-definitions/include/dns/dynamic-service-wait-expiry-time.xml.i
@@ -0,0 +1,28 @@
+<!-- include start from dns/dynamic-service-wait-expiry-time.xml.i -->
+<leafNode name="wait-time">
+  <properties>
+    <help>Time in seconds to wait between update attempts</help>
+    <valueHelp>
+      <format>u32:60-86400</format>
+      <description>Time in seconds</description>
+    </valueHelp>
+    <constraint>
+      <validator name="numeric" argument="--range 60-86400"/>
+    </constraint>
+    <constraintErrorMessage>Wait time must be between 60 and 86400 seconds</constraintErrorMessage>
+  </properties>
+</leafNode>
+<leafNode name="expiry-time">
+  <properties>
+    <help>Time in seconds for the hostname to be marked expired in cache</help>
+    <valueHelp>
+      <format>u32:300-2160000</format>
+      <description>Time in seconds</description>
+    </valueHelp>
+    <constraint>
+      <validator name="numeric" argument="--range 300-2160000"/>
+    </constraint>
+    <constraintErrorMessage>Expiry time must be between 300 and 2160000 seconds</constraintErrorMessage>
+  </properties>
+</leafNode>
+<!-- include end -->
diff --git a/interface-definitions/include/dns/dynamic-service-zone.xml.i b/interface-definitions/include/dns/dynamic-service-zone.xml.i
new file mode 100644
index 000000000..0cc00468f
--- /dev/null
+++ b/interface-definitions/include/dns/dynamic-service-zone.xml.i
@@ -0,0 +1,14 @@
+<!-- include start from dns/dynamic-service-zone.xml.i -->
+<leafNode name="zone">
+  <properties>
+    <help>DNS zone to be updated</help>
+    <valueHelp>
+      <format>txt</format>
+      <description>Name of DNS zone</description>
+    </valueHelp>
+    <constraint>
+      <validator name="fqdn"/>
+    </constraint>
+  </properties>
+</leafNode>
+<!-- include end -->
diff --git a/interface-definitions/include/dns/time-to-live.xml.i b/interface-definitions/include/dns/time-to-live.xml.i
index 5c1a1472d..000eea108 100644
--- a/interface-definitions/include/dns/time-to-live.xml.i
+++ b/interface-definitions/include/dns/time-to-live.xml.i
@@ -10,6 +10,5 @@
       <validator name="numeric" argument="--range 0-2147483647"/>
     </constraint>
   </properties>
-  <defaultValue>300</defaultValue>
 </leafNode>
 <!-- include end -->
diff --git a/interface-definitions/include/version/dns-dynamic-version.xml.i b/interface-definitions/include/version/dns-dynamic-version.xml.i
index b25fc6e76..7bdb90a35 100644
--- a/interface-definitions/include/version/dns-dynamic-version.xml.i
+++ b/interface-definitions/include/version/dns-dynamic-version.xml.i
@@ -1,3 +1,3 @@
 <!-- include start from include/version/dns-dynamic-version.xml.i -->
-<syntaxVersion component='dns-dynamic' version='1'></syntaxVersion>
+<syntaxVersion component='dns-dynamic' version='2'></syntaxVersion>
 <!-- include end -->