mir/kea
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/kea synced 2025-08-30 05:27:55 +00:00
Code Issues Releases Wiki Activity

[3796] ccsession.cc|h renamed to command_interpreter.cc|h

Browse Source
This commit is contained in:
Tomek Mrugalski 2015-05-20 16:14:41 +02:00
parent ca03350e6f
commit aa10ecc86f
38 changed files with 45 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/bin/d2/bundy_d2_controller.h
View File

@ -18,7 +18,7 @@
#include <asiolink/io_service.h> #include <asiolink/io_service.h>
#include <cc/data.h> #include <cc/data.h>
#include <cc/session.h> #include <cc/session.h>
#include <config/ccsession.h> #include <config/command_interpreter.h>
#include <d2/d2_log.h> #include <d2/d2_log.h>
#include <d2/d_controller.h> #include <d2/d_controller.h>
#include <d2/d_process.h> #include <d2/d_process.h>

2
src/bin/d2/d2_process.cc
View File

@ -14,7 +14,7 @@
#include <config.h> #include <config.h>
#include <config/ccsession.h> #include <config/command_interpreter.h>
#include <d2/d2_log.h> #include <d2/d2_log.h>
#include <d2/d2_cfg_mgr.h> #include <d2/d2_cfg_mgr.h>
#include <d2/d2_process.h> #include <d2/d2_process.h>

2
src/bin/d2/d_cfg_mgr.cc
View File

@ -14,7 +14,7 @@
#include <config.h> #include <config.h>
#include <config/ccsession.h> #include <config/command_interpreter.h>
#include <d2/d2_log.h> #include <d2/d2_log.h>
#include <dhcp/libdhcp++.h> #include <dhcp/libdhcp++.h>
#include <d2/d_cfg_mgr.h> #include <d2/d_cfg_mgr.h>

2
src/bin/d2/d_controller.cc
View File

@ -14,7 +14,7 @@
#include <config.h> #include <config.h>
#include <d2/d2_log.h> #include <d2/d2_log.h>
#include <config/ccsession.h> #include <config/command_interpreter.h>
#include <d2/d_controller.h> #include <d2/d_controller.h>
#include <exceptions/exceptions.h> #include <exceptions/exceptions.h>
#include <log/logger_support.h> #include <log/logger_support.h>

2
src/bin/d2/tests/bundy_d2_controller_unittests.cc
View File

@ -14,7 +14,7 @@
#include <config.h> #include <config.h>
#include <config/ccsession.h> #include <config/command_interpreter.h>
#include <d_test_stubs.h> #include <d_test_stubs.h>
#include <d2/bundy_d2_controller.h> #include <d2/bundy_d2_controller.h>
#include <d2/spec_config.h> #include <d2/spec_config.h>

2
src/bin/d2/tests/d2_controller_unittests.cc
View File

@ -14,7 +14,7 @@
#include <config.h> #include <config.h>
#include <config/ccsession.h> #include <config/command_interpreter.h>
#include <d_test_stubs.h> #include <d_test_stubs.h>
#include <d2/d2_controller.h> #include <d2/d2_controller.h>
#include <d2/d2_process.h> #include <d2/d2_process.h>

2
src/bin/d2/tests/d2_process_unittests.cc
View File

@ -15,7 +15,7 @@
#include <config.h> #include <config.h>
#include <asiolink/io_service.h> #include <asiolink/io_service.h>
#include <config/ccsession.h> #include <config/command_interpreter.h>
#include <d2/d2_process.h> #include <d2/d2_process.h>
#include <dhcp_ddns/ncr_io.h> #include <dhcp_ddns/ncr_io.h>
#include <d_test_stubs.h> #include <d_test_stubs.h>

2
src/bin/d2/tests/d_cfg_mgr_unittests.cc
View File

