Commit 27956d95 authored by Tomek Mrugalski's avatar Tomek Mrugalski 🛰
Browse files

[master] Merge branch github47 (typos)

# Conflicts:
#	src/bin/dhcp4/json_config_parser.cc
#	src/bin/dhcp4/tests/fqdn_unittest.cc
#	src/bin/dhcp6/dhcp6_srv.h
#	src/bin/dhcp6/tests/fqdn_unittest.cc
#	src/lib/config/command_mgr.h
#	src/lib/dhcpsrv/alloc_engine.h
#	src/lib/dhcpsrv/parsers/client_class_def_parser.h
#	src/lib/dhcpsrv/parsers/dbaccess_parser.cc
#	src/lib/dhcpsrv/parsers/dhcp_parsers.cc
#	src/lib/dhcpsrv/parsers/dhcp_parsers.h
#	src/lib/dhcpsrv/srv_config.h
#	src/lib/dhcpsrv/tests/client_class_def_parser_unittest.cc
#	src/lib/dhcpsrv/tests/dhcp_parsers_unittest.cc
#	src/lib/eval/eval_context.h
#	src/lib/hooks/callout_manager.cc
#	src/lib/testutils/dhcp_test_lib.sh.in
parents 741a5ffa a6a7ca1c
......@@ -104,7 +104,7 @@ where <command>/path/to/the/kea/socket</command> is the path specified in the
configuration file. Text passed to <command>socat</command>
will be sent to Kea and the responses received from Kea printed to standard output.</para>
<para>It is also easy to open UNIX socket programmatically. An example of
<para>It is also easy to open UNIX socket programatically. An example of
such a simplistic client written in C is available in the Kea Developer's
Guide, chapter Control Channel Overview, section Using Control Channel.</para>
......
......@@ -2960,7 +2960,7 @@ It is merely echoed by the server
</screen>
<para>Static class assignments, as shown above, can be used in conjuction
<para>Static class assignments, as shown above, can be used in conjunction
with classification using expressions.</para>
</section>
......
......@@ -2895,7 +2895,7 @@ should include options from the isc option space:
}
</screen>
<para>Static class assignments, as shown above, can be used in conjuction
<para>Static class assignments, as shown above, can be used in conjunction
with classification using expressions.</para>
</section>
......
......@@ -24,7 +24,7 @@
// routine, the function is provided as the handler object. (The simplest
// way to do this is to have the reentrant function be the operator()
// member for the coroutine object itself.) For example:
//
//
// CORO_YIELD socket->async_read_some(buffer, *this);
//
// The CORO_YIELD keyword updates the current status of the coroutine to
......
......@@ -81,7 +81,7 @@ cql_lease_version_test() {
$keaadmin lease-init cql -u $db_user -p $db_password -n $db_name -d $db_scripts_dir
assert_eq 0 $? "kea-admin lease-init cql failed, expected exit code: %d, actual: %d"
# Verfiy that kea-admin lease-version returns the correct version.
# Verify that kea-admin lease-version returns the correct version.
version=$($keaadmin lease-version cql -u $db_user -p $db_password -n $db_name)
assert_str_eq "1.0" $version "Expected kea-admin to return %s, returned value was %s"
......
......@@ -38,7 +38,7 @@ mysql_lease_init_test() {
# Let's wipe the whole database
mysql_wipe
# Ok, now let's initalize the database
# Ok, now let's initialize the database
${keaadmin} lease-init mysql -u $db_user -p $db_password -n $db_name -d $db_scripts_dir
ERRCODE=$?
......@@ -117,7 +117,7 @@ mysql_host_reservation_init_test() {
# Let's wipe the whole database
mysql_wipe
# Ok, now let's initalize the database
# Ok, now let's initialize the database
${keaadmin} lease-init mysql -u $db_user -p $db_password -n $db_name -d $db_scripts_dir
ERRCODE=$?
......@@ -387,7 +387,7 @@ mysql_lease4_dump_test() {
# Let's wipe the whole database
mysql_wipe
# Ok, now let's initalize the database
# Ok, now let's initialize the database
${keaadmin} lease-init mysql -u $db_user -p $db_password -n $db_name -d $db_scripts_dir
ERRCODE=$?
assert_eq 0 $ERRCODE "could not create database, expected exit code %d, actual %d"
......@@ -447,7 +447,7 @@ mysql_lease6_dump_test() {
# Let's wipe the whole database
mysql_wipe
# Ok, now let's initalize the database
# Ok, now let's initialize the database
${keaadmin} lease-init mysql -u $db_user -p $db_password -n $db_name -d $db_scripts_dir
ERRCODE=$?
assert_eq 0 $ERRCODE "could not create database, expected exit code %d, actual %d"
......
......@@ -86,7 +86,7 @@ pgsql_lease_version_test() {
${keaadmin} lease-init pgsql -u $db_user -p $db_password -n $db_name -d $db_scripts_dir
assert_eq 0 $? "cannot initialize the database, expected exit code: %d, actual: %d"
# Verfiy that kea-admin lease-version returns the correct version
# Verify that kea-admin lease-version returns the correct version
version=$(${keaadmin} lease-version pgsql -u $db_user -p $db_password -n $db_name)
assert_str_eq "3.0" ${version} "Expected kea-admin to return %s, returned value was %s"
......@@ -280,7 +280,7 @@ pgsql_lease4_dump_test() {
# Let's wipe the whole database
pgsql_wipe
# Ok, now let's initalize the database
# Ok, now let's initialize the database
${keaadmin} lease-init pgsql -u $db_user -p $db_password -n $db_name -d $db_scripts_dir
ERRCODE=$?
assert_eq 0 $ERRCODE "could not create database, expected exit code %d, actual %d"
......@@ -375,7 +375,7 @@ pgsql_lease6_dump_test() {
# Let's wipe the whole database
pgsql_wipe
# Ok, now let's initalize the database
# Ok, now let's initialize the database
${keaadmin} lease-init pgsql -u $db_user -p $db_password -n $db_name -d $db_scripts_dir
ERRCODE=$?
assert_eq 0 $ERRCODE "could not create database, status code %d"
......
......@@ -65,7 +65,7 @@ public:
/// @brief Build JSON configuration string for a D2Params element
///
/// Constructs a JSON string for "params" element using replacable
/// Constructs a JSON string for "params" element using replaceable
/// parameters.
///
/// @param ip_address string to insert as ip_address value
......@@ -509,7 +509,7 @@ TEST_F(D2CfgMgrTest, unsupportedTopLevelItems) {
/// -# ip_address cannot be "0.0.0.0"
/// -# ip_address cannot be "::"
/// -# port cannot be 0
/// -# dns_server_timeout cannat be 0
/// -# dns_server_timeout cannot be 0
/// -# ncr_protocol must be valid
/// -# ncr_format must be valid
TEST_F(D2CfgMgrTest, invalidEntry) {
......@@ -940,7 +940,7 @@ TEST_F(ConfigParseTest, validServerList) {
isc::dhcp::ParserPtr parser;
ASSERT_NO_THROW(parser.reset(new DnsServerInfoListParser("test", servers)));
// Verfiy that the list builds and commits without error.
// Verify that the list builds and commits without error.
ASSERT_NO_THROW(parser->build(config_set_));
ASSERT_NO_THROW(parser->commit());
......@@ -1443,7 +1443,7 @@ TEST_F(D2CfgMgrTest, forwardMatch) {
EXPECT_TRUE(cfg_mgr_->matchForward("tmark.org", match));
EXPECT_EQ("tmark.org", match->getName());
// Verify that search is case insensisitive.
// Verify that search is case-insensitive.
EXPECT_TRUE(cfg_mgr_->matchForward("TMARK.ORG", match));
EXPECT_EQ("tmark.org", match->getName());
......
......@@ -149,7 +149,7 @@ TEST_F(D2ControllerTest, launchNormalShutdown) {
time_duration elapsed_time;
runWithConfig(valid_d2_config, 1000, elapsed_time);
// Give a generous margin to accomodate slower test environs.
// Give a generous margin to accommodate slower test environs.
EXPECT_TRUE(elapsed_time.total_milliseconds() >= 800 &&
elapsed_time.total_milliseconds() <= 1300);
}
......@@ -294,7 +294,7 @@ TEST_F(D2ControllerTest, sigintShutdown) {
runWithConfig(valid_d2_config, 1000, elapsed_time);
// Signaled shutdown should make our elapsed time much smaller than
// the maximum run time. Give generous margin to accomodate slow
// the maximum run time. Give generous margin to accommodate slow
// test environs.
EXPECT_TRUE(elapsed_time.total_milliseconds() < 300);
......@@ -311,7 +311,7 @@ TEST_F(D2ControllerTest, sigtermShutdown) {
runWithConfig(valid_d2_config, 1000, elapsed_time);
// Signaled shutdown should make our elapsed time much smaller than
// the maximum run time. Give generous margin to accomodate slow
// the maximum run time. Give generous margin to accommodate slow
// test environs.
EXPECT_TRUE(elapsed_time.total_milliseconds() < 300);
......
......@@ -176,11 +176,11 @@ TEST(D2QueueMgrBasicTest, basicQueue) {
// Verify queue count is correct.
EXPECT_EQ(VALID_MSG_CNT, queue_mgr->getQueueSize());
// Verfiy that peekAt returns the correct entry.
// Verify that peekAt returns the correct entry.
EXPECT_NO_THROW(ncr = queue_mgr->peekAt(1));
EXPECT_TRUE (*(ref_msgs[1]) == *ncr);
// Verfiy that dequeueAt removes the correct entry.
// Verify that dequeueAt removes the correct entry.
// Removing it, this should shift the queued entries forward by one.
EXPECT_NO_THROW(queue_mgr->dequeueAt(1));
EXPECT_NO_THROW(ncr = queue_mgr->peekAt(1));
......
......@@ -282,7 +282,7 @@ TEST_F(D2UpdateMessageTest, fromWireInvalidOpcode) {
};
// The 'true' argument passed to the constructor turns the
// message into the parse mode in which the fromWire function
// can be used to decode the binary mesasage data.
// can be used to decode the binary message data.
D2UpdateMessage msg(D2UpdateMessage::INBOUND);
// When using invalid Opcode, the fromWire function should
// throw NotUpdateMessage exception.
......@@ -306,7 +306,7 @@ TEST_F(D2UpdateMessageTest, fromWireInvalidQRFlag) {
};
// The 'true' argument passed to the constructor turns the
// message into the parse mode in which the fromWire function
// can be used to decode the binary mesasage data.
// can be used to decode the binary message data.
D2UpdateMessage msg(D2UpdateMessage::INBOUND);
// When using invalid QR flag, the fromWire function should
// throw InvalidQRFlag exception.
......@@ -345,7 +345,7 @@ TEST_F(D2UpdateMessageTest, fromWireTooManyZones) {
// The 'true' argument passed to the constructor turns the
// message into the parse mode in which the fromWire function
// can be used to decode the binary mesasage data.
// can be used to decode the binary message data.
D2UpdateMessage msg(D2UpdateMessage::INBOUND);
// When parsing a message with more than one Zone record,
// exception should be thrown.
......@@ -366,7 +366,7 @@ TEST_F(D2UpdateMessageTest, toWire) {
// one Zone. toWire function would fail if Zone is not set.
msg.setZone(Name("example.com"), RRClass::IN());
// Set prerequisities.
// Set prerequisites.
// 'Name Is Not In Use' prerequisite (RFC 2136, section 2.4.5)
RRsetPtr prereq1(new RRset(Name("foo.example.com"), RRClass::NONE(),
......@@ -433,7 +433,7 @@ TEST_F(D2UpdateMessageTest, toWire) {
EXPECT_EQ(1, buf.readUint16());
// PRCOUNT - holds the number of prerequisites. Earlier we have added
// two prerequisites. Thus, expect that this conter is 2.
// two prerequisites. Thus, expect that this counter is 2.
EXPECT_EQ(2, buf.readUint16());
// UPCOUNT - holds the number of RRs in the Update Section. We have
......@@ -484,7 +484,7 @@ TEST_F(D2UpdateMessageTest, toWire) {
// Check the name first. Message renderer is using compression for domain
// names as described in RFC 1035, section 4.1.4. The name in this RR is
// foo.example.com. The name of the zone is example.com and it has occured
// foo.example.com. The name of the zone is example.com and it has occurred
// in this message already at offset 12 (the size of the header is 12).
// Therefore, name of this RR is encoded as 'foo', followed by a pointer
// to offset in this message where the remainder of this name was used.
......@@ -566,7 +566,7 @@ TEST_F(D2UpdateMessageTest, toWireInvalidQRFlag) {
// The 'true' argument passed to the constructor turns the
// message into the parse mode in which the fromWire function
// can be used to decode the binary mesasage data.
// can be used to decode the binary message data.
D2UpdateMessage msg(D2UpdateMessage::INBOUND);
ASSERT_NO_THROW(msg.fromWire(bin_msg, sizeof(bin_msg)));
......
......@@ -219,7 +219,7 @@ public:
dns::Message request(Message::PARSE);
request.fromWire(received_data_buffer);
// If contex is not NULL, then we need to verify the message.
// If context is not NULL, then we need to verify the message.
if (context) {
TSIGError error = context->verify(request.getTSIGRecord(),
receive_buffer_, receive_length);
......@@ -502,7 +502,7 @@ TEST_F(DNSClientTest, runTSIGTest) {
// Neither client nor server will attempt to sign or verify.
runTSIGTest(nokey, nokey);
// Client signs the request, server verfies but doesn't sign.
// Client signs the request, server verifies but doesn't sign.
runTSIGTest(key_one, nokey, false);
// Client and server use the same key to sign and verify.
......
......@@ -24,7 +24,7 @@ using namespace isc::util;
namespace {
/// @brief Test class derived from NameAddTransaction to provide visiblity
/// @brief Test class derived from NameAddTransaction to provide visibility
// to protected methods.
class NameAddStub : public NameAddTransaction {
public:
......@@ -1030,7 +1030,7 @@ TEST_F(NameAddTransactionTest, replacingFwdAddrsHandler_OtherRcode) {
EXPECT_FALSE(name_add->getForwardChangeCompleted());
EXPECT_FALSE(name_add->getReverseChangeCompleted());
// We should have failed the transaction. Verifiy that we transitioned
// We should have failed the transaction. Verify that we transitioned
// correctly.
EXPECT_EQ(NameChangeTransaction::PROCESS_TRANS_FAILED_ST,
name_add->getCurrState());
......
......@@ -25,7 +25,7 @@ using namespace isc::util;
namespace {
/// @brief Test class derived from NameRemoveTransaction to provide visiblity
/// @brief Test class derived from NameRemoveTransaction to provide visibility
// to protected methods.
class NameRemoveStub : public NameRemoveTransaction {
public:
......@@ -969,7 +969,7 @@ TEST_F(NameRemoveTransactionTest, removingFwdRRsHandler_FqdnNotInUse) {
// Run removingFwdRRsHandler again to process the response.
EXPECT_NO_THROW(name_remove->removingFwdRRsHandler());
// Forwad completion flag should be true, reverse should still be false.
// Forward completion flag should be true, reverse should still be false.
EXPECT_TRUE(name_remove->getForwardChangeCompleted());
EXPECT_FALSE(name_remove->getReverseChangeCompleted());
......@@ -1016,7 +1016,7 @@ TEST_F(NameRemoveTransactionTest, removingFwdRRsHandler_OtherRcode) {
EXPECT_FALSE(name_remove->getForwardChangeCompleted());
EXPECT_FALSE(name_remove->getReverseChangeCompleted());
// We should have failed the transaction. Verifiy that we transitioned
// We should have failed the transaction. Verify that we transitioned
// correctly.
EXPECT_EQ(NameChangeTransaction::PROCESS_TRANS_FAILED_ST,
name_remove->getCurrState());
......
......@@ -107,7 +107,7 @@ FauxServer::requestHandler(const boost::system::error_code& error,
try {
request.fromWire(request_buf);
// If contex is not NULL, then we need to verify the message.
// If context is not NULL, then we need to verify the message.
if (context) {
dns::TSIGError error = context->verify(request.getTSIGRecord(),
receive_buffer_,
......
......@@ -36,7 +36,7 @@ public:
enum ResponseMode {
USE_RCODE, // Generate a response with a given RCODE
CORRUPT_RESP, // Generate a corrupt response
INVALID_TSIG // Generate a repsonse with the wrong TSIG key
INVALID_TSIG // Generate a response with the wrong TSIG key
};
// Reference to IOService to use for IO processing.
......
......@@ -66,7 +66,7 @@ public:
/// @brief DNSClient callback
/// Overrides the callback in NameChangeTranscation to allow testing
/// sendUpdate without incorporating exectution of the state model
/// sendUpdate without incorporating execution of the state model
/// into the test.
/// It sets the DNS status update and posts IO_COMPLETED_EVT as does
/// the normal callback.
......@@ -313,7 +313,7 @@ public:
/// @brief Builds and then sends an update request
///
/// This method is used to build and send and update request. It is used
/// in conjuction with FauxServer to test various message response
/// in conjunction with FauxServer to test various message response
/// scenarios.
/// @param name_change Transaction under test
/// @param run_time Maximum time to permit IO processing to run before
......@@ -824,7 +824,7 @@ TEST_F(NameChangeTransactionTest, successfulUpdateTest) {
EXPECT_TRUE(name_change->getForwardChangeCompleted());
}
/// @brief Tests the ability to use startTransaction to initate the state
/// @brief Tests the ability to use startTransaction to initiate the state
/// model execution, and DNSClient callback, operator(), to resume the
/// model with a update failure outcome.
TEST_F(NameChangeTransactionTest, failedUpdateTest) {
......@@ -1043,7 +1043,7 @@ TEST_F(NameChangeTransactionTest, tsigUnsignedResponse) {
FauxServer server(*io_service_, *(name_change->getCurrentServer()));
server.receive (FauxServer::USE_RCODE, dns::Rcode::NOERROR());
// Do the udpate.
// Do the update.
ASSERT_NO_FATAL_FAILURE(doOneExchange(name_change));
// Verify that next event is IO_COMPLETED_EVT and DNS status is
......@@ -1074,7 +1074,7 @@ TEST_F(NameChangeTransactionTest, tsigInvalidResponse) {
FauxServer server(*io_service_, *(name_change->getCurrentServer()));
server.receive (FauxServer::INVALID_TSIG, dns::Rcode::NOERROR());
// Do the udpate.
// Do the update.
ASSERT_NO_FATAL_FAILURE(doOneExchange(name_change));
// Verify that next event is IO_COMPLETED_EVT and DNS status is
......@@ -1124,7 +1124,7 @@ TEST_F(NameChangeTransactionTest, tsigUnexpectedSignedResponse) {
EXPECT_EQ("response.example.com.", zone->getName().toText());
}
/// @brief Tests that a TSIG udpate succeeds when client and server both use
/// @brief Tests that a TSIG update succeeds when client and server both use
/// the right key. Runs the test for all supported algorithms.
TEST_F(NameChangeTransactionTest, tsigAllValid) {
std::vector<std::string>algorithms;
......
......@@ -2072,7 +2072,7 @@ Dhcpv4Srv::setFixedFields(Dhcpv4Exchange& ex) {
response->setSname(reinterpret_cast<const uint8_t*>(sname.c_str()),
sname.size());
}
const string& filename = cl->second->getFilename();
if (!filename.empty()) {
// Converting string to (const uint8_t*, size_t len) format is
......
......@@ -137,7 +137,7 @@ public:
IfaceMgr::instance().openSockets4();
}
/// @brief Desctructor.
/// @brief Destructor.
///
~ClassifyTest() {
}
......
......@@ -2592,7 +2592,7 @@ TEST_F(Dhcp4ParserTest, optionDataBoolean) {
sizeof(expected_option_data));
// Bogus values should not be accepted.
params["data"] = "bugus";
params["data"] = "bogus";
testInvalidOptionParam(params);
params["data"] = "2";
......@@ -3391,7 +3391,7 @@ TEST_F(Dhcp4ParserTest, selectedInterfacesAndAddresses) {
TEST_F(Dhcp4ParserTest, d2ClientConfig) {
ConstElementPtr status;
// Verify that the D2 configuraiton can be fetched and is set to disabled.
// Verify that the D2 configuration can be fetched and is set to disabled.
D2ClientConfigPtr d2_client_config = CfgMgr::instance().getD2ClientConfig();
EXPECT_FALSE(d2_client_config->getEnableUpdates());
......@@ -3495,7 +3495,7 @@ TEST_F(Dhcp4ParserTest, invalidD2ClientConfig) {
checkResult(status, 1);
EXPECT_TRUE(errorContainsPosition(status, "<string>"));
// Verify that the D2 configuraiton can be fetched and is set to disabled.
// Verify that the D2 configuration can be fetched and is set to disabled.
D2ClientConfigPtr d2_client_config = CfgMgr::instance().getD2ClientConfig();
EXPECT_FALSE(d2_client_config->getEnableUpdates());
......@@ -4345,7 +4345,7 @@ TEST_F(Dhcp4ParserTest, 4o6subnetBogus) {
" \"4o6-subnet\": \"2001:db8:bogus/45\" } ],"
"\"valid-lifetime\": 4000 }",
// Bogus configuration 3: incorrect prefix lenght
// Bogus configuration 3: incorrect prefix length
"{ " + genIfaceConfig() + "," +
"\"rebind-timer\": 2000, "
"\"renew-timer\": 1000, "
......
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