From: Francis Dupont <fdupont@isc.org>
Date: Tue, 23 Oct 2018 15:16:32 +0000 (+0200)
Subject: [130-all-keys-sample] Addressed comments (note that I am still running tests)
X-Git-Tag: 65-libyang-clean-keatext_base~17
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=667543f4662d4eb0d5e4ce5d53e5f7a95a047ebe;p=thirdparty%2Fkea.git

[130-all-keys-sample] Addressed comments (note that I am still running tests)
---

diff --git a/doc/Makefile.am b/doc/Makefile.am
index 76d7d62bb3..a957186348 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -61,10 +61,8 @@ nobase_dist_doc_DATA += examples/netconf/comments.json
 nobase_dist_doc_DATA += examples/netconf/simple.json
 nobase_dist_doc_DATA += examples/netconf/simple-dhcp4.json
 
-if HAVE_GTEST
 nobase_dist_doc_DATA += examples/kea4/all-keys.json
 nobase_dist_doc_DATA += examples/kea6/all-keys.json
-endif
 
 devel:
 	mkdir -p html
diff --git a/doc/examples/kea4/all-keys.json b/doc/examples/kea4/all-keys.json
index 8316bad335..fde7576a0f 100644
--- a/doc/examples/kea4/all-keys.json
+++ b/doc/examples/kea4/all-keys.json
@@ -290,7 +290,7 @@
         // Specifies a list of interfaces on which the Kea DHCPv4
         // server should listen to the DHCP requests.
         "interfaces": [
-            "eth1"
+            "ethX"
         ],
 
         // Enumeration which indicates what interface should be used
diff --git a/src/bin/dhcp4/tests/parser_unittest.cc b/src/bin/dhcp4/tests/parser_unittest.cc
index b9eefc3467..c379ca26d5 100644
--- a/src/bin/dhcp4/tests/parser_unittest.cc
+++ b/src/bin/dhcp4/tests/parser_unittest.cc
@@ -264,6 +264,7 @@ void testFile(const std::string& fname) {
 // the second time with Parser4. Both JSON trees are then compared.
 TEST(ParserTest, file) {
     vector<string> configs = { "advanced.json" ,
+                               "all-keys.json",
                                "backends.json",
                                "cassandra.json",
                                "classify.json",
diff --git a/src/bin/dhcp6/tests/parser_unittest.cc b/src/bin/dhcp6/tests/parser_unittest.cc
index 65a7e3591a..7fc8119039 100644
--- a/src/bin/dhcp6/tests/parser_unittest.cc
+++ b/src/bin/dhcp6/tests/parser_unittest.cc
@@ -270,6 +270,7 @@ void testFile(const std::string& fname) {
 TEST(ParserTest, file) {
     vector<string> configs;
     configs.push_back("advanced.json");
+    configs.push_back("all-keys.json");
     configs.push_back("backends.json");
     configs.push_back("cassandra.json");
     configs.push_back("classify.json");