@ -14,7 +14,7 @@
#include <config.h> #include <config.h>
#include <config/ccsession.h> #include <config/command_interpreter.h>
#include <config/module_spec.h> #include <config/module_spec.h>
#include <dhcpsrv/parsers/dhcp_parsers.h> #include <dhcpsrv/parsers/dhcp_parsers.h>
#include <d2/d_cfg_mgr.h> #include <d2/d_cfg_mgr.h>

2
src/bin/d2/tests/d_controller_unittests.cc
View File

@ -14,7 +14,7 @@
#include <config.h> #include <config.h>
#include <config/ccsession.h> #include <config/command_interpreter.h>
#include <d_test_stubs.h> #include <d_test_stubs.h>
#include <d2/spec_config.h> #include <d2/spec_config.h>

2
src/bin/d2/tests/d_test_stubs.h
View File

@ -18,7 +18,7 @@
#include <asiolink/io_service.h> #include <asiolink/io_service.h>
#include <cc/data.h> #include <cc/data.h>
#include <config/ccsession.h> #include <config/command_interpreter.h>
#include <d2/d_controller.h> #include <d2/d_controller.h>
#include <d2/d_cfg_mgr.h> #include <d2/d_cfg_mgr.h>

2
src/bin/dhcp4/bundy_controller.cc
View File

@ -17,7 +17,7 @@
#include <asiolink/asiolink.h> #include <asiolink/asiolink.h>
#include <cc/data.h> #include <cc/data.h>
#include <cc/session.h> #include <cc/session.h>
#include <config/ccsession.h> #include <config/command_interpreter.h>
#include <dhcp/iface_mgr.h> #include <dhcp/iface_mgr.h>
#include <dhcp4/json_config_parser.h> #include <dhcp4/json_config_parser.h>
#include <dhcp4/ctrl_dhcp4_srv.h> #include <dhcp4/ctrl_dhcp4_srv.h>

2
src/bin/dhcp4/ctrl_dhcp4_srv.h
View File

