Commit 89c0130e authored by Tomek Mrugalski's avatar Tomek Mrugalski 🛰
Browse files

[3796] command_interpreter.cc|h|tests moved: src/lib/config => src/lib/cc

parent 4a055a60
...@@ -18,7 +18,7 @@ ...@@ -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/command_interpreter.h> #include <cc/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>
......
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
#include <config.h> #include <config.h>
#include <config/command_interpreter.h> #include <cc/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>
......
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
#include <config.h> #include <config.h>
#include <config/command_interpreter.h> #include <cc/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>
......
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
#include <config.h> #include <config.h>
#include <d2/d2_log.h> #include <d2/d2_log.h>
#include <config/command_interpreter.h> #include <cc/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>
......
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
#include <config.h> #include <config.h>
#include <config/command_interpreter.h> #include <cc/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>
......
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
#include <config.h> #include <config.h>
#include <config/command_interpreter.h> #include <cc/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>
......
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
#include <config.h> #include <config.h>
#include <asiolink/io_service.h> #include <asiolink/io_service.h>
#include <config/command_interpreter.h> #include <cc/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>
......
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
#include <config.h> #include <config.h>
#include <config/command_interpreter.h> #include <cc/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>
......
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
#include <config.h> #include <config.h>
#include <config/command_interpreter.h> #include <cc/command_interpreter.h>
#include <d_test_stubs.h> #include <d_test_stubs.h>
#include <d2/spec_config.h> #include <d2/spec_config.h>
......
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
#include <asiolink/io_service.h> #include <asiolink/io_service.h>
#include <cc/data.h> #include <cc/data.h>
#include <config/command_interpreter.h> #include <cc/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>
......
...@@ -17,7 +17,7 @@ ...@@ -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/command_interpreter.h> #include <cc/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>
......
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
#include <asiolink/asiolink.h> #include <asiolink/asiolink.h>
#include <cc/data.h> #include <cc/data.h>
#include <config/command_interpreter.h> #include <cc/command_interpreter.h>
#include <dhcp4/dhcp4_srv.h> #include <dhcp4/dhcp4_srv.h>
namespace isc { namespace isc {
......
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
#include <config.h> #include <config.h>
#include <config/command_interpreter.h> #include <cc/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>
......
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
#include <arpa/inet.h> #include <arpa/inet.h>
#include <gtest/gtest.h> #include <gtest/gtest.h>
#include <config/command_interpreter.h> #include <cc/command_interpreter.h>
#include <config/module_spec.h> #include <config/module_spec.h>
#include <dhcp4/dhcp4_srv.h> #include <dhcp4/dhcp4_srv.h>
#include <dhcp4/json_config_parser.h> #include <dhcp4/json_config_parser.h>
......
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
#include <config.h> #include <config.h>
#include <config/command_interpreter.h> #include <cc/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>
......
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
#define D2_UNITTEST_H #define D2_UNITTEST_H
#include <dhcp4/dhcp4_srv.h> #include <dhcp4/dhcp4_srv.h>
#include <config/command_interpreter.h> #include <cc/command_interpreter.h>
#include <gtest/gtest.h> #include <gtest/gtest.h>
......
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
#include <sstream> #include <sstream>
#include <asiolink/io_address.h> #include <asiolink/io_address.h>
#include <config/command_interpreter.h> #include <cc/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>
......
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
#include <asiolink/io_address.h> #include <asiolink/io_address.h>
#include <cc/data.h> #include <cc/data.h>
#include <config/command_interpreter.h> #include <cc/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>
......
...@@ -30,7 +30,7 @@ ...@@ -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/command_interpreter.h> #include <cc/command_interpreter.h>
#include <list> #include <list>
#include <boost/shared_ptr.hpp> #include <boost/shared_ptr.hpp>
......
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
#include <config.h> #include <config.h>
#include <config/command_interpreter.h> #include <cc/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>
......
...@@ -17,7 +17,7 @@ ...@@ -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/command_interpreter.h> #include <cc/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>
......
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
#include <asiolink/asiolink.h> #include <asiolink/asiolink.h>
#include <cc/data.h> #include <cc/data.h>
#include <config/command_interpreter.h> #include <cc/command_interpreter.h>
#include <dhcp6/dhcp6_srv.h> #include <dhcp6/dhcp6_srv.h>
namespace isc { namespace isc {
......
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
#include <asiolink/io_address.h> #include <asiolink/io_address.h>
#include <cc/data.h> #include <cc/data.h>
#include <config/command_interpreter.h> #include <cc/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>
......
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
#include <config.h> #include <config.h>
#include <config/command_interpreter.h> #include <cc/command_interpreter.h>
#include <config/module_spec.h> #include <config/module_spec.h>
#include <dhcp/libdhcp++.h> #include <dhcp/libdhcp++.h>
#include <dhcp/option6_ia.h> #include <dhcp/option6_ia.h>
......
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
#include <config.h> #include <config.h>
#include <config/command_interpreter.h> #include <cc/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>
......
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
#define D2_UNITTEST_H #define D2_UNITTEST_H
#include <dhcp6/dhcp6_srv.h> #include <dhcp6/dhcp6_srv.h>
#include <config/command_interpreter.h> #include <cc/command_interpreter.h>
#include <gtest/gtest.h> #include <gtest/gtest.h>
......
...@@ -42,7 +42,7 @@ ...@@ -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/command_interpreter.h> #include <cc/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>
......
...@@ -16,7 +16,7 @@ ...@@ -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/command_interpreter.h> #include <cc/command_interpreter.h>
#include <string.h> #include <string.h>
using namespace isc::data; using namespace isc::data;
......
...@@ -29,7 +29,7 @@ ...@@ -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/command_interpreter.h> #include <cc/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>
......
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
#include <config.h> #include <config.h>
#include <config/command_interpreter.h> #include <cc/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>
......
...@@ -15,6 +15,7 @@ endif ...@@ -15,6 +15,7 @@ endif
lib_LTLIBRARIES = libkea-cc.la lib_LTLIBRARIES = libkea-cc.la
libkea_cc_la_SOURCES = data.cc data.h libkea_cc_la_SOURCES = data.cc data.h
libkea_cc_la_SOURCES += command_interpreter.cc command_interpreter.h
libkea_cc_la_SOURCES += logger.cc logger.h libkea_cc_la_SOURCES += logger.cc logger.h
nodist_libkea_cc_la_SOURCES = cc_messages.cc cc_messages.h nodist_libkea_cc_la_SOURCES = cc_messages.cc cc_messages.h
libkea_cc_la_LIBADD = $(top_builddir)/src/lib/log/libkea-log.la libkea_cc_la_LIBADD = $(top_builddir)/src/lib/log/libkea-log.la
......
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
#include <config.h> #include <config.h>
#include <exceptions/exceptions.h> #include <exceptions/exceptions.h>
#include <config/command_interpreter.h> #include <cc/command_interpreter.h>
#include <string> #include <string>
#include <cc/data.h> #include <cc/data.h>
......
...@@ -20,8 +20,8 @@ TESTS = ...@@ -20,8 +20,8 @@ TESTS =
if HAVE_GTEST if HAVE_GTEST
TESTS += run_unittests TESTS += run_unittests
# (TODO: these need to be completed and moved to tests/) # (TODO: these need to be completed and moved to tests/)
run_unittests_SOURCES = data_unittests.cc run_unittests.cc run_unittests_SOURCES = command_interpreter_unittests.cc data_unittests.cc
run_unittests_SOURCES += data_file_unittests.cc run_unittests_SOURCES += data_file_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)
......
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
#include <config.h> #include <config.h>
#include <gtest/gtest.h> #include <gtest/gtest.h>
#include <config/command_interpreter.h> #include <cc/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>
...@@ -29,7 +29,7 @@ using namespace std; ...@@ -29,7 +29,7 @@ using namespace std;
namespace { namespace {
/// @brief Shortcut method for creating elements from JSON string /// @brief Convenience method for creating elements from JSON string
/// ///
/// @param str string to be converted /// @param str string to be converted
/// @return Element structure /// @return Element structure
......
...@@ -17,7 +17,6 @@ BUILT_SOURCES = config_messages.h config_messages.cc ...@@ -17,7 +17,6 @@ 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 += 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
......
...@@ -17,7 +17,7 @@ TESTS_ENVIRONMENT = \ ...@@ -17,7 +17,7 @@ TESTS_ENVIRONMENT = \
TESTS = TESTS =
if HAVE_GTEST if HAVE_GTEST
TESTS += run_unittests TESTS += run_unittests
run_unittests_SOURCES = command_interpreter_unittests.cc module_spec_unittests.cc run_unittests_SOURCES = module_spec_unittests.cc
run_unittests_SOURCES += config_data_unittests.cc run_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)
......
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
#include <config.h> #include <config.h>
#include <config/command_interpreter.h> #include <cc/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>
......
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
// PERFORMANCE OF THIS SOFTWARE. // PERFORMANCE OF THIS SOFTWARE.
#include <config.h> #include <config.h>
#include <config/command_interpreter.h> #include <cc/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>
......
...@@ -12,7 +12,7 @@ ...@@ -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/command_interpreter.h> #include <cc/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>
......
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