From 994a826caf3c1a9f5f84d8b703a3b202120e91b6 Mon Sep 17 00:00:00 2001 From: Francis Dupont Date: Wed, 28 Nov 2018 22:54:14 +0100 Subject: [PATCH] [195-document-sample-netconf-operation] Moved operation examples in kea-dhcp6-operations subdir --- doc/Makefile.am | 16 +++++---- .../{ => kea-dhcp6-operations}/BAD-config.xml | 0 .../{ => kea-dhcp6-operations}/BAD-schema.xml | 0 .../BAD-translator.xml | 0 .../netconf/kea-dhcp6-operations/boot.json | 8 +++++ .../{ => kea-dhcp6-operations}/logging.xml | 0 .../netconf/kea-dhcp6-operations/netconf.json | 33 +++++++++++++++++++ .../{ => kea-dhcp6-operations}/startup.xml | 0 .../{ => kea-dhcp6-operations}/twopools.xml | 0 .../{ => kea-dhcp6-operations}/twosubnets.xml | 0 doc/guide/netconf.xml | 11 ++++--- 11 files changed, 56 insertions(+), 12 deletions(-) rename doc/examples/netconf/{ => kea-dhcp6-operations}/BAD-config.xml (100%) rename doc/examples/netconf/{ => kea-dhcp6-operations}/BAD-schema.xml (100%) rename doc/examples/netconf/{ => kea-dhcp6-operations}/BAD-translator.xml (100%) create mode 100644 doc/examples/netconf/kea-dhcp6-operations/boot.json rename doc/examples/netconf/{ => kea-dhcp6-operations}/logging.xml (100%) create mode 100644 doc/examples/netconf/kea-dhcp6-operations/netconf.json rename doc/examples/netconf/{ => kea-dhcp6-operations}/startup.xml (100%) rename doc/examples/netconf/{ => kea-dhcp6-operations}/twopools.xml (100%) rename doc/examples/netconf/{ => kea-dhcp6-operations}/twosubnets.xml (100%) diff --git a/doc/Makefile.am b/doc/Makefile.am index 0656ad7f12..41aa95a0e9 100644 --- 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 index 0000000000..3b55789d29 --- /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 index 0000000000..f5fdca8c2a --- /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 e48dce6f7f..4007a7f601 100644 --- a/doc/guide/netconf.xml +++ b/doc/guide/netconf.xml @@ -715,8 +715,9 @@ done in dependency order and reverse dependency order accordingly.
Step by Step Netconf Operation Example Copies of example configurations presented within this section - can be found in the Kea source code, under doc/examples/kea6 - and doc/examples/netconf. + can be found in the Kea source code, under + doc/examples/netconf/kea-dhcp6-operations. +
@@ -815,8 +816,8 @@ done in dependency order and reverse dependency order accordingly. - Now that both kea-netconf and - kea-dhcp6 are running, it is possible to populate + Now that both kea-netconf and + kea-dhcp6 are running, it is possible to populate updated to configuration to the DHCPv6 server. The following is the configuration extracted from the startup.xml: @@ -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 - sysrepocfg / + sysrepocfg / option (or simlar feature of NETCONF clients) with care. -- 2.47.2