mir/kea
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/kea synced 2025-09-03 15:35:17 +00:00
Code Issues Releases Wiki Activity

[5046] Addressed review comments

Browse Source 
Added memfile without persistence to set_config unit tests. This eliminates
the tests attempting to create the csv file.

Updated copyrights.

Fixed misspelling.
This commit is contained in:
Thomas Markwalder
2017-01-03 08:23:44 -05:00
parent e5a6c2b4f8
commit ebb863e372
17 changed files with 32 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/bin/dhcp4/ctrl_dhcp4_srv.cc
View File

@@ -1,4 +1,4 @@
// Copyright (C) 2014-2016 Internet Systems Consortium, Inc. ("ISC") // Copyright (C) 2014-2017 Internet Systems Consortium, Inc. ("ISC")
// //
// This Source Code Form is subject to the terms of the Mozilla Public // This Source Code Form is subject to the terms of the Mozilla Public
// License, v. 2.0. If a copy of the MPL was not distributed with this // License, v. 2.0. If a copy of the MPL was not distributed with this

2
src/bin/dhcp4/ctrl_dhcp4_srv.h
View File

@@ -1,4 +1,4 @@
// Copyright (C) 2012-2015 Internet Systems Consortium, Inc. ("ISC") // Copyright (C) 2012-2017 Internet Systems Consortium, Inc. ("ISC")
// //
// This Source Code Form is subject to the terms of the Mozilla Public // This Source Code Form is subject to the terms of the Mozilla Public
// License, v. 2.0. If a copy of the MPL was not distributed with this // License, v. 2.0. If a copy of the MPL was not distributed with this

2
src/bin/dhcp4/json_config_parser.cc
View File

@@ -1,4 +1,4 @@
// Copyright (C) 2012-2016 Internet Systems Consortium, Inc. ("ISC") // Copyright (C) 2012-2017 Internet Systems Consortium, Inc. ("ISC")
// //
// This Source Code Form is subject to the terms of the Mozilla Public // This Source Code Form is subject to the terms of the Mozilla Public
// License, v. 2.0. If a copy of the MPL was not distributed with this // License, v. 2.0. If a copy of the MPL was not distributed with this

2
src/bin/dhcp4/kea_controller.cc
View File

@@ -1,4 +1,4 @@
// Copyright (C) 2014-2016 Internet Systems Consortium, Inc. ("ISC") // Copyright (C) 2014-2017 Internet Systems Consortium, Inc. ("ISC")
// //
// This Source Code Form is subject to the terms of the Mozilla Public // This Source Code Form is subject to the terms of the Mozilla Public
// License, v. 2.0. If a copy of the MPL was not distributed with this // License, v. 2.0. If a copy of the MPL was not distributed with this

9
src/bin/dhcp4/tests/ctrl_dhcp4_srv_unittest.cc
View File

