[4202] Update miscellaneous tests and example files

 Replaced underscores with hypens in D2 config in remaining files:

    doc/examples/ddns/sample1.json
    doc/examples/ddns/template.json
    doc/guide/ddns.xml
    src/bin/d2/tests/d2_process_tests.sh.in
    src/bin/keactrl/kea.conf.pre
    src/bin/keactrl/tests/keactrl_tests.sh.in

diff --git a/doc/examples/ddns/sample1.json b/doc/examples/ddns/sample1.json
index dc179ba99a65134d8c1ccca271b5065d7b14e05f..1198f76c120ef3b1f9215e2050cee77dc6a36ba2 100644 (file)
--- a/doc/examples/ddns/sample1.json
+++ b/doc/examples/ddns/sample1.json
@@ -14,9 +14,9 @@
 #   on port 53001.  Maximum time to we will  wait for a DNS server to
 #   respond to us is 1000 ms.
 
-    "ip_address": "172.16.1.10",
+    "ip-address": "172.16.1.10",
     "port": 53001,
-    "dns_server_timeout" : 1000,
+    "dns-server-timeout" : 1000,
 
 #
 # ----------------- Forward DDNS  ------------------
@@ -30,18 +30,18 @@
 #      It does not use TSIG.
 #      It is server by one DNS server at "2001:db8:1::10" on port 7802
 
