[195-document-sample-netconf-operation] Moved operation examples in kea-dhcp6-operati...

diff --git a/doc/Makefile.am b/doc/Makefile.am
index 0656ad7f1206176fd6d743dea8537075569e2594..41aa95a0e962fa9b7f618d3580440f1ebfa9f00d 100644 (file)
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -62,16 +62,18 @@ nobase_dist_doc_DATA += examples/kea6/simple.json
 nobase_dist_doc_DATA += examples/kea6/softwire46.json
 nobase_dist_doc_DATA += examples/kea6/stateless.json
 nobase_dist_doc_DATA += examples/kea6/with-ddns.json
-nobase_dist_doc_DATA += examples/netconf/BAD-config.xml
-nobase_dist_doc_DATA += examples/netconf/BAD-schema.xml
-nobase_dist_doc_DATA += examples/netconf/BAD-translator.xml
+nobase_dist_doc_DATA += examples/netconf/kea-dhcp6-operations/BAD-config.xml
+nobase_dist_doc_DATA += examples/netconf/kea-dhcp6-operations/BAD-schema.xml
+nobase_dist_doc_DATA += examples/netconf/kea-dhcp6-operations/BAD-translator.xml
+nobase_dist_doc_DATA += examples/netconf/kea-dhcp6-operations/boot.json
+nobase_dist_doc_DATA += examples/netconf/kea-dhcp6-operations/logging.xml
+nobase_dist_doc_DATA += examples/netconf/kea-dhcp6-operations/netconf.json
+nobase_dist_doc_DATA += examples/netconf/kea-dhcp6-operations/startup.xml
+nobase_dist_doc_DATA += examples/netconf/kea-dhcp6-operations/twopools.xml
+nobase_dist_doc_DATA += examples/netconf/kea-dhcp6-operations/twosubnets.xml
 nobase_dist_doc_DATA += examples/netconf/comments.json
-nobase_dist_doc_DATA += examples/netconf/logging.xml
 nobase_dist_doc_DATA += examples/netconf/simple-dhcp4.json
 nobase_dist_doc_DATA += examples/netconf/simple.json
-nobase_dist_doc_DATA += examples/netconf/startup.xml
-nobase_dist_doc_DATA += examples/netconf/twopools.xml
-nobase_dist_doc_DATA += examples/netconf/twosubnets.xml
 
 # These are files that document our APIs. They're not really needed as the
 # content is included in the api.xml, but may be useful for people who

diff --git a/doc/examples/netconf/BAD-config.xml b/doc/examples/netconf/kea-dhcp6-operations/BAD-config.xml
similarity index 100%
rename from doc/examples/netconf/BAD-config.xml
rename to doc/examples/netconf/kea-dhcp6-operations/BAD-config.xml

diff --git a/doc/examples/netconf/BAD-schema.xml b/doc/examples/netconf/kea-dhcp6-operations/BAD-schema.xml
similarity index 100%
rename from doc/examples/netconf/BAD-schema.xml
rename to doc/examples/netconf/kea-dhcp6-operations/BAD-schema.xml

diff --git a/doc/examples/netconf/BAD-translator.xml b/doc/examples/netconf/kea-dhcp6-operations/BAD-translator.xml
similarity index 100%
rename from doc/examples/netconf/BAD-translator.xml
rename to doc/examples/netconf/kea-dhcp6-operations/BAD-translator.xml

diff --git a/doc/examples/netconf/kea-dhcp6-operations/boot.json b/doc/examples/netconf/kea-dhcp6-operations/boot.json
new file mode 100644 (file)
index 0000000..3b55789
--- /dev/null
+++ b/doc/examples/netconf/kea-dhcp6-operations/boot.json
@@ -0,0 +1,8 @@
+{
+    "Dhcp6": {
+        "control-socket": {
+            "socket-type": "unix",
+            "socket-name": "/tmp/kea6-sock"
+        }
+    }
+}