@@ -1,4 +1,4 @@
// Copyright (C) 2012-2016 Internet Systems Consortium, Inc. ("ISC") // Copyright (C) 2012-2017 Internet Systems Consortium, Inc. ("ISC")
// //
// This Source Code Form is subject to the terms of the Mozilla Public // This Source Code Form is subject to the terms of the Mozilla Public
// License, v. 2.0. If a copy of the MPL was not distributed with this // License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -504,6 +504,11 @@ TEST_F(CtrlChannelDhcpv4SrvTest, set_config) {
" \"valid-lifetime\": 4000, \n" " \"valid-lifetime\": 4000, \n"
" \"renew-timer\": 1000, \n" " \"renew-timer\": 1000, \n"
" \"rebind-timer\": 2000, \n" " \"rebind-timer\": 2000, \n"
" \"lease-database\": { \n"
" \"type\": \"memfile\", \n"
" \"persist\":false, \n"
" \"lfc-interval\": 0 \n"
" }, \n"
" \"expired-leases-processing\": { \n" " \"expired-leases-processing\": { \n"
" \"reclaim-timer-wait-time\": 0, \n" " \"reclaim-timer-wait-time\": 0, \n"
" \"hold-reclaimed-time\": 0, \n" " \"hold-reclaimed-time\": 0, \n"
@@ -585,7 +590,7 @@ TEST_F(CtrlChannelDhcpv4SrvTest, set_config) {
// Should fail with a syntax error // Should fail with a syntax error
EXPECT_EQ("{ \"result\": 1, " EXPECT_EQ("{ \"result\": 1, "
"\"text\": \"unsupported parameter: BOGUS (<string>:15:26)\" }", "\"text\": \"unsupported parameter: BOGUS (<string>:20:26)\" }",
response); response);
// Check that the config was not lost // Check that the config was not lost

2
src/bin/dhcp4/tests/dhcp4_test_utils.cc
View File

@@ -1,4 +1,4 @@
// Copyright (C) 2013-2016 Internet Systems Consortium, Inc. ("ISC") // Copyright (C) 2013-2017 Internet Systems Consortium, Inc. ("ISC")
// //
// This Source Code Form is subject to the terms of the Mozilla Public // This Source Code Form is subject to the terms of the Mozilla Public
// License, v. 2.0. If a copy of the MPL was not distributed with this // License, v. 2.0. If a copy of the MPL was not distributed with this

2
src/bin/dhcp4/tests/kea_controller_unittest.cc
View File

@@ -1,4 +1,4 @@
// Copyright (C) 2014-2016 Internet Systems Consortium, Inc. ("ISC") // Copyright (C) 2014-2017 Internet Systems Consortium, Inc. ("ISC")
// //
// This Source Code Form is subject to the terms of the Mozilla Public // This Source Code Form is subject to the terms of the Mozilla Public
// License, v. 2.0. If a copy of the MPL was not distributed with this // License, v. 2.0. If a copy of the MPL was not distributed with this

2
src/bin/dhcp6/ctrl_dhcp6_srv.cc
View File

@@ -1,4 +1,4 @@
// Copyright (C) 2014-2016 Internet Systems Consortium, Inc. ("ISC") // Copyright (C) 2014-2017 Internet Systems Consortium, Inc. ("ISC")
// //
// This Source Code Form is subject to the terms of the Mozilla Public // This Source Code Form is subject to the terms of the Mozilla Public
// License, v. 2.0. If a copy of the MPL was not distributed with this // License, v. 2.0. If a copy of the MPL was not distributed with this

2
src/bin/dhcp6/ctrl_dhcp6_srv.h
View File

@@ -1,4 +1,4 @@
// Copyright (C) 2012-2015 Internet Systems Consortium, Inc. ("ISC") // Copyright (C) 2012-2017 Internet Systems Consortium, Inc. ("ISC")
// //
// This Source Code Form is subject to the terms of the Mozilla Public // This Source Code Form is subject to the terms of the Mozilla Public
// License, v. 2.0. If a copy of the MPL was not distributed with this // License, v. 2.0. If a copy of the MPL was not distributed with this

2
src/bin/dhcp6/json_config_parser.cc
View File

@@ -1,4 +1,4 @@
// Copyright (C) 2012-2016 Internet Systems Consortium, Inc. ("ISC") // Copyright (C) 2012-2017 Internet Systems Consortium, Inc. ("ISC")
// //
// This Source Code Form is subject to the terms of the Mozilla Public // This Source Code Form is subject to the terms of the Mozilla Public
// License, v. 2.0. If a copy of the MPL was not distributed with this // License, v. 2.0. If a copy of the MPL was not distributed with this

2
src/bin/dhcp6/kea_controller.cc
View File

@@ -1,4 +1,4 @@
// Copyright (C) 2014-2016 Internet Systems Consortium, Inc. ("ISC") // Copyright (C) 2014-2017 Internet Systems Consortium, Inc. ("ISC")
// //
// This Source Code Form is subject to the terms of the Mozilla Public // This Source Code Form is subject to the terms of the Mozilla Public
// License, v. 2.0. If a copy of the MPL was not distributed with this // License, v. 2.0. If a copy of the MPL was not distributed with this

9
src/bin/dhcp6/tests/ctrl_dhcp6_srv_unittest.cc
View File

@@ -1,4 +1,4 @@
// Copyright (C) 2012-2016 Internet Systems Consortium, Inc. ("ISC") // Copyright (C) 2012-2017 Internet Systems Consortium, Inc. ("ISC")
// //
// This Source Code Form is subject to the terms of the Mozilla Public // This Source Code Form is subject to the terms of the Mozilla Public
// License, v. 2.0. If a copy of the MPL was not distributed with this // License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -369,6 +369,11 @@ TEST_F(CtrlChannelDhcpv6SrvTest, set_config) {
" \"valid-lifetime\": 4000, \n" " \"valid-lifetime\": 4000, \n"
" \"renew-timer\": 1000, \n" " \"renew-timer\": 1000, \n"
" \"rebind-timer\": 2000, \n" " \"rebind-timer\": 2000, \n"
" \"lease-database\": { \n"
" \"type\": \"memfile\", \n"
" \"persist\":false, \n"
" \"lfc-interval\": 0 \n"
" }, \n"
" \"expired-leases-processing\": { \n" " \"expired-leases-processing\": { \n"
" \"reclaim-timer-wait-time\": 0, \n" " \"reclaim-timer-wait-time\": 0, \n"
" \"hold-reclaimed-time\": 0, \n" " \"hold-reclaimed-time\": 0, \n"
@@ -450,7 +455,7 @@ TEST_F(CtrlChannelDhcpv6SrvTest, set_config) {
// Should fail with a syntax error // Should fail with a syntax error
EXPECT_EQ("{ \"result\": 1, " EXPECT_EQ("{ \"result\": 1, "
"\"text\": \"unsupported parameter: BOGUS (<string>:16:26)\" }", "\"text\": \"unsupported parameter: BOGUS (<string>:21:26)\" }",
response); response);
// Check that the config was not lost // Check that the config was not lost

2
src/bin/dhcp6/tests/dhcp6_test_utils.cc
View File

@@ -1,4 +1,4 @@
// Copyright (C) 2013-2016 Internet Systems Consortium, Inc. ("ISC") // Copyright (C) 2013-2017 Internet Systems Consortium, Inc. ("ISC")
// //
// This Source Code Form is subject to the terms of the Mozilla Public // This Source Code Form is subject to the terms of the Mozilla Public
// License, v. 2.0. If a copy of the MPL was not distributed with this // License, v. 2.0. If a copy of the MPL was not distributed with this

6
src/lib/config/command_mgr.cc
View File

@@ -1,4 +1,4 @@
// Copyright (C) 2015-2016 Internet Systems Consortium, Inc. ("ISC") // Copyright (C) 2015-2017 Internet Systems Consortium, Inc. ("ISC")
// //
// This Source Code Form is subject to the terms of the Mozilla Public // This Source Code Form is subject to the terms of the Mozilla Public
// License, v. 2.0. If a copy of the MPL was not distributed with this // License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -177,7 +177,7 @@ CommandMgr::commandReader(int sockfd) {
if (!rsp) { if (!rsp) {
LOG_WARN(command_logger, COMMAND_RESPONSE_ERROR); LOG_WARN(command_logger, COMMAND_RESPONSE_ERROR);
// Only close the dupped socket if it's different (should be) // Only close the duped socket if it's different (should be)
if (rsp_fd != sockfd) { if (rsp_fd != sockfd) {
close(rsp_fd); close(rsp_fd);
} }
@@ -211,7 +211,7 @@ CommandMgr::commandReader(int sockfd) {
.arg(len).arg(sockfd).arg(strerror(saverr)); .arg(len).arg(sockfd).arg(strerror(saverr));
} }
// Only close the dupped socket if it's different (should be) // Only close the duped socket if it's different (should be)
if (rsp_fd != sockfd) { if (rsp_fd != sockfd) {
close(rsp_fd); close(rsp_fd);
} }

2
src/lib/config/config_messages.mes
View File

@@ -1,4 +1,4 @@
# Copyright (C) 2011-2015 Internet Systems Consortium, Inc. ("ISC") # Copyright (C) 2011-2017 Internet Systems Consortium, Inc. ("ISC")
# #
# This Source Code Form is subject to the terms of the Mozilla Public # This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this # License, v. 2.0. If a copy of the MPL was not distributed with this

2
src/lib/testutils/io_utils.cc
View File

@@ -1,4 +1,4 @@
// Copyright (C) 2015 Internet Systems Consortium, Inc. ("ISC") // Copyright (C) 2015-2017 Internet Systems Consortium, Inc. ("ISC")
// //
// This Source Code Form is subject to the terms of the Mozilla Public // This Source Code Form is subject to the terms of the Mozilla Public
// License, v. 2.0. If a copy of the MPL was not distributed with this // License, v. 2.0. If a copy of the MPL was not distributed with this

2
src/lib/testutils/io_utils.h
View File

@@ -1,4 +1,4 @@
// Copyright (C) 2015 Internet Systems Consortium, Inc. ("ISC") // Copyright (C) 2015-2017 Internet Systems Consortium, Inc. ("ISC")
// //
// This Source Code Form is subject to the terms of the Mozilla Public // This Source Code Form is subject to the terms of the Mozilla Public
// License, v. 2.0. If a copy of the MPL was not distributed with this // License, v. 2.0. If a copy of the MPL was not distributed with this