[#549] address review comments

diff --git a/src/hooks/dhcp/lease_cmds/lease_cmds.h b/src/hooks/dhcp/lease_cmds/lease_cmds.h
index 0a4f386ddd7776d856cc3a8fb86ce91a2314b476..1ea9e534de35b02176dbe12c7762cb8a7020c467 100644 (file)
--- a/src/hooks/dhcp/lease_cmds/lease_cmds.h
+++ b/src/hooks/dhcp/lease_cmds/lease_cmds.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2017-2022 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2017-2023 Internet Systems Consortium, Inc. ("ISC")
 //
 // 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

diff --git a/src/lib/cc/command_interpreter.cc b/src/lib/cc/command_interpreter.cc
index c5b478dd5e5f2da558723200dc88fe8c2fabce6a..92cf76dd6caa31e3a205630927d4bacf42bd0901 100644 (file)
--- a/src/lib/cc/command_interpreter.cc
+++ b/src/lib/cc/command_interpreter.cc
@@ -174,7 +174,7 @@ parseCommand(ConstElementPtr& arg, ConstElementPtr command) {
     }
     if (command->getType() != Element::map) {
         isc_throw(CtrlChannelError, "invalid command: expected toplevel entry to be a map, got "
-                                        << Element::typeToName(command->getType()) << " instead");
+                  << Element::typeToName(command->getType()) << " instead");
     }
     if (!command->contains(CONTROL_COMMAND)) {
         isc_throw(CtrlChannelError,
@@ -196,8 +196,8 @@ parseCommand(ConstElementPtr& arg, ConstElementPtr command) {
     ConstElementPtr cmd = command->get(CONTROL_COMMAND);
     if (cmd->getType() != Element::string) {
         isc_throw(CtrlChannelError, "invalid command: expected '"
-                                        << CONTROL_COMMAND << "' to be a string, got "
-                                        << Element::typeToName(command->getType()) << " instead");
+                  << CONTROL_COMMAND << "' to be a string, got "
+                  << Element::typeToName(command->getType()) << " instead");
     }
 
     arg = command->get(CONTROL_ARGUMENTS);
@@ -282,5 +282,5 @@ combineCommandsLists(const ConstElementPtr& response1,
     }
 }
 
-}
-}
+}  // namespace config
+}  // namespace isc

diff --git a/src/lib/dhcpsrv/pgsql_host_data_source.h b/src/lib/dhcpsrv/pgsql_host_data_source.h
index be342e7a912507d4048dd4b0f440bf6ceaa740a6..37b8e5f62b82a6201199814d3f91abf8518855c7 100644 (file)
--- a/src/lib/dhcpsrv/pgsql_host_data_source.h
+++ b/src/lib/dhcpsrv/pgsql_host_data_source.h
@@ -559,7 +559,7 @@ private:
     PgSqlHostDataSourceImplPtr impl_;
 };
 
-}
-}
+}  // namespace dhcp
+}  // namespace isc
 
 #endif // PGSQL_HOST_DATA_SOURCE_H

diff --git a/src/lib/dhcpsrv/tests/host_cache_unittest.cc b/src/lib/dhcpsrv/tests/host_cache_unittest.cc
index 516c0f4e99b0d42cd9805c2653799fb712e919ac..4665a92e4fd1043dd19e6e2dc2b31e2b06be493f 100644 (file)
--- a/src/lib/dhcpsrv/tests/host_cache_unittest.cc
+++ b/src/lib/dhcpsrv/tests/host_cache_unittest.cc
@@ -698,9 +698,6 @@ public:
         return (false);
     }
 
-    void update(HostPtr const&) {
-    }
-
     std::string getType() const {
         return ("one");
     }
@@ -996,4 +993,4 @@ TEST_F(NegativeCacheTest, get6withNegativeCaching) {
     testGet6();
 }
 
-}; // end of anonymous namespace
+}  // namespace

diff --git a/src/share/api/reservation-add.json b/src/share/api/reservation-add.json
index ecee118bc5435ccf91d871dd3171fa7ecf4f4dc3..d77172561340e0819b9b7349f3a43264d2df992a 100644 (file)
--- a/src/share/api/reservation-add.json
+++ b/src/share/api/reservation-add.json
@@ -5,7 +5,7 @@
         "This command adds a new host reservation. The reservation may include IPv4 addresses, IPv6 addresses, IPv6 prefixes, various identifiers, a class the client will be assigned to, DHCPv4 and DHCPv6 options, and more."
     ],
     "cmd-comment": [
-        "Note that ip-address, client-id, next-server, server-hostname, and boot-file-name are IPv4-specific. ip-addresses, and prefixes are IPv6-specific."
+        "Note that boot-file-name, circuit-id, client-id, ip-address, next-server, and server-hostname are IPv4-specific. ip-addresses, and prefixes are IPv6-specific."
     ],
     "cmd-syntax": [
         "{",

diff --git a/src/share/api/reservation-update.json b/src/share/api/reservation-update.json
index 5c0a0b81b1b208aa9f89629ac88f8b137b43b525..7af996b6fbea28e6520cf85fa2a07eef75f3c0e6 100644 (file)
--- a/src/share/api/reservation-update.json
+++ b/src/share/api/reservation-update.json
@@ -5,7 +5,7 @@
         "This command updates an existing host reservation. The reservation has to include host identifiers and a subnet identifier and may include IPv4 addresses, IPv6 addresses, IPv6 prefixes, various identifiers, a class the client will be assigned to, DHCPv4 and DHCPv6 options, and more."
     ],
     "cmd-comment": [
-        "Note that ip-address, client-id, next-server, server-hostname, and boot-file-name are IPv4-specific. ip-addresses, and prefixes are IPv6-specific."
+        "Note that boot-file-name, circuit-id, client-id, ip-address, next-server, and server-hostname are IPv4-specific. ip-addresses, and prefixes are IPv6-specific."
     ],
     "cmd-syntax": [
         "{",