-    "forward_ddns":
+    "forward-ddns":
     {
-        "ddns_domains":
+        "ddns-domains":
         [
 #           DdnsDomain for zone "four.example.com."
             {
                 "name": "four.example.com.",
-                "key_name": "d2.md5.key",
-                "dns_servers":
+                "key-name": "d2.md5.key",
+                "dns-servers":
                 [
                     {
-                        "ip_address": "172.16.1.1"
+                        "ip-address": "172.16.1.1"
                     }
                 ]
             },
@@ -49,10 +49,10 @@
 #           DdnsDomain for zone "six.example.com."
             {
                 "name": "six.example.com.",
-                "dns_servers":
+                "dns-servers":
                 [
                     {
-                        "ip_address": "2001:db8:1::10",
+                        "ip-address": "2001:db8:1::10",
                         "port": 7802
                     }
                 ]
@@ -67,21 +67,21 @@
 # uses TSIG with key "d2.sha1.key" and is served by two DNS servers:
 # one listening at "172.16.1.1" on 53001 and the other at "192.168.2.10".
 #
-    "reverse_ddns":
+    "reverse-ddns":
     {
-        "ddns_domains":
+        "ddns-domains":
         [
             {
                 "name": "2.0.192.in-addr.arpa.",
-                "key_name": "d2.sha1.key",
-                "dns_servers":
+                "key-name": "d2.sha1.key",
+                "dns-servers":
                 [
                     {
-                        "ip_address": "172.16.1.1",
+                        "ip-address": "172.16.1.1",
                         "port": 53001
                     },
                     {
-                        "ip_address": "192.168.2.10"
+                        "ip-address": "192.168.2.10"
                     }
                 ]
             }
@@ -94,7 +94,7 @@
 #   Each key has a name, an algorithm (HMAC-MD5, HMAC-SHA1, HMAC-SHA224...)
 #   and a base-64 encoded shared secret.
 #
-    "tsig_keys":
+    "tsig-keys":
     [
         {
             "name": "d2.md5.key",
@@ -109,7 +109,7 @@
         {
             "name": "d2.sha512.key",
             "algorithm": "HMAC-SHA512",
-            "digest_bits": 256,
+            "digest-bits": 256,
             "secret": "/4wklkm04jeH4anx2MKGJLcya+ZLHldL5d6mK+4q6UXQP7KJ9mS2QG29hh0SJR4LA0ikxNJTUMvir42gLx6fGQ=="
         }
     ]

diff --git a/doc/examples/ddns/template.json b/doc/examples/ddns/template.json
index 98a75ed5d72d653e140f363604b1325c273e8a2b..b6a5949adda3cc78a1c6fd492023fdf5e428536c 100644 (file)
--- a/doc/examples/ddns/template.json
+++ b/doc/examples/ddns/template.json
@@ -14,26 +14,26 @@
 #    All of the global parameters have default values as shown.  If these
 #    are satisfactory you may omit them.
 #
-#    "ip_address" : "127.0.0.1",
+#    "ip-address" : "127.0.0.1",
 #    "port" : 53001,
-#    "dns_server_timeout" : 100,
-#    "ncr_protocol" : "UDP"
-#    "ncr_format" : "JSON"
+#    "dns-server-timeout" : 100,
+#    "ncr-protocol" : "UDP"
+#    "ncr-format" : "JSON"
 
 #
 # ----------------- Forward DDNS  ------------------
 #
-    "forward_ddns" :
+    "forward-ddns" :
     {
-        "ddns_domains" :
+        "ddns-domains" :
         [
             {
                 "name" : "<zone name 1>",
-#                "key_name" : "<key name>",
-                "dns_servers" :
+#                "key-name" : "<key name>",
+                "dns-servers" :
                 [
                     {
-                        "ip_address" : "<ip address>"
+                        "ip-address" : "<ip address>"
 #                       ,"port" : 53
                     }
 #                   ,
@@ -54,17 +54,17 @@
 #
 # ----------------- Reverse DDNS  ------------------
 #
-    "reverse_ddns" :
+    "reverse-ddns" :
     {
-        "ddns_domains" :
+        "ddns-domains" :
         [
             {
                 "name" : "<reverse zone name 1>",
-#                "key_name" : "<key name>",
-                "dns_servers" :
+#                "key-name" : "<key name>",
+                "dns-servers" :
                 [
                     {
-                        "ip_address" : "<ip address>"
+                        "ip-address" : "<ip address>"
 #                        ,"port" : 53
                     }
 #                   ,
@@ -84,7 +84,7 @@
 #
 # ------------------ TSIG keys ---------------------
 #
-    "tsig_keys" :
+    "tsig-keys" :
     [
         {
             "name" : "<key name>",
@@ -92,7 +92,7 @@
 #            Valid values for algorithm are:    HMAC-MD5, HMAC-SHA1,
 #                                               HMAC-SHA224, HMAC-SHA256,
 #                                               HMAC-SHA384, HMAC-SHA512
-#           "digest_bits" : 256,
+#           "digest-bits" : 256,
 #           Minimum truncated length in bits.
 #           Default 0 (means truncation is forbidden).
             "secret" : "<shared secret value>"

diff --git a/doc/guide/ddns.xml b/doc/guide/ddns.xml
index 2867dc964749474f86b1c6a3f9c739bc2b5b8ac7..aa1b9d3ae8d6ef7f634c776f0e279cb20c6254cc 100644 (file)
--- a/doc/guide/ddns.xml
+++ b/doc/guide/ddns.xml
@@ -166,17 +166,17 @@ strings <userinput>path</userinput>/kea-dhcp-ddns | sed -n 's/;;;; //p'
        configuration is a template that can be customised to your requirements.
 <screen>
 <userinput>"DhcpDdns": {
-    "ip_address": "127.0.0.1",
+    "ip-address": "127.0.0.1",
     "port": 53001,
-    "dns_server_timeout": 100,
-    "ncr_protocol": "UDP",
-    "ncr_format": "JSON",
-    "tsig_keys": [ ],
-    "forward_ddns": {
-       "ddns_domains": [ ]
+    "dns-server-timeout": 100,
+    "ncr-protocol": "UDP",
+    "ncr-format": "JSON",
+    "tsig-keys": [ ],
+    "forward-ddns": {
+       "ddns-domains": [ ]
     },
-    "reverse_ddns": {
-       "ddns_domains": [ ]
+    "reverse-ddns": {
+       "ddns-domains": [ ]
     }
 }</userinput>
 </screen>
@@ -216,7 +216,7 @@ strings <userinput>path</userinput>/kea-dhcp-ddns | sed -n 's/;;;; //p'
       <itemizedlist>
 
       <listitem><simpara>
-      <command>ip_address</command> - IP address on which D2
+      <command>ip-address</command> - IP address on which D2
       listens for requests. The default is the local loopback interface at
       address 127.0.0.1. You may specify either an IPv4 or IPv6 address.
       </simpara></listitem>
@@ -227,19 +227,19 @@ strings <userinput>path</userinput>/kea-dhcp-ddns | sed -n 's/;;;; //p'
       </simpara></listitem>
 
       <listitem><simpara>
-      <command>dns_server_timeout</command> - The maximum amount
+      <command>dns-server-timeout</command> - The maximum amount
       of time in milliseconds, that D2 will wait for a response from a
       DNS server to a single DNS update message.
       </simpara></listitem>
 
       <listitem><simpara>
-      <command>ncr_protocol</command> - Socket protocol to use when sending requests to D2.
+      <command>ncr-protocol</command> - Socket protocol to use when sending requests to D2.
       Currently only UDP is supported.  TCP may be available in an upcoming
       release.
       </simpara></listitem>
 
       <listitem><simpara>
-      <command>ncr_format</command> - Packet format to use when sending requests to D2.
+      <command>ncr-format</command> - Packet format to use when sending requests to D2.
       Currently only JSON format is supported.  Other formats may be available
       in future releases.
       </simpara></listitem>
@@ -252,7 +252,7 @@ strings <userinput>path</userinput>/kea-dhcp-ddns | sed -n 's/;;;; //p'
        at 192.168.1.10 port 900:
 <screen>
 "DhcpDdns": {
-    <userinput>"ip_address": "192.168.1.10",
+    <userinput>"ip-address": "192.168.1.10",
     "port": 900,</userinput>
     ...
     }
@@ -272,7 +272,7 @@ strings <userinput>path</userinput>/kea-dhcp-ddns | sed -n 's/;;;; //p'
        </warning>
 <note>
 <simpara>
-If the ip_address and port are changed, it will be necessary to change the
+If the ip-address and port are changed, it will be necessary to change the
 corresponding values in the DHCP servers' "dhcp-ddns" configuration section.
 </simpara>
 </note>
@@ -298,7 +298,7 @@ corresponding values in the DHCP servers' "dhcp-ddns" configuration section.
        corresponding TSIG key in the TSIG Key list.</para>
 
        <para>
-       As one might gather from the name, the tsig_key section of the
+       As one might gather from the name, the tsig-key section of the
        D2 configuration lists the TSIG keys.  Each entry describes a
        TSIG key used by one or more DNS servers to authenticate requests
        and sign responses.  Every entry in the list has three parameters:
@@ -345,7 +345,7 @@ corresponding values in the DHCP servers' "dhcp-ddns" configuration section.
          </listitem>
          <listitem>
            <simpara>
-             <command>digest_bits</command> -
+             <command>digest-bits</command> -
              is used to specify the minimum truncated length in bits.
              The default value 0 means truncation is forbidden, not 0
              values must be an integral number of octets, be greater
@@ -380,7 +380,7 @@ corresponding values in the DHCP servers' "dhcp-ddns" configuration section.
        By default, the TSIG Key list is empty:
 <screen>
 "DhcpDdns": {
-   <userinput>"tsig_keys": [ ]</userinput>,
+   <userinput>"tsig-keys": [ ]</userinput>,
    ...
 }
 </screen>
@@ -388,7 +388,7 @@ corresponding values in the DHCP servers' "dhcp-ddns" configuration section.
        We must extend the list with a new key:
 <screen>
 "DhcpDdns": {
-    "tsig_keys": [
+    "tsig-keys": [
     <userinput>    {
            "name": "key.four.example.com.",
            "algorithm": "HMAC-SHA224",
@@ -413,8 +413,8 @@ corresponding values in the DHCP servers' "dhcp-ddns" configuration section.
        forward DDNS Domains, which is a list of structures.
 <screen>
 "DhcpDdns": {
-    <userinput>"forward_ddns": {
-       "ddns_domains": [ ]
+    <userinput>"forward-ddns": {
+       "ddns-domains": [ ]
     }</userinput>,
     ...
 }
@@ -451,7 +451,7 @@ corresponding values in the DHCP servers' "dhcp-ddns" configuration section.
            </listitem>
            <listitem>
              <simpara>
-             <command>key_name</command> -
+             <command>key-name</command> -
              If TSIG is used with this domain's servers, this
              value should be the name of the key from within the TSIG Key List
              to use.  If the value is blank (the default), TSIG will not be
@@ -460,7 +460,7 @@ corresponding values in the DHCP servers' "dhcp-ddns" configuration section.
            </listitem>
            <listitem>
              <simpara>
-             <command>dns_servers</command> -
+             <command>dns-servers</command> -
              A list of one or more DNS servers which can conduct the server
              side of the DDNS protocol for this domain.  The servers
              are used in a first to last preference. In other words, when D2
@@ -475,12 +475,12 @@ corresponding values in the DHCP servers' "dhcp-ddns" configuration section.
        element and set its parameters:
 <screen>
 "DhcpDdns": {
-    "forward_ddns": {
-       "ddns_domains": [
+    "forward-ddns": {
+       "ddns-domains": [
            <userinput>{
                "name": "other.example.com.",
-               "key_name": "",
-               "dns_servers": [
+               "key-name": "",
+               "dns-servers": [
                ]
            }</userinput>
        ]
@@ -514,7 +514,7 @@ corresponding values in the DHCP servers' "dhcp-ddns" configuration section.
            </listitem>
            <listitem>
              <simpara>
-             <command>ip_address</command> -
+             <command>ip-address</command> -
              The IP address at which the server listens for DDNS requests.
              This may be either an IPv4 or an IPv6 address.
              </simpara>
@@ -533,15 +533,15 @@ corresponding values in the DHCP servers' "dhcp-ddns" configuration section.
        follows:
 <screen>
 "DhcpDdns": {
-    "forward_ddns": {
-       "ddns_domains": [
+    "forward-ddns": {
+       "ddns-domains": [
            {
                "name": "other.example.com.",
-               "key_name": "",
-               "dns_servers": [
+               "key-name": "",
+               "dns-servers": [
                    <userinput>{
                        "hostname": "",
-                       "ip_address": "172.88.99.10",
+                       "ip-address": "172.88.99.10",
                        "port": 53
                    }</userinput>
                ]
@@ -554,7 +554,7 @@ corresponding values in the DHCP servers' "dhcp-ddns" configuration section.
 
     <note><simpara>
        As stated earlier, "hostname" is not yet supported so, the parameter
-       "ip_address" must be set to the address of the DNS server.
+       "ip-address" must be set to the address of the DNS server.
     </simpara></note>
 
        </section> <!-- "add-forward-dns-servers" -->
@@ -572,8 +572,8 @@ corresponding values in the DHCP servers' "dhcp-ddns" configuration section.
        reverse DDNS Domains, which is a list of structures.
 <screen>
 "DhcpDdns": {
-    <userinput>"reverse_ddns": {
-       "ddns_domains": [ ]
+    <userinput>"reverse-ddns": {
+       "ddns-domains": [ ]
     }</userinput>
     ...
 }
@@ -615,7 +615,7 @@ corresponding values in the DHCP servers' "dhcp-ddns" configuration section.
            </listitem>
            <listitem>
              <simpara>
-             <command>key_name</command> -
+             <command>key-name</command> -
              If TSIG should be used with this domain's servers, then this
              value should be the name of that key from the TSIG Key List.
              If the value is blank (the default), TSIG will not be
@@ -625,7 +625,7 @@ corresponding values in the DHCP servers' "dhcp-ddns" configuration section.
            </listitem>
            <listitem>
              <simpara>
-             <command>dns_servers</command> -
+             <command>dns-servers</command> -
              a list of one or more DNS servers which can conduct the server
              side of the DDNS protocol for this domain.  Currently the servers
              are used in a first to last preference. In other words, when D2
@@ -641,12 +641,12 @@ corresponding values in the DHCP servers' "dhcp-ddns" configuration section.
        the following configuration could be used:
 <screen>
 "DhcpDdns": {
-    "reverse_ddns": {
-       "ddns_domains": [
+    "reverse-ddns": {
+       "ddns-domains": [
            <userinput>{
                "name": "1.0.0.0.8.B.D.0.1.0.0.2.ip6.arpa.",
-               "key_name": "",
-               "dns_servers": [
+               "key-name": "",
+               "dns-servers": [
                ]
            }</userinput>
        ]
@@ -680,7 +680,7 @@ corresponding values in the DHCP servers' "dhcp-ddns" configuration section.
            </listitem>
            <listitem>
              <simpara>
-             <command>ip_address</command> -
+             <command>ip-address</command> -
              The IP address at which the server listens for DDNS requests.
              </simpara>
            </listitem>
@@ -698,15 +698,15 @@ corresponding values in the DHCP servers' "dhcp-ddns" configuration section.
        follows:
 <screen>
 "DhcpDdns": {
-    "reverse_ddns": {
-       "ddns_domains": [
+    "reverse-ddns": {
+       "ddns-domains": [
            {
                "name": "1.0.0.0.8.B.D.0.1.0.0.2.ip6.arpa.",
-               "key_name": "",
-               "dns_servers": [
+               "key-name": "",
+               "dns-servers": [
                    <userinput>{
                        "hostname": "",
-                       "ip_address": "172.88.99.10",
+                       "ip-address": "172.88.99.10",
                        "port": 53
                    }</userinput>
                ]
@@ -720,7 +720,7 @@ corresponding values in the DHCP servers' "dhcp-ddns" configuration section.
     <note>
     <simpara>
     As stated earlier, "hostname" is not yet supported so, the parameter
-    "ip_address" must be set to the address of the DNS server.
+    "ip-address" must be set to the address of the DNS server.
     </simpara>
     </note>
 
@@ -820,28 +820,28 @@ corresponding values in the DHCP servers' "dhcp-ddns" configuration section.
        The following example configuration specified the Forward DDNS Domains.
 <screen><userinput>
 "DhcpDdns": {
-    "forward_ddns": {
-       "ddns_domains": [
+    "forward-ddns": {
+       "ddns-domains": [
            {
                "name": "four.example.com.",
-               "key_name": "",
-               "dns_servers": [
-                   { "ip_address": "172.16.1.5" },
-                   { "ip_address": "172.16.2.5" }
+               "key-name": "",
+               "dns-servers": [
+                   { "ip-address": "172.16.1.5" },
+                   { "ip-address": "172.16.2.5" }
                ]
            },
            {
                "name": "six.example.com.",
-               "key_name": "",
-               "dns_servers": [
-                   { "ip_address": "2001:db8::1" }
+               "key-name": "",
+               "dns-servers": [
+                   { "ip-address": "2001:db8::1" }
                ]
            },
            {
                "name": "example.com.",
-               "key_name": "",
-               "dns_servers": [
-                   { "ip_address": "172.16.2.5" }
+               "key-name": "",
+               "dns-servers": [
+                   { "ip-address": "172.16.2.5" }
                ]
            },
 
@@ -894,28 +894,28 @@ corresponding values in the DHCP servers' "dhcp-ddns" configuration section.
 
 <screen><userinput>
 "DhcpDdns": {
-    "reverse_ddns": {
-       "ddns_domains": [
+    "reverse-ddns": {
+       "ddns-domains": [
            {
                "name": "2.0.192.in-addr.arpa.",
-               "key_name": "",
-               "dns_servers": [
-                   { "ip_address": "172.16.1.5" },
-                   { "ip_address": "172.16.2.5" }
+               "key-name": "",
+               "dns-servers": [
+                   { "ip-address": "172.16.1.5" },
+                   { "ip-address": "172.16.2.5" }
                ]
            }
            {
                "name": "1.0.0.0.8.B.D.0.1.0.0.2.ip6.arpa.",
-               "key_name": "",
-               "dns_servers": [
-                   { "ip_address": "2001:db8::1" }
+               "key-name": "",
+               "dns-servers": [
+                   { "ip-address": "2001:db8::1" }
                ]
            }
            {
                "name": "0.192.in-addr.arpa.",
-               "key_name": "",
-               "dns_servers": [
-                   { "ip_address": "172.16.2.5" }
+               "key-name": "",
+               "dns-servers": [
+                   { "ip-address": "172.16.2.5" }
                ]
            }
        ]

diff --git a/src/bin/d2/tests/d2_process_tests.sh.in b/src/bin/d2/tests/d2_process_tests.sh.in
index 3a6aa83d3b0805c2136fa02c556c186c4abfd34d..80f19c8e01a45c5b634b17e1d6ed60a338a02dc4 100755 (executable)
--- a/src/bin/d2/tests/d2_process_tests.sh.in
+++ b/src/bin/d2/tests/d2_process_tests.sh.in
@@ -22,11 +22,11 @@ EXPECTED_VERSION="@PACKAGE_VERSION@"
 CONFIG="{
     \"DhcpDdns\":
     {
-        \"ip_address\": \"127.0.0.1\",
+        \"ip-address\": \"127.0.0.1\",
         \"port\": 53001,
-        \"tsig_keys\": [],
-        \"forward_ddns\" : {},
-        \"reverse_ddns\" : {}
+        \"tsig-keys\": [],
+        \"forward-ddns\" : {},
+        \"reverse-ddns\" : {}
     },
     \"Logging\":
     {
@@ -49,11 +49,11 @@ CONFIG="{
 CONFIG_INVALID="{
     \"DhcpDdns\":
     {
-        \"ip_address\": \"127.0.0.1\",
+        \"ip-address\": \"127.0.0.1\",
         \"port\": BOGUS,
-        \"tsig_keys\": [],
-        \"forward_ddns\" : {},
-        \"reverse_ddns\" : {}
+        \"tsig-keys\": [],
+        \"forward-ddns\" : {},
+        \"reverse-ddns\" : {}
     },
     \"Logging\":
     {

diff --git a/src/bin/keactrl/kea.conf.pre b/src/bin/keactrl/kea.conf.pre
index d8299a40a49f9265014ad1f3bc2f7154f57e8203..005832ce1c428d9a43193284983fcf5db9f57148 100644 (file)
--- a/src/bin/keactrl/kea.conf.pre
+++ b/src/bin/keactrl/kea.conf.pre
@@ -105,11 +105,11 @@
 # DHCP DDNS configuration starts here.
 "DhcpDdns":
 {
-  "ip_address": "127.0.0.1",
+  "ip-address": "127.0.0.1",
   "port": 53001,
-  "tsig_keys": [],
-  "forward_ddns" : {},
-  "reverse_ddns" : {}
+  "tsig-keys": [],
+  "forward-ddns" : {},
+  "reverse-ddns" : {}
 },
 
 # Logging configuration starts here. It tells Kea servers to store

diff --git a/src/bin/keactrl/tests/keactrl_tests.sh.in b/src/bin/keactrl/tests/keactrl_tests.sh.in
index 0e1c3c4bdb8888c740dcd7e5919db28fa5f45e60..c0f273ab8bc5b867f71ea0dcd640da84a4cea3f9 100644 (file)
--- a/src/bin/keactrl/tests/keactrl_tests.sh.in
+++ b/src/bin/keactrl/tests/keactrl_tests.sh.in
@@ -74,11 +74,11 @@ config="{
     },
     \"DhcpDdns\":
     {
-        \"ip_address\": \"127.0.0.1\",
+        \"ip-address\": \"127.0.0.1\",
         \"port\": 53001,
-        \"tsig_keys\": [],
-        \"forward_ddns\" : {},
-        \"reverse_ddns\" : {}
+        \"tsig-keys\": [],
+        \"forward-ddns\" : {},
+        \"reverse-ddns\" : {}
     },
 
     \"Logging\":