diff --git a/doc/examples/netconf/logging.xml b/doc/examples/netconf/kea-dhcp6-operations/logging.xml
similarity index 100%
rename from doc/examples/netconf/logging.xml
rename to doc/examples/netconf/kea-dhcp6-operations/logging.xml

diff --git a/doc/examples/netconf/kea-dhcp6-operations/netconf.json b/doc/examples/netconf/kea-dhcp6-operations/netconf.json
new file mode 100644 (file)
index 0000000..f5fdca8
--- /dev/null
+++ b/doc/examples/netconf/kea-dhcp6-operations/netconf.json
@@ -0,0 +1,33 @@
+{
+    "Netconf":
+    {
+        "managed-servers":
+        {
+            "dhcp6":
+            {
+                "control-socket":
+                {
+                    "socket-type": "unix",
+                    "socket-name": "/tmp/kea6-sock"
+                }
+            }
+        }
+    },
+    "Logging":
+    {
+        "loggers":
+        [
+            {
+                "name": "kea-netconf",
+                "output_options":
+                [
+                    {
+                        "output": "stderr"
+                    }
+                ],
+                "severity": "DEBUG",
+                "debuglevel": 99
+            }
+        ]
+    }
+}

diff --git a/doc/examples/netconf/startup.xml b/doc/examples/netconf/kea-dhcp6-operations/startup.xml
similarity index 100%
rename from doc/examples/netconf/startup.xml
rename to doc/examples/netconf/kea-dhcp6-operations/startup.xml

diff --git a/doc/examples/netconf/twopools.xml b/doc/examples/netconf/kea-dhcp6-operations/twopools.xml
similarity index 100%
rename from doc/examples/netconf/twopools.xml
rename to doc/examples/netconf/kea-dhcp6-operations/twopools.xml

diff --git a/doc/examples/netconf/twosubnets.xml b/doc/examples/netconf/kea-dhcp6-operations/twosubnets.xml
similarity index 100%
rename from doc/examples/netconf/twosubnets.xml
rename to doc/examples/netconf/kea-dhcp6-operations/twosubnets.xml

diff --git a/doc/guide/netconf.xml b/doc/guide/netconf.xml
index e48dce6f7f055f004520b3ee07e016c26cd47e5d..4007a7f6016aa2d6ee8bb491ab10493159ea7c68 100644 (file)
--- a/doc/guide/netconf.xml
+++ b/doc/guide/netconf.xml
@@ -715,8 +715,9 @@ done in dependency order and reverse dependency order accordingly.
   <section xml:id="operation-example">
     <title>Step by Step Netconf Operation Example</title>
     <note><para>Copies of example configurations presented within this section
-    can be found in the Kea source code, under <filename>doc/examples/kea6</filename>
-    and <filename>doc/examples/netconf</filename>.</para></note>
+    can be found in the Kea source code, under
+    <filename>doc/examples/netconf/kea-dhcp6-operations</filename>.
+    </para></note>
 
  
    <section xml:id="operation-example-setup">
@@ -815,8 +816,8 @@ done in dependency order and reverse dependency order accordingly.
       </para>
 
       <para>
-        Now that both <filename>kea-netconf</filename> and
-        <filename>kea-dhcp6</filename> are running, it is possible to populate
+        Now that both <command>kea-netconf</command> and
+        <command>kea-dhcp6</command> are running, it is possible to populate
         updated to configuration to the DHCPv6 server. The following is
         the configuration extracted from the <filename>startup.xml</filename>:
 <screen>
@@ -980,7 +981,7 @@ done in dependency order and reverse dependency order accordingly.
         In the last case, the misconfiguration is detected too late and
         the change must be reverted in sysrepo, e.g. using the startup
         datastore as a backup. For this reason, please use the
-       <command>sysrepocfg</command> <option>--permanent</option> /
+        <command>sysrepocfg</command> <option>--permanent</option> /
         <option>-p</option> option (or simlar feature of NETCONF clients)
         with care.
       </para>