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

diff --git a/doc/Makefile.am b/doc/Makefile.am
index 76d7d62bb3311321b2838472982c0e53f8db9e56..a957186348be60f4255f4aff5aa82fcb9e07e082 100644 (file)
--- 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 8316bad335a416b760dfd0248f89d1efa98179d6..fde7576a0f9ccb553eb768d951e694f06a8970b5 100644 (file)
--- 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 b9eefc34672bd81057229ab71aaeadc33e1e9319..c379ca26d56c378d736b05a07cc405251cff69e1 100644 (file)
--- 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 65a7e3591ac91cf4043246e846b78543a2261c2e..7fc8119039d788491c6c2ab844f581aef832656a 100644 (file)
--- 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");