Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
ISC Open Source Projects
Kea
Commits
89c0130e
Commit
89c0130e
authored
Jun 10, 2015
by
Tomek Mrugalski
🛰
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[3796] command_interpreter.cc|h|tests moved: src/lib/config => src/lib/cc
parent
4a055a60
Changes
40
Hide whitespace changes
Inline
Side-by-side
Showing
40 changed files
with
40 additions
and
40 deletions
+40
-40
src/bin/d2/bundy_d2_controller.h
src/bin/d2/bundy_d2_controller.h
+1
-1
src/bin/d2/d2_process.cc
src/bin/d2/d2_process.cc
+1
-1
src/bin/d2/d_cfg_mgr.cc
src/bin/d2/d_cfg_mgr.cc
+1
-1
src/bin/d2/d_controller.cc
src/bin/d2/d_controller.cc
+1
-1
src/bin/d2/tests/bundy_d2_controller_unittests.cc
src/bin/d2/tests/bundy_d2_controller_unittests.cc
+1
-1
src/bin/d2/tests/d2_controller_unittests.cc
src/bin/d2/tests/d2_controller_unittests.cc
+1
-1
src/bin/d2/tests/d2_process_unittests.cc
src/bin/d2/tests/d2_process_unittests.cc
+1
-1
src/bin/d2/tests/d_cfg_mgr_unittests.cc
src/bin/d2/tests/d_cfg_mgr_unittests.cc
+1
-1
src/bin/d2/tests/d_controller_unittests.cc
src/bin/d2/tests/d_controller_unittests.cc
+1
-1
src/bin/d2/tests/d_test_stubs.h
src/bin/d2/tests/d_test_stubs.h
+1
-1
src/bin/dhcp4/bundy_controller.cc
src/bin/dhcp4/bundy_controller.cc
+1
-1
src/bin/dhcp4/ctrl_dhcp4_srv.h
src/bin/dhcp4/ctrl_dhcp4_srv.h
+1
-1
src/bin/dhcp4/json_config_parser.cc
src/bin/dhcp4/json_config_parser.cc
+1
-1
src/bin/dhcp4/tests/config_parser_unittest.cc
src/bin/dhcp4/tests/config_parser_unittest.cc
+1
-1
src/bin/dhcp4/tests/ctrl_dhcp4_srv_unittest.cc
src/bin/dhcp4/tests/ctrl_dhcp4_srv_unittest.cc
+1
-1
src/bin/dhcp4/tests/d2_unittest.h
src/bin/dhcp4/tests/d2_unittest.h
+1
-1
src/bin/dhcp4/tests/dhcp4_srv_unittest.cc
src/bin/dhcp4/tests/dhcp4_srv_unittest.cc
+1
-1
src/bin/dhcp4/tests/dhcp4_test_utils.cc
src/bin/dhcp4/tests/dhcp4_test_utils.cc
+1
-1
src/bin/dhcp4/tests/dhcp4_test_utils.h
src/bin/dhcp4/tests/dhcp4_test_utils.h
+1
-1
src/bin/dhcp4/tests/kea_controller_unittest.cc
src/bin/dhcp4/tests/kea_controller_unittest.cc
+1
-1
src/bin/dhcp6/bundy_controller.cc
src/bin/dhcp6/bundy_controller.cc
+1
-1
src/bin/dhcp6/ctrl_dhcp6_srv.h
src/bin/dhcp6/ctrl_dhcp6_srv.h
+1
-1
src/bin/dhcp6/json_config_parser.cc
src/bin/dhcp6/json_config_parser.cc
+1
-1
src/bin/dhcp6/tests/config_parser_unittest.cc
src/bin/dhcp6/tests/config_parser_unittest.cc
+1
-1
src/bin/dhcp6/tests/ctrl_dhcp6_srv_unittest.cc
src/bin/dhcp6/tests/ctrl_dhcp6_srv_unittest.cc
+1
-1
src/bin/dhcp6/tests/d2_unittest.h
src/bin/dhcp6/tests/d2_unittest.h
+1
-1
src/bin/dhcp6/tests/dhcp6_srv_unittest.cc
src/bin/dhcp6/tests/dhcp6_srv_unittest.cc
+1
-1
src/bin/dhcp6/tests/dhcp6_test_utils.cc
src/bin/dhcp6/tests/dhcp6_test_utils.cc
+1
-1
src/bin/dhcp6/tests/hooks_unittest.cc
src/bin/dhcp6/tests/hooks_unittest.cc
+1
-1
src/bin/dhcp6/tests/kea_controller_unittest.cc
src/bin/dhcp6/tests/kea_controller_unittest.cc
+1
-1
src/lib/cc/Makefile.am
src/lib/cc/Makefile.am
+1
-0
src/lib/cc/command_interpreter.cc
src/lib/cc/command_interpreter.cc
+1
-1
src/lib/cc/command_interpreter.h
src/lib/cc/command_interpreter.h
+0
-0
src/lib/cc/tests/Makefile.am
src/lib/cc/tests/Makefile.am
+2
-2
src/lib/cc/tests/command_interpreter_unittests.cc
src/lib/cc/tests/command_interpreter_unittests.cc
+2
-2
src/lib/config/Makefile.am
src/lib/config/Makefile.am
+0
-1
src/lib/config/tests/Makefile.am
src/lib/config/tests/Makefile.am
+1
-1
src/lib/dhcpsrv/tests/dbaccess_parser_unittest.cc
src/lib/dhcpsrv/tests/dbaccess_parser_unittest.cc
+1
-1
src/lib/dhcpsrv/tests/dhcp_parsers_unittest.cc
src/lib/dhcpsrv/tests/dhcp_parsers_unittest.cc
+1
-1
src/lib/dhcpsrv/testutils/config_result_check.cc
src/lib/dhcpsrv/testutils/config_result_check.cc
+1
-1
No files found.
src/bin/d2/bundy_d2_controller.h
View file @
89c0130e
...
...
@@ -18,7 +18,7 @@
#include <asiolink/io_service.h>
#include <cc/data.h>
#include <cc/session.h>
#include <c
onfig
/command_interpreter.h>
#include <c
c
/command_interpreter.h>
#include <d2/d2_log.h>
#include <d2/d_controller.h>
#include <d2/d_process.h>
...
...
src/bin/d2/d2_process.cc
View file @
89c0130e
...
...
@@ -14,7 +14,7 @@
#include <config.h>
#include <c
onfig
/command_interpreter.h>
#include <c
c
/command_interpreter.h>
#include <d2/d2_log.h>
#include <d2/d2_cfg_mgr.h>
#include <d2/d2_process.h>
...
...
src/bin/d2/d_cfg_mgr.cc
View file @
89c0130e
...
...
@@ -14,7 +14,7 @@
#include <config.h>
#include <c
onfig
/command_interpreter.h>
#include <c
c
/command_interpreter.h>
#include <d2/d2_log.h>
#include <dhcp/libdhcp++.h>
#include <d2/d_cfg_mgr.h>
...
...
src/bin/d2/d_controller.cc
View file @
89c0130e
...
...
@@ -14,7 +14,7 @@
#include <config.h>
#include <d2/d2_log.h>
#include <c
onfig
/command_interpreter.h>
#include <c
c
/command_interpreter.h>
#include <d2/d_controller.h>
#include <exceptions/exceptions.h>
#include <log/logger_support.h>
...
...
src/bin/d2/tests/bundy_d2_controller_unittests.cc
View file @
89c0130e
...
...
@@ -14,7 +14,7 @@
#include <config.h>
#include <c
onfig
/command_interpreter.h>
#include <c
c
/command_interpreter.h>
#include <d_test_stubs.h>
#include <d2/bundy_d2_controller.h>
#include <d2/spec_config.h>
...
...
src/bin/d2/tests/d2_controller_unittests.cc
View file @
89c0130e
...
...
@@ -14,7 +14,7 @@
#include <config.h>
#include <c
onfig
/command_interpreter.h>
#include <c
c
/command_interpreter.h>
#include <d_test_stubs.h>
#include <d2/d2_controller.h>
#include <d2/d2_process.h>
...
...
src/bin/d2/tests/d2_process_unittests.cc
View file @
89c0130e
...
...
@@ -15,7 +15,7 @@
#include <config.h>
#include <asiolink/io_service.h>
#include <c
onfig
/command_interpreter.h>
#include <c
c
/command_interpreter.h>
#include <d2/d2_process.h>
#include <dhcp_ddns/ncr_io.h>
#include <d_test_stubs.h>
...
...
src/bin/d2/tests/d_cfg_mgr_unittests.cc
View file @
89c0130e
...
...
@@ -14,7 +14,7 @@
#include <config.h>
#include <c
onfig
/command_interpreter.h>
#include <c
c
/command_interpreter.h>
#include <config/module_spec.h>
#include <dhcpsrv/parsers/dhcp_parsers.h>
#include <d2/d_cfg_mgr.h>
...
...
src/bin/d2/tests/d_controller_unittests.cc
View file @
89c0130e
...
...
@@ -14,7 +14,7 @@
#include <config.h>
#include <c
onfig
/command_interpreter.h>
#include <c
c
/command_interpreter.h>
#include <d_test_stubs.h>
#include <d2/spec_config.h>
...
...
src/bin/d2/tests/d_test_stubs.h
View file @
89c0130e
...
...
@@ -18,7 +18,7 @@
#include <asiolink/io_service.h>
#include <cc/data.h>
#include <c
onfig
/command_interpreter.h>
#include <c
c
/command_interpreter.h>
#include <d2/d_controller.h>
#include <d2/d_cfg_mgr.h>
...
...
src/bin/dhcp4/bundy_controller.cc
View file @
89c0130e
...
...
@@ -17,7 +17,7 @@
#include <asiolink/asiolink.h>
#include <cc/data.h>
#include <cc/session.h>
#include <c
onfig
/command_interpreter.h>
#include <c
c
/command_interpreter.h>
#include <dhcp/iface_mgr.h>
#include <dhcp4/json_config_parser.h>
#include <dhcp4/ctrl_dhcp4_srv.h>
...
...
src/bin/dhcp4/ctrl_dhcp4_srv.h
View file @
89c0130e
...
...
@@ -17,7 +17,7 @@
#include <asiolink/asiolink.h>
#include <cc/data.h>
#include <c
onfig
/command_interpreter.h>
#include <c
c
/command_interpreter.h>
#include <dhcp4/dhcp4_srv.h>
namespace
isc
{
...
...
src/bin/dhcp4/json_config_parser.cc
View file @
89c0130e
...
...
@@ -14,7 +14,7 @@
#include <config.h>
#include <c
onfig
/command_interpreter.h>
#include <c
c
/command_interpreter.h>
#include <dhcp4/dhcp4_log.h>
#include <dhcp/libdhcp++.h>
#include <dhcp/option_definition.h>
...
...
src/bin/dhcp4/tests/config_parser_unittest.cc
View file @
89c0130e
...
...
@@ -17,7 +17,7 @@
#include <arpa/inet.h>
#include <gtest/gtest.h>
#include <c
onfig
/command_interpreter.h>
#include <c
c
/command_interpreter.h>
#include <config/module_spec.h>
#include <dhcp4/dhcp4_srv.h>
#include <dhcp4/json_config_parser.h>
...
...
src/bin/dhcp4/tests/ctrl_dhcp4_srv_unittest.cc
View file @
89c0130e
...
...
@@ -14,7 +14,7 @@
#include <config.h>
#include <c
onfig
/command_interpreter.h>
#include <c
c
/command_interpreter.h>
#include <dhcp/dhcp4.h>
#include <dhcp4/ctrl_dhcp4_srv.h>
#include <hooks/hooks_manager.h>
...
...
src/bin/dhcp4/tests/d2_unittest.h
View file @
89c0130e
...
...
@@ -18,7 +18,7 @@
#define D2_UNITTEST_H
#include <dhcp4/dhcp4_srv.h>
#include <c
onfig
/command_interpreter.h>
#include <c
c
/command_interpreter.h>
#include <gtest/gtest.h>
...
...
src/bin/dhcp4/tests/dhcp4_srv_unittest.cc
View file @
89c0130e
...
...
@@ -16,7 +16,7 @@
#include <sstream>
#include <asiolink/io_address.h>
#include <c
onfig
/command_interpreter.h>
#include <c
c
/command_interpreter.h>
#include <dhcp4/tests/dhcp4_test_utils.h>
#include <dhcp/tests/pkt_captures.h>
#include <dhcp/dhcp4.h>
...
...
src/bin/dhcp4/tests/dhcp4_test_utils.cc
View file @
89c0130e
...
...
@@ -16,7 +16,7 @@
#include <asiolink/io_address.h>
#include <cc/data.h>
#include <c
onfig
/command_interpreter.h>
#include <c
c
/command_interpreter.h>
#include <dhcp4/json_config_parser.h>
#include <dhcp4/tests/dhcp4_test_utils.h>
#include <dhcp/option4_addrlst.h>
...
...
src/bin/dhcp4/tests/dhcp4_test_utils.h
View file @
89c0130e
...
...
@@ -30,7 +30,7 @@
#include <dhcpsrv/lease_mgr_factory.h>
#include <dhcp4/dhcp4_srv.h>
#include <asiolink/io_address.h>
#include <c
onfig
/command_interpreter.h>
#include <c
c
/command_interpreter.h>
#include <list>
#include <boost/shared_ptr.hpp>
...
...
src/bin/dhcp4/tests/kea_controller_unittest.cc
View file @
89c0130e
...
...
@@ -14,7 +14,7 @@
#include <config.h>
#include <c
onfig
/command_interpreter.h>
#include <c
c
/command_interpreter.h>
#include <dhcp/dhcp4.h>
#include <dhcp4/ctrl_dhcp4_srv.h>
#include <dhcpsrv/cfgmgr.h>
...
...
src/bin/dhcp6/bundy_controller.cc
View file @
89c0130e
...
...
@@ -17,7 +17,7 @@
#include <asiolink/asiolink.h>
#include <cc/data.h>
#include <cc/session.h>
#include <c
onfig
/command_interpreter.h>
#include <c
c
/command_interpreter.h>
#include <dhcp/iface_mgr.h>
#include <dhcpsrv/dhcp_config_parser.h>
#include <dhcpsrv/cfgmgr.h>
...
...
src/bin/dhcp6/ctrl_dhcp6_srv.h
View file @
89c0130e
...
...
@@ -17,7 +17,7 @@
#include <asiolink/asiolink.h>
#include <cc/data.h>
#include <c
onfig
/command_interpreter.h>
#include <c
c
/command_interpreter.h>
#include <dhcp6/dhcp6_srv.h>
namespace
isc
{
...
...
src/bin/dhcp6/json_config_parser.cc
View file @
89c0130e
...
...
@@ -16,7 +16,7 @@
#include <asiolink/io_address.h>
#include <cc/data.h>
#include <c
onfig
/command_interpreter.h>
#include <c
c
/command_interpreter.h>
#include <dhcp/libdhcp++.h>
#include <dhcp6/json_config_parser.h>
#include <dhcp6/dhcp6_log.h>
...
...
src/bin/dhcp6/tests/config_parser_unittest.cc
View file @
89c0130e
...
...
@@ -14,7 +14,7 @@
#include <config.h>
#include <c
onfig
/command_interpreter.h>
#include <c
c
/command_interpreter.h>
#include <config/module_spec.h>
#include <dhcp/libdhcp++.h>
#include <dhcp/option6_ia.h>
...
...
src/bin/dhcp6/tests/ctrl_dhcp6_srv_unittest.cc
View file @
89c0130e
...
...
@@ -14,7 +14,7 @@
#include <config.h>
#include <c
onfig
/command_interpreter.h>
#include <c
c
/command_interpreter.h>
#include <dhcpsrv/cfgmgr.h>
#include <dhcp6/ctrl_dhcp6_srv.h>
#include <hooks/hooks_manager.h>
...
...
src/bin/dhcp6/tests/d2_unittest.h
View file @
89c0130e
...
...
@@ -18,7 +18,7 @@
#define D2_UNITTEST_H
#include <dhcp6/dhcp6_srv.h>
#include <c
onfig
/command_interpreter.h>
#include <c
c
/command_interpreter.h>
#include <gtest/gtest.h>
...
...
src/bin/dhcp6/tests/dhcp6_srv_unittest.cc
View file @
89c0130e
...
...
@@ -42,7 +42,7 @@
#include <dhcp6/tests/dhcp6_test_utils.h>
#include <dhcp6/tests/dhcp6_client.h>
#include <dhcp/tests/pkt_captures.h>
#include <c
onfig
/command_interpreter.h>
#include <c
c
/command_interpreter.h>
#include <boost/pointer_cast.hpp>
#include <boost/scoped_ptr.hpp>
#include <gtest/gtest.h>
...
...
src/bin/dhcp6/tests/dhcp6_test_utils.cc
View file @
89c0130e
...
...
@@ -16,7 +16,7 @@
#include <gtest/gtest.h>
#include <dhcp6/tests/dhcp6_test_utils.h>
#include <dhcp6/json_config_parser.h>
#include <c
onfig
/command_interpreter.h>
#include <c
c
/command_interpreter.h>
#include <string.h>
using
namespace
isc
::
data
;
...
...
src/bin/dhcp6/tests/hooks_unittest.cc
View file @
89c0130e
...
...
@@ -29,7 +29,7 @@
#include <dhcp6/tests/dhcp6_test_utils.h>
#include <dhcp/tests/pkt_captures.h>
#include <c
onfig
/command_interpreter.h>
#include <c
c
/command_interpreter.h>
#include <boost/scoped_ptr.hpp>
#include <gtest/gtest.h>
#include <unistd.h>
...
...
src/bin/dhcp6/tests/kea_controller_unittest.cc
View file @
89c0130e
...
...
@@ -14,7 +14,7 @@
#include <config.h>
#include <c
onfig
/command_interpreter.h>
#include <c
c
/command_interpreter.h>
#include <dhcp/dhcp6.h>
#include <dhcp6/ctrl_dhcp6_srv.h>
#include <dhcpsrv/cfgmgr.h>
...
...
src/lib/cc/Makefile.am
View file @
89c0130e
...
...
@@ -15,6 +15,7 @@ endif
lib_LTLIBRARIES
=
libkea-cc.la
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
nodist_libkea_cc_la_SOURCES
=
cc_messages.cc cc_messages.h
libkea_cc_la_LIBADD
=
$(top_builddir)
/src/lib/log/libkea-log.la
...
...
src/lib/c
onfig
/command_interpreter.cc
→
src/lib/c
c
/command_interpreter.cc
View file @
89c0130e
...
...
@@ -15,7 +15,7 @@
#include <config.h>
#include <exceptions/exceptions.h>
#include <c
onfig
/command_interpreter.h>
#include <c
c
/command_interpreter.h>
#include <string>
#include <cc/data.h>
...
...
src/lib/c
onfig
/command_interpreter.h
→
src/lib/c
c
/command_interpreter.h
View file @
89c0130e
File moved
src/lib/cc/tests/Makefile.am
View file @
89c0130e
...
...
@@ -20,8 +20,8 @@ TESTS =
if
HAVE_GTEST
TESTS
+=
run_unittests
# (TODO: these need to be completed and moved to tests/)
run_unittests_SOURCES
=
data
_unittests.cc
run
_unittests.cc
run_unittests_SOURCES
+=
data_file_unittests.cc
run_unittests_SOURCES
=
command_interpreter
_unittests.cc
data
_unittests.cc
run_unittests_SOURCES
+=
data_file_unittests.cc
run_unittests.cc
run_unittests_CPPFLAGS
=
$(AM_CPPFLAGS)
$(GTEST_INCLUDES)
run_unittests_LDFLAGS
=
$(AM_LDFLAGS)
$(GTEST_LDFLAGS)
...
...
src/lib/c
onfig
/tests/command_interpreter_unittests.cc
→
src/lib/c
c
/tests/command_interpreter_unittests.cc
View file @
89c0130e
...
...
@@ -15,7 +15,7 @@
#include <config.h>
#include <gtest/gtest.h>
#include <c
onfig
/command_interpreter.h>
#include <c
c
/command_interpreter.h>
#include <config/tests/data_def_unittests_config.h>
#include <log/logger_name.h>
#include <boost/scoped_ptr.hpp>
...
...
@@ -29,7 +29,7 @@ using namespace std;
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
/// @return Element structure
...
...
src/lib/config/Makefile.am
View file @
89c0130e
...
...
@@ -17,7 +17,6 @@ BUILT_SOURCES = config_messages.h config_messages.cc
lib_LTLIBRARIES
=
libkea-cfgclient.la
libkea_cfgclient_la_SOURCES
=
config_data.h config_data.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_LIBADD
=
$(top_builddir)
/src/lib/cc/libkea-cc.la
...
...
src/lib/config/tests/Makefile.am
View file @
89c0130e
...
...
@@ -17,7 +17,7 @@ TESTS_ENVIRONMENT = \
TESTS
=
if
HAVE_GTEST
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_CPPFLAGS
=
$(AM_CPPFLAGS)
$(GTEST_INCLUDES)
...
...
src/lib/dhcpsrv/tests/dbaccess_parser_unittest.cc
View file @
89c0130e
...
...
@@ -14,7 +14,7 @@
#include <config.h>
#include <c
onfig
/command_interpreter.h>
#include <c
c
/command_interpreter.h>
#include <dhcpsrv/lease_mgr_factory.h>
#include <dhcpsrv/parsers/dbaccess_parser.h>
#include <log/logger_support.h>
...
...
src/lib/dhcpsrv/tests/dhcp_parsers_unittest.cc
View file @
89c0130e
...
...
@@ -13,7 +13,7 @@
// PERFORMANCE OF THIS SOFTWARE.
#include <config.h>
#include <c
onfig
/command_interpreter.h>
#include <c
c
/command_interpreter.h>
#include <cc/data.h>
#include <dhcp/option.h>
#include <dhcp/option_custom.h>
...
...
src/lib/dhcpsrv/testutils/config_result_check.cc
View file @
89c0130e
...
...
@@ -12,7 +12,7 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
#include <c
onfig
/command_interpreter.h>
#include <c
c
/command_interpreter.h>
#include <dhcpsrv/testutils/config_result_check.h>
#include <boost/algorithm/string/classification.hpp>
#include <boost/algorithm/string/constants.hpp>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment