From: Thomas Markwalder <tmark@isc.org>
Date: Thu, 2 Apr 2020 17:25:03 +0000 (-0400)
Subject: [#1010] Fixed errors in all_keys.json files
X-Git-Tag: Kea-1.7.7~83
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=50ac4684eabacc51b1216354b7410ebe94de0137;p=thirdparty%2Fkea.git

[#1010] Fixed errors in all_keys.json files
---

diff --git a/doc/examples/kea4/all-keys.json b/doc/examples/kea4/all-keys.json
index d7d1fd3340..bb4e43d7b7 100644
--- a/doc/examples/kea4/all-keys.json
+++ b/doc/examples/kea4/all-keys.json
@@ -513,7 +513,7 @@
 
         // Global value to store extended information (e.g. relay agent
         // information) with each lease.
-        "store-extended-info:" true,
+        "store-extended-info": true,
 
         // Governs how the Kea DHCPv4 server should deal with the invalid
         // data received from the client.
@@ -615,7 +615,7 @@
 
                 // Turn off storage of extended information (e.g. relay agent
                 // information) with each lease for this shared-network.
-                "store-extended-info:" false,
+                "store-extended-info": false,
 
                 // Shared network level server hostname set in 'sname' field.
                 "server-hostname": "",
@@ -682,7 +682,7 @@
 
                         // Turn on storage of extended information (e.g. relay agent
                         // information) with each lease for this subnet.
-                         "store-extended-info:" true,
+                        "store-extended-info": true,
 
                         // Subnet level list of DHCP options.
                         "option-data": [
diff --git a/doc/examples/kea6/all-keys.json b/doc/examples/kea6/all-keys.json
index c6e3e29ac9..8d57b112d9 100644
--- a/doc/examples/kea6/all-keys.json
+++ b/doc/examples/kea6/all-keys.json
@@ -454,7 +454,7 @@
 
         // Global value to store extended information (e.g. relay agent
         // information) with each lease.
-        "store-extended-info:" true,
+        "store-extended-info": true,
 
         // Governs how the Kea DHCPv6 server should deal with the invalid
         // data received from the client.
@@ -580,7 +580,7 @@
 
                 // Turn off storage of extended information (e.g. relay agent
                 // information) with each lease for this shared-network.
-                "store-extended-info:" false,
+                "store-extended-info": false,
 
                 // List of IPv6 subnets belonging to this shared network.
                 "subnet6": [
@@ -628,7 +628,7 @@
 
                         // Turn on storage of extended information (e.g. relay agent
                         // information) with each lease for this subnet.
-                         "store-extended-info:" true,
+                        "store-extended-info": true,
 
                         // Subnet level list of DHCP options.
                         "option-data": [
diff --git a/src/bin/dhcp4/tests/parser_unittest.cc b/src/bin/dhcp4/tests/parser_unittest.cc
index 61ff0b1173..bd9557ea92 100644
--- a/src/bin/dhcp4/tests/parser_unittest.cc
+++ b/src/bin/dhcp4/tests/parser_unittest.cc
@@ -9,6 +9,7 @@
 #include <gtest/gtest.h>
 #include <dhcp4/parser_context.h>
 #include <dhcpsrv/parsers/simple_parser4.h>
+#include <testutils/gtest_utils.h>
 #include <testutils/io_utils.h>
 #include <testutils/user_context_utils.h>
 
@@ -238,7 +239,7 @@ void testFile(const std::string& fname) {
 
     cout << "Parsing file " << fname << " (" << decommented << ")" << endl;
 
-    EXPECT_NO_THROW(json = Element::fromJSONFile(decommented, true));
+    EXPECT_NO_THROW_LOG(json = Element::fromJSONFile(decommented, true));
     reference_json = moveComments(json);
 
     // remove the temporary file