diff options
| author | Thomas Markwalder <tmark@isc.org> | 2024-10-17 19:39:15 +0200 |
|---|---|---|
| committer | Thomas Markwalder <tmark@isc.org> | 2024-10-28 12:58:38 +0100 |
| commit | 9acfe8732f76ad81d18fb6e03dc16d5fd1b8045a (patch) | |
| tree | cc853764306298988eb21362060a0c9d08957376 /doc | |
| parent | [#3587] Updated kea-dhcp4 parser (diff) | |
| download | kea-9acfe8732f76ad81d18fb6e03dc16d5fd1b8045a.tar.xz kea-9acfe8732f76ad81d18fb6e03dc16d5fd1b8045a.zip | |
[#3587] Updated kea-dhcp6 parser
Changes to be committed:
doc/examples/kea6/all-keys.json
doc/examples/kea6/classify2.json
src/bin/admin/tests/mysql_tests.sh.in
src/bin/dhcp6/dhcp6_lexer.cc
src/bin/dhcp6/dhcp6_lexer.ll
src/bin/dhcp6/dhcp6_parser.cc
src/bin/dhcp6/dhcp6_parser.h
src/bin/dhcp6/dhcp6_parser.yy
src/bin/dhcp6/tests/config_parser_unittest.cc
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/examples/kea6/all-keys.json | 14 | ||||
| -rw-r--r-- | doc/examples/kea6/classify2.json | 4 |
2 files changed, 9 insertions, 9 deletions
diff --git a/doc/examples/kea6/all-keys.json b/doc/examples/kea6/all-keys.json index a3d19a3c7c..281627950c 100644 --- a/doc/examples/kea6/all-keys.json +++ b/doc/examples/kea6/all-keys.json @@ -67,10 +67,10 @@ // Boolean flag indicating whether the class expression is only evaluated // when the class is required, e.g. the selected address pool configuration - // includes this class name in its "require-client-classes" list. The + // includes this class name in its "evaluate-additional-classes" list. The // default value false means that the class test expression must // always be evaluated. - "only-if-required": true, + "only-in-additional-list": true, // Class selection expression. "test": "member('ALL')" @@ -901,7 +901,7 @@ // List of client classes which must be evaluated when this shared // network is selected for client assignments. - "require-client-classes": [ "late" ], + "evaluate-additional-classes": [ "late" ], // Turn off storage of extended information (e.g. relay agent // information) with each lease for this shared network. @@ -1043,7 +1043,7 @@ // List of client classes which must be evaluated // when this prefix pool is selected for client assignments. - "require-client-classes": [], + "evaluate-additional-classes": [], // PD-pool identifier used to enable statistics for this pd-pool. // The pd-pool ID does not need to be unique within the subnet @@ -1080,7 +1080,7 @@ // List of client classes which must be evaluated when this pool // is selected for client assignments. - "require-client-classes": [ "late" ] + "evaluate-additional-classes": [ "late" ] }, { // Restricts this pool to only be used for client @@ -1095,7 +1095,7 @@ // List of client classes which must be evaluated when this pool // is selected for client assignments. - "require-client-classes": [], + "evaluate-additional-classes": [], // Pool identifier used to enable statistics for this pool. // The pool ID does not need to be unique within the subnet @@ -1195,7 +1195,7 @@ // List of client classes which must be evaluated when this subnet // is selected for client assignments. - "require-client-classes": [ "late" ], + "evaluate-additional-classes": [ "late" ], // Subnet prefix. "subnet": "2001:db8::/32", diff --git a/doc/examples/kea6/classify2.json b/doc/examples/kea6/classify2.json index 78542f48ad..2d058ae516 100644 --- a/doc/examples/kea6/classify2.json +++ b/doc/examples/kea6/classify2.json @@ -30,7 +30,7 @@ // is not yet defined. { "name": "second_subnet", - "only-if-required": true, + "only-in-additional-list": true, "test": "member('ALL')", "option-data": [{ "name": "dns-servers", @@ -86,7 +86,7 @@ "client-classes": [ "cable-modems" ] } ], "interface": "eth0", - "require-client-classes": [ "second_subnet" ] + "evaluate-additional-classes": [ "second_subnet" ] }, // The following subnet contains a pool with a class constraint: only // clients which belong to the class are allowed to use this pool. |