diff options
Diffstat (limited to 'src/lib/yang')
| -rw-r--r-- | src/lib/yang/tests/adaptor_config_unittests.cc | 8 | ||||
| -rw-r--r-- | src/lib/yang/tests/config_unittests.cc | 4 | ||||
| -rw-r--r-- | src/lib/yang/translator_pool.cc | 4 | ||||
| -rw-r--r-- | src/lib/yang/yang_revisions.h | 6 |
4 files changed, 13 insertions, 9 deletions
diff --git a/src/lib/yang/tests/adaptor_config_unittests.cc b/src/lib/yang/tests/adaptor_config_unittests.cc index f94f2776e2..2109890c58 100644 --- a/src/lib/yang/tests/adaptor_config_unittests.cc +++ b/src/lib/yang/tests/adaptor_config_unittests.cc @@ -79,7 +79,7 @@ TEST_F(AdaptorConfigTest, loadExamples4) { "hooks-radius.json", "leases-expiration.json", "multiple-options.json", - //"mysql-reservations.json", commented for new TLS parameters + "mysql-reservations.json", "pgsql-reservations.json", "reservations.json", "several-subnets.json", @@ -87,7 +87,7 @@ TEST_F(AdaptorConfigTest, loadExamples4) { "single-subnet.json", "vendor-specific.json", "vivso.json", - // "with-ddns.json", commented out for ddns-ttl-percent + "with-ddns.json", }; ElementPtr x; @@ -119,7 +119,7 @@ TEST_F(AdaptorConfigTest, loadExamples6) { "iPXE.json", "leases-expiration.json", "multiple-options.json", - //"mysql-reservations.json", commented for new TLS parameters + "mysql-reservations.json", "pgsql-reservations.json", "reservations.json", "several-subnets.json", @@ -128,7 +128,7 @@ TEST_F(AdaptorConfigTest, loadExamples6) { "softwire46.json", "stateless.json", "tee-times.json", - // "with-ddns.json", commented out for ddns-ttl-percent + "with-ddns.json", }; ElementPtr x; diff --git a/src/lib/yang/tests/config_unittests.cc b/src/lib/yang/tests/config_unittests.cc index 2568b45435..46b591d0dd 100644 --- a/src/lib/yang/tests/config_unittests.cc +++ b/src/lib/yang/tests/config_unittests.cc @@ -322,7 +322,7 @@ TEST_F(ConfigTestKeaV4, examples4) { "single-subnet.json", "vendor-specific.json", "vivso.json", - // "with-ddns.json", commented out for ddns-ttl-percent + "with-ddns.json", }; for (string file : examples) { resetSession(); @@ -365,7 +365,7 @@ TEST_F(ConfigTestKeaV6, examples6) { "softwire46.json", "stateless.json", "tee-times.json", - // "with-ddns.json", commented out for ddns-ttl-percent + "with-ddns.json", }; for (string file : examples) { resetSession(); diff --git a/src/lib/yang/translator_pool.cc b/src/lib/yang/translator_pool.cc index 05fdec6a8d..58ff061a35 100644 --- a/src/lib/yang/translator_pool.cc +++ b/src/lib/yang/translator_pool.cc @@ -107,6 +107,8 @@ TranslatorPool::getPoolKea(DataNode const& data_node) { checkAndGetLeaf(result, data_node, "client-class"); checkAndGetLeaf(result, data_node, "require-client-classes"); + checkAndGetLeaf(result, data_node, "pool-id"); + checkAndGetAndJsonifyLeaf(result, data_node, "user-context"); return (result->empty() ? ElementPtr() : result); @@ -188,6 +190,8 @@ TranslatorPool::setPoolKea(string const& xpath, ConstElementPtr elem) { checkAndSetLeafList(elem, xpath, "require-client-classes", LeafBaseType::String); + checkAndSetLeaf(elem, xpath, "pool-id", LeafBaseType::Dec64); + checkAndSetUserContext(elem, xpath); string prefix = pool->stringValue(); diff --git a/src/lib/yang/yang_revisions.h b/src/lib/yang/yang_revisions.h index ebd9c5a1c5..91fee576d7 100644 --- a/src/lib/yang/yang_revisions.h +++ b/src/lib/yang/yang_revisions.h @@ -22,9 +22,9 @@ static const std::unordered_map<std::string, std::string> YANG_REVISIONS = { { "ietf-dhcpv6-options", "2018-09-04" }, { "ietf-dhcpv6-server", "2018-09-04" }, { "kea-types", "2019-08-12" }, - { "kea-dhcp-types", "2023-05-31" }, - { "kea-dhcp4-server", "2023-05-31" }, - { "kea-dhcp6-server", "2023-05-31" }, + { "kea-dhcp-types", "2023-06-28" }, + { "kea-dhcp4-server", "2023-06-28" }, + { "kea-dhcp6-server", "2023-06-28" }, { "kea-ctrl-agent", "2019-08-12" }, { "kea-dhcp-ddns", "2022-07-27" } }; // YANG_REVISIONS |