Commit dbed2f11 authored by Thomas Markwalder's avatar Thomas Markwalder
Browse files

[5705] Minor review revisions

parent ef40a210
...@@ -3553,8 +3553,7 @@ It is merely echoed by the server ...@@ -3553,8 +3553,7 @@ It is merely echoed by the server
</para> </para>
<note>You can reserve any ip-address in a global reservation. Just keep <note>You can reserve any ip-address in a global reservation. Just keep
in mind that Kea will not do any sanity checking on the address and for in mind that Kea will not do any sanity checking on the address and for
Kea 1.5.0, support for global reservation mechanism should be Kea 1.5.0, support for global reservations should be considered experimental.
considered experimental.
</note> </note>
</section> </section>
...@@ -3638,7 +3637,7 @@ It is merely echoed by the server ...@@ -3638,7 +3637,7 @@ It is merely echoed by the server
<para>The conflict resolution mechanism does not work for global <para>The conflict resolution mechanism does not work for global
reservations. As of Kea 1.5.0, it is generally recommended to not use reservations. As of Kea 1.5.0, it is generally recommended to not use
global reservations for addresses. If you want to use it anyway, global reservations for addresses. If you want to use it anyway,
you have to manually ensure that the reserved addressed are non you have to manually ensure that the reserved addressed are not
Please register or sign in to reply
in the dynamic pools.</para> in the dynamic pools.</para>
</note> </note>
...@@ -4055,11 +4054,11 @@ src/lib/dhcpsrv/cfg_host_operations.cc --> ...@@ -4055,11 +4054,11 @@ src/lib/dhcpsrv/cfg_host_operations.cc -->
enabled.</para> enabled.</para>
<para>This feature can be used to assign certain parameters, such as <para>This feature can be used to assign certain parameters, such as
hostname or some dedicated, host specific options. It can also be used to hostname or other dedicated, host-specific options. It can also be used to
assign addresses. However, global reservations that assign addresses bypass assign addresses. However, global reservations that assign addresses bypass
the whole topology determination provided by DHCP logic implemented in the whole topology determination provided by DHCP logic implemented in
Kea. It is very easy to misuse this feature and get configuration that is Kea. It is very easy to misuse this feature and get configuration that is
inconsistent. To give specific example, imagine a case of global reservation inconsistent. To give a specific example, imagine a global reservation
for address 192.0.2.100 and two subnets 192.0.2.0/24 and 192.0.5.0/24. If for address 192.0.2.100 and two subnets 192.0.2.0/24 and 192.0.5.0/24. If
global reservations are used in both subnets and a device matching global global reservations are used in both subnets and a device matching global
host reservations visits part of the network that is serviced by host reservations visits part of the network that is serviced by
......
...@@ -608,12 +608,10 @@ Dhcpv4SrvTest::configure(const std::string& config, NakedDhcpv4Srv& srv, ...@@ -608,12 +608,10 @@ Dhcpv4SrvTest::configure(const std::string& config, NakedDhcpv4Srv& srv,
try { try {
json = parseJSON(config); json = parseJSON(config);
} catch (const std::exception& ex){ } catch (const std::exception& ex){
// Fatal falure on parsing error
FAIL() << "parsing failure:" FAIL() << "parsing failure:"
<< "config:" << config << std::endl << "config:" << config << std::endl
<< "error: " << ex.what(); << "error: " << ex.what();
// No point in going deeper into the swamp...
return;
} }
ConstElementPtr status; ConstElementPtr status;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment