Commit 393e456b authored by Tomek Mrugalski's avatar Tomek Mrugalski 🛰
Browse files

[3417] Bind10 => Kea in many .cc/.h files

parent 3fe98e57
......@@ -177,11 +177,11 @@ D2Controller::establishSession() {
LOG_DEBUG(dctl_logger, DBGLVL_START_SHUT, DCTL_CCSESSION_STARTING)
.arg(getAppName()).arg(getSpecFileName());
// Create the BIND10 command control session with the our IOService.
// Create the Bundy command control session with the our IOService.
cc_session_ = SessionPtr(new isc::cc::Session(
getIOService()->get_io_service()));
// Create the BIND10 config session with the stub configuration handler.
// Create the Bundy config session with the stub configuration handler.
// This handler is internally invoked by the constructor and on success
// the constructor updates the current session with the configuration that
// had been committed in the previous session. If we do not install
......@@ -219,12 +219,12 @@ void D2Controller::disconnectSession() {
LOG_DEBUG(dctl_logger, DBGLVL_START_SHUT, DCTL_CCSESSION_ENDING)
.arg(getAppName());
// Destroy the BIND10 config session.
// Destroy the Bundy config session.
if (config_session_) {
config_session_.reset();
}
// Destroy the BIND10 command and control session.
// Destroy the Bundy command and control session.
if (cc_session_) {
cc_session_->disconnect();
cc_session_.reset();
......
......@@ -98,7 +98,7 @@ public:
/// in their main function. Such logger uses environmental variables to
/// control severity, verbosity etc. Reinitialization of logger by this
/// function would replace unit tests specific logger configuration with
/// this suitable for D2 running as a bind10 module.
/// this suitable for D2 running as a Bundy module.
///
/// @param argc is the number of command line arguments supplied
/// @param argv is the array of string (char *) command line arguments
......
......@@ -60,7 +60,7 @@ namespace d2 {
/// that the application can carry out DNS update exchanges with it. Servers
/// are represented by the class, DnsServerInfo.
///
/// The configuration specification for use with BIND10 is detailed in the file
/// The configuration specification for use with Kea is detailed in the file
/// dhcp-ddns.spec.
///
/// The parsing class hierarchy reflects this same scheme. Working top down:
......
......@@ -54,7 +54,7 @@ events is called. This only happens during initial startup.
A debug message indicating that the controller has received an
updated configuration from the Kea configuration system.
% DCTL_DISCONNECT_FAIL %1 controller failed to end session with Kea: %2
% DCTL_DISCONNECT_FAIL %1 controller failed to end session with Bundy: %2
This message indicates that while shutting down, the DHCP-DDNS controller
encountered an error terminating communication with the Kea configuration
system. The service will still exit. While theoretically possible,
......
......@@ -209,7 +209,7 @@ D2Process::configure(isc::data::ConstElementPtr config_set) {
if (rcode) {
// Non-zero means we got an invalid configuration, take no further
// action. In integrated mode, this will send a failed response back
// to BIND10.
// to the configuration backend.
reconf_queue_flag_ = false;
return (answer);
}
......
......@@ -25,7 +25,7 @@ using namespace isc::d2;
using namespace std;
/// This file contains entry point (main() function) for standard DHCP-DDNS
/// process, kea-dhcp-ddns, component for BIND10 framework. It fetches
/// process, kea-dhcp-ddns, component of Kea software suite. It fetches
/// the D2Controller singleton instance and invokes its launch method.
/// The exit value of the program will be EXIT_SUCCESS if there were no
/// errors, EXIT_FAILURE otherwise.
......
......@@ -176,8 +176,8 @@ TEST_F(BundyD2ControllerTest, executeCommandTests) {
/// @brief Tests launch with a session establishment failure.
/// This test launches with a valid command line for integrated mode and no.
/// Attempting to connect to BIND10 should fail, even if BIND10 is running
/// UNLESS the test is run as root. Launch should throw SessionStartError.
/// Attempting to connect to Bundy should fail, even if Bundy is running
/// UNLESS the test is run as root. Launch should throw SessionStartError.
TEST_F(BundyD2ControllerTest, launchSessionFailure) {
// Command line to run integrated
char* argv[] = { (char*)"progName" };
......
......@@ -184,7 +184,7 @@ public:
};
/// @brief Tests that the spec file is valid.
/// Verifies that the BIND10 DHCP-DDNS configuration specification file
/// Verifies that the DHCP-DDNS configuration specification file
// is valid.
TEST(D2SpecTest, basicSpec) {
ASSERT_NO_THROW(isc::config::
......
......@@ -192,8 +192,8 @@ public:
/// without polluting production derivations (e.g. D2Process). It uses
/// DStubProcess as its application process class. It is a full enough
/// implementation to support running both stand alone and integrated.
/// Obviously BIND10 connectivity is not available under unit tests, so
/// testing here is limited to "failures" to communicate with BIND10.
/// Obviously Bundy connectivity is not available under unit tests, so
/// testing here is limited to "failures" to communicate with Bundy.
class DStubController : public DControllerBase {
public:
/// @brief Static singleton instance method. This method returns the
......
......@@ -27,7 +27,7 @@ using namespace isc::dhcp;
using namespace std;
/// This file contains entry point (main() function) for standard DHCPv4 server
/// component for BIND10 framework. It parses command-line arguments and
/// component for Kea software suite. It parses command-line arguments and
/// instantiates ControlledDhcpv4Srv class that is responsible for establishing
/// connection with msgq (receiving commands and configuration) and also
/// creating Dhcpv4 server object as well.
......
......@@ -63,7 +63,7 @@ appendDigit(const char* name) {
// Framework functions
int
version() {
return (BIND10_HOOKS_VERSION);
return (KEA_HOOKS_VERSION);
}
int
......
......@@ -63,8 +63,7 @@ std::string specfile(const std::string& name) {
}
/// @brief Tests that the spec file is valid.
/// Verifies that the BIND10 DHCP-DDNS configuration specification file
// is valid.
/// Verifies that the Kea DHCPv4 configuration specification file is valid.
TEST(Dhcp4SpecTest, basicSpec) {
(isc::config::moduleSpecFromFile(specfile("dhcp4.spec")));
ASSERT_NO_THROW(isc::config::moduleSpecFromFile(specfile("dhcp4.spec")));
......
......@@ -251,7 +251,7 @@ TEST_F(JSONFileBackendTest, configBroken) {
///
/// @todo: Unfortunately, we have this test disabled, because all loaded
/// configs use memfile, which attempts to create lease file in
/// /usr/local/var/bind10/kea-leases4.csv. We have couple options here:
/// /usr/local/var/kea/kea-leases4.csv. We have couple options here:
/// a) disable persistence in example configs - a very bad thing to do
/// as users will forget to reenable it and then will be surprised when their
/// leases disappear
......
......@@ -28,7 +28,7 @@ using namespace isc::dhcp;
using namespace std;
/// This file contains entry point (main() function) for standard DHCPv6 server
/// component for BIND10 framework. It parses command-line arguments and
/// component for Kea software suite. It parses command-line arguments and
/// instantiates ControlledDhcpv6Srv class that is responsible for establishing
/// connection with msgq (receiving commands and configuration) and also
/// creating Dhcpv6 server object as well.
......@@ -118,16 +118,16 @@ main(int argc, char* argv[]) {
ControlledDhcpv6Srv server(port_number);
try {
// Initialize the server, i.e. establish control session
// if BIND10 backend is used or read a configuration file
// Initialize the server, e.g. establish control session
// if Bundy backend is used or read a configuration file
// if Kea backend is used.
server.init(config_file);
} catch (const std::exception& ex) {
LOG_ERROR(dhcp6_logger, DHCP6_INIT_FAIL).arg(ex.what());
// We should not continue if were told to configure (either read
// config file or establish BIND10 control session).
// We should not continue, just flush whatever has been logged
// and exit.
isc::log::LoggerManager log_manager;
log_manager.process();
......
......@@ -63,7 +63,7 @@ appendDigit(const char* name) {
// Framework functions
int
version() {
return (BIND10_HOOKS_VERSION);
return (KEA_HOOKS_VERSION);
}
int
......
......@@ -19,7 +19,7 @@ extern "C" {
/// @brief Version function required by Hooks API for compatibility checks.
int version() {
return (BIND10_HOOKS_VERSION);
return (KEA_HOOKS_VERSION);
}
}
......@@ -80,7 +80,7 @@ const int server_port = 5553;
const char* const server_port_str = "5553";
//message client send to udp server, which isn't dns package
//just for simple testing
const char* const query_message = "BIND10 is awesome";
const char* const query_message = "Kea is awesome";
// \brief provide capacity to derived class the ability
// to stop DNSServer at certain point
......@@ -649,7 +649,7 @@ TYPED_TEST(DNSServerTest, TCPNoTimeout) {
this->tcp_client_->setSendDataDelay(1);
this->testStopServerByStopper(*this->tcp_server_, this->tcp_client_,
this->tcp_client_);
EXPECT_EQ("BIND10 is awesome", this->tcp_client_->getReceivedData());
EXPECT_EQ("Kea is awesome", this->tcp_client_->getReceivedData());
EXPECT_TRUE(this->serverStopSucceed());
}
......
......@@ -16,8 +16,8 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
#ifndef BIND10_COMMON_DEFS_H
#define BIND10_COMMON_DEFS_H
#ifndef KEA_COMMON_DEFS_H
#define KEA_COMMON_DEFS_H
// \file proto_defs.h
// \brief Common shared constants
......
......@@ -309,10 +309,10 @@ public:
void
Session::establish(const char* socket_file) {
if (socket_file == NULL) {
socket_file = getenv("BIND10_MSGQ_SOCKET_FILE");
socket_file = getenv("BUNDY_MSGQ_SOCKET_FILE");
}
if (socket_file == NULL) {
socket_file = BIND10_MSGQ_SOCKET_FILE;
socket_file = BUNDY_MSGQ_SOCKET_FILE;
}
impl_->establish(*socket_file);
......
#define BIND10_MSGQ_SOCKET_FILE "@@LOCALSTATEDIR@@/@PACKAGE@/msgq_socket"
#define BUNDY_MSGQ_SOCKET_FILE "@@LOCALSTATEDIR@@/@PACKAGE@/msgq_socket"
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