From: Marcin Siodelski <marcin@isc.org>
Date: Wed, 22 Feb 2017 10:32:03 +0000 (+0100)
Subject: [5107] Renamed CtrlAgent to Control-agent.
X-Git-Tag: trac5137_base~8^2~6
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3834c0413bb3936160f40da4e9a7e9a799e0c838;p=thirdparty%2Fkea.git

[5107] Renamed CtrlAgent to Control-agent.
---

diff --git a/src/bin/agent/ctrl_agent_controller.cc b/src/bin/agent/ctrl_agent_controller.cc
index f3f1444780..281fae856b 100644
--- a/src/bin/agent/ctrl_agent_controller.cc
+++ b/src/bin/agent/ctrl_agent_controller.cc
@@ -16,7 +16,7 @@ namespace agent {
 
 /// @brief Defines the application name, this is passed into base class
 /// it may be used to locate configuration data and appears in log statement.
-const char* CtrlAgentController::agent_app_name_ = "CtrlAgent";
+const char* CtrlAgentController::agent_app_name_ = "Control-agent";
 
 /// @brief Defines the executable name. This is passed into the base class
 const char* CtrlAgentController::agent_bin_name_ = "kea-ctrl-agent";
diff --git a/src/bin/agent/tests/ctrl_agent_process_tests.sh.in b/src/bin/agent/tests/ctrl_agent_process_tests.sh.in
index 3fcfcddbb5..fdf57d0b20 100644
--- a/src/bin/agent/tests/ctrl_agent_process_tests.sh.in
+++ b/src/bin/agent/tests/ctrl_agent_process_tests.sh.in
@@ -14,9 +14,8 @@ EXPECTED_VERSION="@PACKAGE_VERSION@"
 # Control Agent configuration to be stored in the configuration file.
 # todo: use actual configuration once we support it.
 CONFIG="{
-    \"CtrlAgent\":
+    \"Control-agent\":
     {
-        \"dummy-param\": 123
     },
     \"Logging\":
     {