[4096] Addressed review comments

src/bin/dhcp4/tests/config_parser_unittest.cc
src/bin/dhcp6/tests/config_parser_unittest.cc
src/lib/dhcpsrv/client_class_def.h
    Fixed spellings and spacing.

src/lib/dhcpsrv/Makefile.am
src/lib/dhcpsrv/tests/Makefile.am
    Move eval lib up in the link order

diff --git a/src/bin/dhcp4/tests/config_parser_unittest.cc b/src/bin/dhcp4/tests/config_parser_unittest.cc
index c2688627d1dfa281da9e3169e7bcee264b1c1518..a392f1e2c2228bf7f1564bf79861c644d8493377 100644 (file)
--- a/src/bin/dhcp4/tests/config_parser_unittest.cc
+++ b/src/bin/dhcp4/tests/config_parser_unittest.cc
@@ -3944,7 +3944,7 @@ TEST_F(Dhcp4ParserTest, validClientClassDictionary) {
     EXPECT_EQ(3, dictionary->getClasses()->size());
 }
 
-// Verifies that an class list containing an invalid
+// Verifies that a class list containing an invalid
 // class definition causes a configuraiton error.
 TEST_F(Dhcp4ParserTest, invalidClientClassDictionary) {
     string config = "{ " + genIfaceConfig() + "," +

diff --git a/src/bin/dhcp6/tests/config_parser_unittest.cc b/src/bin/dhcp6/tests/config_parser_unittest.cc
index 5b047af15797ac419650bfc201a208f536444fb0..75cc9d9f920c9d2f42f6cfed7fd1f727bbd8228c 100644 (file)
--- a/src/bin/dhcp6/tests/config_parser_unittest.cc
+++ b/src/bin/dhcp6/tests/config_parser_unittest.cc
@@ -4038,7 +4038,7 @@ TEST_F(Dhcp6ParserTest, validClientClassDictionary) {
     EXPECT_EQ(3, dictionary->getClasses()->size());
 }
 
-// Verifies that an class list containing an invalid
+// Verifies that a class list containing an invalid
 // class definition causes a configuraiton error.
 TEST_F(Dhcp6ParserTest, invalidClientClassDictionary) {
     string config = "{ " + genIfaceConfig() + "," +

diff --git a/src/lib/dhcpsrv/Makefile.am b/src/lib/dhcpsrv/Makefile.am
index b5ff75abaee290efdfa7963a625ed5e63ddb40e4..151fb574c59efcdfcab2aaf17338feb81ef5599b 100644 (file)
--- a/src/lib/dhcpsrv/Makefile.am
+++ b/src/lib/dhcpsrv/Makefile.am
@@ -162,10 +162,10 @@ nodist_libkea_dhcpsrv_la_SOURCES += hosts_messages.h hosts_messages.cc
 
 libkea_dhcpsrv_la_CXXFLAGS = $(AM_CXXFLAGS)
 libkea_dhcpsrv_la_CPPFLAGS = $(AM_CPPFLAGS)
-libkea_dhcpsrv_la_LIBADD   = $(top_builddir)/src/lib/dhcp_ddns/libkea-dhcp_ddns.la
+libkea_dhcpsrv_la_LIBADD  = $(top_builddir)/src/lib/eval/libkea-eval.la
+libkea_dhcpsrv_la_LIBADD  += $(top_builddir)/src/lib/dhcp_ddns/libkea-dhcp_ddns.la
 libkea_dhcpsrv_la_LIBADD  += $(top_builddir)/src/lib/stats/libkea-stats.la
 libkea_dhcpsrv_la_LIBADD  += $(top_builddir)/src/lib/config/libkea-cfgclient.la
-libkea_dhcpsrv_la_LIBADD  += $(top_builddir)/src/lib/eval/libkea-eval.la
 libkea_dhcpsrv_la_LIBADD  += $(top_builddir)/src/lib/dhcp/libkea-dhcp++.la
 libkea_dhcpsrv_la_LIBADD  += $(top_builddir)/src/lib/asiolink/libkea-asiolink.la
 libkea_dhcpsrv_la_LIBADD  += $(top_builddir)/src/lib/cc/libkea-cc.la

diff --git a/src/lib/dhcpsrv/client_class_def.h b/src/lib/dhcpsrv/client_class_def.h
index 626a3acffd85f67bac54217a867257a11a13d32a..78a65fee92696d897393820401918df2103b6e4a 100644 (file)
--- a/src/lib/dhcpsrv/client_class_def.h
+++ b/src/lib/dhcpsrv/client_class_def.h
@@ -53,7 +53,7 @@ class ClientClassDef {
     /// @param match_expr Expression the class will use to determine membership
     /// @param options Collection of options members should be given
     ClientClassDef(const std::string& name, const ExpressionPtr& match_expr,
-                const CfgOptionPtr& options = CfgOptionPtr());
+                   const CfgOptionPtr& options = CfgOptionPtr());
 
 
     /// Copy constructor
@@ -118,7 +118,7 @@ class ClientClassDef {
     /// @brief Unique text identifier by which this class is known.
     std::string name_;
 
-    /// @brief The logical expression which deteremines membership in
+    /// @brief The logical expression which determines membership in
     /// this class.
     ExpressionPtr match_expr_;
 
@@ -180,7 +180,7 @@ class ClientClassDictionary {
 
     /// @brief Removes a given class definition from the dictionary
     ///
-    /// Removes the class defintion from the map if it exists, otherwise
+    /// Removes the class definition from the map if it exists, otherwise
     /// no harm, no foul.
     ///
     /// @param name the name of the class to remove

diff --git a/src/lib/dhcpsrv/tests/Makefile.am b/src/lib/dhcpsrv/tests/Makefile.am
index 1878c8d36cd289e441e7541fa785e57800eeb19d..8d6cfebf3cd117da20881dde0d4118162be9b059 100644 (file)
--- a/src/lib/dhcpsrv/tests/Makefile.am
+++ b/src/lib/dhcpsrv/tests/Makefile.am
@@ -145,10 +145,10 @@ endif
 
 libdhcpsrv_unittests_LDADD  = $(top_builddir)/src/lib/dhcpsrv/testutils/libdhcpsrvtest.la
 libdhcpsrv_unittests_LDADD += $(top_builddir)/src/lib/dhcpsrv/libkea-dhcpsrv.la
+libdhcpsrv_unittests_LDADD += $(top_builddir)/src/lib/eval/libkea-eval.la
 libdhcpsrv_unittests_LDADD += $(top_builddir)/src/lib/dhcp_ddns/libkea-dhcp_ddns.la
 libdhcpsrv_unittests_LDADD += $(top_builddir)/src/lib/stats/libkea-stats.la
 libdhcpsrv_unittests_LDADD += $(top_builddir)/src/lib/config/libkea-cfgclient.la
-libdhcpsrv_unittests_LDADD += $(top_builddir)/src/lib/eval/libkea-eval.la
 libdhcpsrv_unittests_LDADD += $(top_builddir)/src/lib/dhcp/libkea-dhcp++.la
 libdhcpsrv_unittests_LDADD += $(top_builddir)/src/lib/dhcp/tests/libdhcptest.la
 libdhcpsrv_unittests_LDADD += $(top_builddir)/src/lib/asiolink/libkea-asiolink.la