From: Francis Dupont Date: Fri, 6 Apr 2018 08:12:49 +0000 (+0200) Subject: [5374] spelling (in test code) X-Git-Tag: trac5458a_base~14^2~9 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=be3540582945f32fa1cd7ecb8b3a9e1af37a5897;p=thirdparty%2Fkea.git [5374] spelling (in test code) --- diff --git a/src/bin/dhcp6/dhcp6_srv.cc b/src/bin/dhcp6/dhcp6_srv.cc index 7c99b98b50..1f823e54c9 100644 --- a/src/bin/dhcp6/dhcp6_srv.cc +++ b/src/bin/dhcp6/dhcp6_srv.cc @@ -3173,7 +3173,7 @@ Dhcpv6Srv::requiredClassify(const Pkt6Ptr& pkt, AllocEngine::ClientContext6& ctx // Followed by the subnet const ClientClasses& to_add = subnet->getRequiredClasses(); - for(ClientClasses::const_iterator cclass = to_add.cbegin(); + for (ClientClasses::const_iterator cclass = to_add.cbegin(); cclass != to_add.cend(); ++cclass) { classes.insert(*cclass); } diff --git a/src/bin/dhcp6/tests/classify_unittests.cc b/src/bin/dhcp6/tests/classify_unittests.cc index 99611da61e..573738c15b 100644 --- a/src/bin/dhcp6/tests/classify_unittests.cc +++ b/src/bin/dhcp6/tests/classify_unittests.cc @@ -415,7 +415,7 @@ TEST_F(ClassifyTest, requiredClassification) { "\"subnet6\": [ " "{ \"pools\": [ { \"pool\": \"2001:db8:1::/64\" } ], " " \"subnet\": \"2001:db8:1::/48\", " - " \"require-client-classes\": [ \"router\" ], " + " \"required-client-classes\": [ \"router\" ], " " \"interface\": \"eth1\" } ]," "\"client-classes\": [ " "{ \"name\": \"router\", " @@ -1349,7 +1349,7 @@ TEST_F(ClassifyTest, precedencePool) { " \"id\": 1," " \"pools\": [ { " " \"pool\": \"2001:db8:1::1 - 2001:db8:1::64\"," - " \"require-client-classes\": [ \"for-pool\" ]" + " \"required-client-classes\": [ \"for-pool\" ]" " } ]" " } ]" "} ]," @@ -1430,10 +1430,10 @@ TEST_F(ClassifyTest, precedenceSubnet) { " \"subnet6\": [ { " " \"subnet\": \"2001:db8:1::/64\"," " \"id\": 1," - " \"require-client-classes\": [ \"for-subnet\" ]," + " \"required-client-classes\": [ \"for-subnet\" ]," " \"pools\": [ { " " \"pool\": \"2001:db8:1::1 - 2001:db8:1::64\"," - " \"require-client-classes\": [ \"for-pool\" ]" + " \"required-client-classes\": [ \"for-pool\" ]" " } ]" " } ]" "} ]," @@ -1511,14 +1511,14 @@ TEST_F(ClassifyTest, precedenceNetwork) { "\"shared-networks\": [ {" " \"name\": \"frog\"," " \"interface\": \"eth1\"," - " \"require-client-classes\": [ \"for-network\" ]," + " \"required-client-classes\": [ \"for-network\" ]," " \"subnet6\": [ { " " \"subnet\": \"2001:db8:1::/64\"," " \"id\": 1," - " \"require-client-classes\": [ \"for-subnet\" ]," + " \"required-client-classes\": [ \"for-subnet\" ]," " \"pools\": [ { " " \"pool\": \"2001:db8:1::1 - 2001:db8:1::64\"," - " \"require-client-classes\": [ \"for-pool\" ]" + " \"required-client-classes\": [ \"for-pool\" ]" " } ]" " } ]" "} ],"