@ -17,7 +17,7 @@
#include <asiolink/asiolink.h> #include <asiolink/asiolink.h>
#include <cc/data.h> #include <cc/data.h>
#include <config/ccsession.h> #include <config/command_interpreter.h>
#include <dhcp4/dhcp4_srv.h> #include <dhcp4/dhcp4_srv.h>
namespace isc { namespace isc {

2
src/bin/dhcp4/json_config_parser.cc
View File

@ -14,7 +14,7 @@
#include <config.h> #include <config.h>
#include <config/ccsession.h> #include <config/command_interpreter.h>
#include <dhcp4/dhcp4_log.h> #include <dhcp4/dhcp4_log.h>
#include <dhcp/libdhcp++.h> #include <dhcp/libdhcp++.h>
#include <dhcp/option_definition.h> #include <dhcp/option_definition.h>

2
src/bin/dhcp4/tests/config_parser_unittest.cc
View File

@ -17,7 +17,7 @@
#include <arpa/inet.h> #include <arpa/inet.h>
#include <gtest/gtest.h> #include <gtest/gtest.h>
#include <config/ccsession.h> #include <config/command_interpreter.h>
#include <dhcp4/dhcp4_srv.h> #include <dhcp4/dhcp4_srv.h>
#include <dhcp4/json_config_parser.h> #include <dhcp4/json_config_parser.h>
#include <dhcp/option4_addrlst.h> #include <dhcp/option4_addrlst.h>

2
src/bin/dhcp4/tests/ctrl_dhcp4_srv_unittest.cc
View File

@ -14,7 +14,7 @@
#include <config.h> #include <config.h>
#include <config/ccsession.h> #include <config/command_interpreter.h>
#include <dhcp/dhcp4.h> #include <dhcp/dhcp4.h>
#include <dhcp4/ctrl_dhcp4_srv.h> #include <dhcp4/ctrl_dhcp4_srv.h>
#include <hooks/hooks_manager.h> #include <hooks/hooks_manager.h>

2
src/bin/dhcp4/tests/d2_unittest.h
View File

@ -18,7 +18,7 @@
#define D2_UNITTEST_H #define D2_UNITTEST_H
#include <dhcp4/dhcp4_srv.h> #include <dhcp4/dhcp4_srv.h>
#include <config/ccsession.h> #include <config/command_interpreter.h>
#include <gtest/gtest.h> #include <gtest/gtest.h>

3
src/bin/dhcp4/tests/dhcp4_srv_unittest.cc
View File

@ -16,7 +16,7 @@
#include <sstream> #include <sstream>
#include <asiolink/io_address.h> #include <asiolink/io_address.h>
#include <config/ccsession.h> #include <config/command_interpreter.h>
#include <dhcp4/tests/dhcp4_test_utils.h> #include <dhcp4/tests/dhcp4_test_utils.h>
#include <dhcp/tests/pkt_captures.h> #include <dhcp/tests/pkt_captures.h>
#include <dhcp/dhcp4.h> #include <dhcp/dhcp4.h>
@ -42,7 +42,6 @@
#include <gtest/gtest.h> #include <gtest/gtest.h>
#include <hooks/server_hooks.h> #include <hooks/server_hooks.h>
#include <hooks/hooks_manager.h> #include <hooks/hooks_manager.h>
#include <config/ccsession.h>
#include <boost/scoped_ptr.hpp> #include <boost/scoped_ptr.hpp>

2
src/bin/dhcp4/tests/dhcp4_test_utils.cc
View File

@ -16,7 +16,7 @@
#include <asiolink/io_address.h> #include <asiolink/io_address.h>
#include <cc/data.h> #include <cc/data.h>
#include <config/ccsession.h> #include <config/command_interpreter.h>
#include <dhcp4/json_config_parser.h> #include <dhcp4/json_config_parser.h>
#include <dhcp4/tests/dhcp4_test_utils.h> #include <dhcp4/tests/dhcp4_test_utils.h>
#include <dhcp/option4_addrlst.h> #include <dhcp/option4_addrlst.h>

2
src/bin/dhcp4/tests/dhcp4_test_utils.h
View File

@ -30,7 +30,7 @@
#include <dhcpsrv/lease_mgr_factory.h> #include <dhcpsrv/lease_mgr_factory.h>
#include <dhcp4/dhcp4_srv.h> #include <dhcp4/dhcp4_srv.h>
#include <asiolink/io_address.h> #include <asiolink/io_address.h>
#include <config/ccsession.h> #include <config/command_interpreter.h>
#include <list> #include <list>
#include <boost/shared_ptr.hpp> #include <boost/shared_ptr.hpp>

2
src/bin/dhcp4/tests/kea_controller_unittest.cc
View File

@ -14,7 +14,7 @@
#include <config.h> #include <config.h>
#include <config/ccsession.h> #include <config/command_interpreter.h>
#include <dhcp/dhcp4.h> #include <dhcp/dhcp4.h>
#include <dhcp4/ctrl_dhcp4_srv.h> #include <dhcp4/ctrl_dhcp4_srv.h>
#include <dhcpsrv/cfgmgr.h> #include <dhcpsrv/cfgmgr.h>

2
src/bin/dhcp6/bundy_controller.cc
View File

@ -17,7 +17,7 @@
#include <asiolink/asiolink.h> #include <asiolink/asiolink.h>
#include <cc/data.h> #include <cc/data.h>
#include <cc/session.h> #include <cc/session.h>
#include <config/ccsession.h> #include <config/command_interpreter.h>
#include <dhcp/iface_mgr.h> #include <dhcp/iface_mgr.h>
#include <dhcpsrv/dhcp_config_parser.h> #include <dhcpsrv/dhcp_config_parser.h>
#include <dhcpsrv/cfgmgr.h> #include <dhcpsrv/cfgmgr.h>

2
src/bin/dhcp6/ctrl_dhcp6_srv.h
View File

@ -17,7 +17,7 @@
#include <asiolink/asiolink.h> #include <asiolink/asiolink.h>
#include <cc/data.h> #include <cc/data.h>
#include <config/ccsession.h> #include <config/command_interpreter.h>
#include <dhcp6/dhcp6_srv.h> #include <dhcp6/dhcp6_srv.h>
namespace isc { namespace isc {

2
src/bin/dhcp6/json_config_parser.cc
View File

@ -16,7 +16,7 @@
#include <asiolink/io_address.h> #include <asiolink/io_address.h>
#include <cc/data.h> #include <cc/data.h>
#include <config/ccsession.h> #include <config/command_interpreter.h>
#include <dhcp/libdhcp++.h> #include <dhcp/libdhcp++.h>
#include <dhcp6/json_config_parser.h> #include <dhcp6/json_config_parser.h>
#include <dhcp6/dhcp6_log.h> #include <dhcp6/dhcp6_log.h>

2
src/bin/dhcp6/tests/config_parser_unittest.cc
View File

@ -14,7 +14,7 @@
#include <config.h> #include <config.h>
#include <config/ccsession.h> #include <config/command_interpreter.h>
#include <dhcp/libdhcp++.h> #include <dhcp/libdhcp++.h>
#include <dhcp/option6_ia.h> #include <dhcp/option6_ia.h>
#include <dhcp/iface_mgr.h> #include <dhcp/iface_mgr.h>

2
src/bin/dhcp6/tests/ctrl_dhcp6_srv_unittest.cc
View File

@ -14,7 +14,7 @@
#include <config.h> #include <config.h>
#include <config/ccsession.h> #include <config/command_interpreter.h>
#include <dhcpsrv/cfgmgr.h> #include <dhcpsrv/cfgmgr.h>
#include <dhcp6/ctrl_dhcp6_srv.h> #include <dhcp6/ctrl_dhcp6_srv.h>
#include <hooks/hooks_manager.h> #include <hooks/hooks_manager.h>

2
src/bin/dhcp6/tests/d2_unittest.h
View File

@ -18,7 +18,7 @@
#define D2_UNITTEST_H #define D2_UNITTEST_H
#include <dhcp6/dhcp6_srv.h> #include <dhcp6/dhcp6_srv.h>
#include <config/ccsession.h> #include <config/command_interpreter.h>
#include <gtest/gtest.h> #include <gtest/gtest.h>

2
src/bin/dhcp6/tests/dhcp6_srv_unittest.cc
View File

@ -42,7 +42,7 @@
#include <dhcp6/tests/dhcp6_test_utils.h> #include <dhcp6/tests/dhcp6_test_utils.h>
#include <dhcp6/tests/dhcp6_client.h> #include <dhcp6/tests/dhcp6_client.h>
#include <dhcp/tests/pkt_captures.h> #include <dhcp/tests/pkt_captures.h>
#include <config/ccsession.h> #include <config/command_interpreter.h>
#include <boost/pointer_cast.hpp> #include <boost/pointer_cast.hpp>
#include <boost/scoped_ptr.hpp> #include <boost/scoped_ptr.hpp>
#include <gtest/gtest.h> #include <gtest/gtest.h>

2
src/bin/dhcp6/tests/dhcp6_test_utils.cc
View File

@ -16,7 +16,7 @@
#include <gtest/gtest.h> #include <gtest/gtest.h>
#include <dhcp6/tests/dhcp6_test_utils.h> #include <dhcp6/tests/dhcp6_test_utils.h>
#include <dhcp6/json_config_parser.h> #include <dhcp6/json_config_parser.h>
#include <config/ccsession.h> #include <config/command_interpreter.h>
#include <string.h> #include <string.h>
using namespace isc::data; using namespace isc::data;

2
src/bin/dhcp6/tests/hooks_unittest.cc
View File

@ -29,7 +29,7 @@
#include <dhcp6/tests/dhcp6_test_utils.h> #include <dhcp6/tests/dhcp6_test_utils.h>
#include <dhcp/tests/pkt_captures.h> #include <dhcp/tests/pkt_captures.h>
#include <config/ccsession.h> #include <config/command_interpreter.h>
#include <boost/scoped_ptr.hpp> #include <boost/scoped_ptr.hpp>
#include <gtest/gtest.h> #include <gtest/gtest.h>
#include <unistd.h> #include <unistd.h>

2
src/bin/dhcp6/tests/kea_controller_unittest.cc
View File

@ -14,7 +14,7 @@
#include <config.h> #include <config.h>
#include <config/ccsession.h> #include <config/command_interpreter.h>
#include <dhcp/dhcp6.h> #include <dhcp/dhcp6.h>
#include <dhcp6/ctrl_dhcp6_srv.h> #include <dhcp6/ctrl_dhcp6_srv.h>
#include <dhcpsrv/cfgmgr.h> #include <dhcpsrv/cfgmgr.h>

2
src/lib/config/Makefile.am
View File

@ -17,7 +17,7 @@ BUILT_SOURCES = config_messages.h config_messages.cc
lib_LTLIBRARIES = libkea-cfgclient.la lib_LTLIBRARIES = libkea-cfgclient.la
libkea_cfgclient_la_SOURCES = config_data.h config_data.cc libkea_cfgclient_la_SOURCES = config_data.h config_data.cc
libkea_cfgclient_la_SOURCES += module_spec.h module_spec.cc libkea_cfgclient_la_SOURCES += module_spec.h module_spec.cc
libkea_cfgclient_la_SOURCES += ccsession.cc ccsession.h libkea_cfgclient_la_SOURCES += command_interpreter.cc command_interpreter.h
libkea_cfgclient_la_SOURCES += config_log.h config_log.cc libkea_cfgclient_la_SOURCES += config_log.h config_log.cc
libkea_cfgclient_la_LIBADD = $(top_builddir)/src/lib/cc/libkea-cc.la libkea_cfgclient_la_LIBADD = $(top_builddir)/src/lib/cc/libkea-cc.la

5
src/lib/config/ccsession.cc → src/lib/config/command_interpreter.cc
View File

@ -36,7 +36,7 @@
#include <exceptions/exceptions.h> #include <exceptions/exceptions.h>
#include <config/config_log.h> #include <config/config_log.h>
#include <config/ccsession.h> #include <config/command_interpreter.h>
#include <log/logger_support.h> #include <log/logger_support.h>
#include <log/logger_specification.h> #include <log/logger_specification.h>
@ -167,6 +167,9 @@ parseCommand(ConstElementPtr& arg, ConstElementPtr command) {
return (cmd->stringValue()); return (cmd->stringValue());
} }
/// @todo: The code below should be reviewed whether it's still in use. If it is,
/// it should be moved to a separate file.
namespace { namespace {
// Temporary workaround functions for missing functionality in // Temporary workaround functions for missing functionality in
// getValue() (main problem described in ticket #993) // getValue() (main problem described in ticket #993)

0
src/lib/config/ccsession.h → src/lib/config/command_interpreter.h
View File

3
src/lib/config/tests/Makefile.am
View File

@ -17,7 +17,8 @@ TESTS_ENVIRONMENT = \
TESTS = TESTS =
if HAVE_GTEST if HAVE_GTEST
TESTS += run_unittests TESTS += run_unittests
run_unittests_SOURCES = ccsession_unittests.cc module_spec_unittests.cc config_data_unittests.cc run_unittests.cc run_unittests_SOURCES = command_interpreter_unittests.cc module_spec_unittests.cc
run_unittests_SOURCES += config_data_unittests.cc run_unittests.cc
run_unittests_CPPFLAGS = $(AM_CPPFLAGS) $(GTEST_INCLUDES) run_unittests_CPPFLAGS = $(AM_CPPFLAGS) $(GTEST_INCLUDES)
run_unittests_LDFLAGS = $(AM_LDFLAGS) $(GTEST_LDFLAGS) run_unittests_LDFLAGS = $(AM_LDFLAGS) $(GTEST_LDFLAGS)

19
src/lib/config/tests/ccsession_unittests.cc → src/lib/config/tests/command_interpreter_unittests.cc
View File

@ -15,7 +15,7 @@
#include <config.h> #include <config.h>
#include <gtest/gtest.h> #include <gtest/gtest.h>
#include <config/ccsession.h> #include <config/command_interpreter.h>
#include <config/tests/data_def_unittests_config.h> #include <config/tests/data_def_unittests_config.h>
#include <log/logger_name.h> #include <log/logger_name.h>
#include <boost/scoped_ptr.hpp> #include <boost/scoped_ptr.hpp>
@ -37,16 +37,7 @@ el(const std::string& str) {
return (Element::fromJSON(str)); return (Element::fromJSON(str));
} }
class CCSessionTest : public ::testing::Test { TEST(CommandInterpreterTest, createAnswer) {
protected:
CCSessionTest()
{
}
~CCSessionTest() {
}
};
TEST_F(CCSessionTest, createAnswer) {
ConstElementPtr answer; ConstElementPtr answer;
answer = createAnswer(); answer = createAnswer();
EXPECT_EQ("{ \"result\": 0 }", answer->str()); EXPECT_EQ("{ \"result\": 0 }", answer->str());
@ -62,7 +53,7 @@ TEST_F(CCSessionTest, createAnswer) {
answer->str()); answer->str());
} }
TEST_F(CCSessionTest, parseAnswer) { TEST(CommandInterpreterTest, parseAnswer) {
ConstElementPtr answer; ConstElementPtr answer;
ConstElementPtr arg; ConstElementPtr arg;
int rcode; int rcode;
@ -92,7 +83,7 @@ TEST_F(CCSessionTest, parseAnswer) {
EXPECT_EQ("[ \"just\", \"some\", \"data\" ]", arg->str()); EXPECT_EQ("[ \"just\", \"some\", \"data\" ]", arg->str());
} }
TEST_F(CCSessionTest, createCommand) { TEST(CommandInterpreterTest, createCommand) {
ConstElementPtr command; ConstElementPtr command;
ConstElementPtr arg; ConstElementPtr arg;
@ -115,7 +106,7 @@ TEST_F(CCSessionTest, createCommand) {
command->str()); command->str());
} }
TEST_F(CCSessionTest, parseCommand) { TEST(CommandInterpreterTest, parseCommand) {
ConstElementPtr arg; ConstElementPtr arg;
std::string cmd; std::string cmd;

2
src/lib/dhcpsrv/tests/dbaccess_parser_unittest.cc
View File

@ -14,7 +14,7 @@
#include <config.h> #include <config.h>
#include <config/ccsession.h> #include <config/command_interpreter.h>
#include <dhcpsrv/lease_mgr_factory.h> #include <dhcpsrv/lease_mgr_factory.h>
#include <dhcpsrv/parsers/dbaccess_parser.h> #include <dhcpsrv/parsers/dbaccess_parser.h>
#include <log/logger_support.h> #include <log/logger_support.h>

2
src/lib/dhcpsrv/tests/dhcp_parsers_unittest.cc
View File

@ -13,7 +13,7 @@
// PERFORMANCE OF THIS SOFTWARE. // PERFORMANCE OF THIS SOFTWARE.
#include <config.h> #include <config.h>
#include <config/ccsession.h> #include <config/command_interpreter.h>
#include <cc/data.h> #include <cc/data.h>
#include <dhcp/option.h> #include <dhcp/option.h>
#include <dhcp/option_custom.h> #include <dhcp/option_custom.h>

2
src/lib/dhcpsrv/testutils/config_result_check.cc
View File

@ -12,7 +12,7 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR // OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE. // PERFORMANCE OF THIS SOFTWARE.
#include <config/ccsession.h> #include <config/command_interpreter.h>
#include <dhcpsrv/testutils/config_result_check.h> #include <dhcpsrv/testutils/config_result_check.h>
#include <boost/algorithm/string/classification.hpp> #include <boost/algorithm/string/classification.hpp>
#include <boost/algorithm/string/constants.hpp> #include <boost/algorithm/string/constants.hpp>