mir/kea
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/kea synced 2025-09-01 06:25:34 +00:00
Code Issues Releases Wiki Activity

[master] Merge branch 'trac3772'

Browse Source
This commit is contained in:
Stephen Morris
2015-03-20 15:22:35 +00:00
parent dc31131a58 2fc94dcd70
commit e9f084525b
2 changed files with 44 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
doc/guide/dhcp4-srv.xml
View File

@@ -567,9 +567,11 @@ temporarily override a list of interface names and listen on all interfaces.
<screen> <screen>
"Dhcp4": { "Dhcp4": {
"subnet4": [ "subnet4": [
"subnet": "192.0.2.0/24", {
<userinput>"id": 1024</userinput>, "subnet": "192.0.2.0/24",
... <userinput>"id": 1024</userinput>,
...
}
] ]
} }
</screen> </screen>
@@ -594,22 +596,22 @@ temporarily override a list of interface names and listen on all interfaces.
<screen> <screen>
"Dhcp4": { "Dhcp4": {
<userinput>"subnet4": [ <userinput>"subnet4": [
"subnet": "192.0.2.0/24", {
"pools": [ "subnet": "192.0.2.0/24",
{ "pools": [
"pool": "192.0.2.10 - 192.0.2.20" { "pool": "192.0.2.10 - 192.0.2.20" }
} ],
]</userinput>, ...
... }
] ]</userinput>
}</screen> }</screen>
Note that subnet is defined as a simple string, but the 'pools' parameter is Note that subnet is defined as a simple string, but the <command>pools</command> parameter is
actually a list of pools: for this reason, the pool definition is enclosed actually a list of pools: for this reason, the pools definition is enclosed
in square brackets, even though only one range of addresses is in square brackets, even though only one range of addresses is
specified in this example.</para> specified in this example.</para>
<para>Each <command>pool</command> is a structure that contains the parameters <para>Each pool is a structure that contains the parameters
that describe a single pool. Currently there is only one parameter, that describe a single pool. Currently there is only one parameter,
<command>pool</command>, which gives the range of addresses <command>pool</command>, which gives the range of addresses
in the pool. Additional parameters will be added in future in the pool. Additional parameters will be added in future
@@ -624,11 +626,14 @@ temporarily override a list of interface names and listen on all interfaces.
<screen> <screen>
"Dhcp4": { "Dhcp4": {
"subnet4": [ "subnet4": [
<userinput>"pools": [ {
{ "pool": "192.0.2.10-192.0.2.20" }, "subnet": "192.0.2.0/24",
{ "pool": "192.0.2.64/26" } <userinput>"pools": [
]</userinput>, { "pool": "192.0.2.10-192.0.2.20" },
... { "pool": "192.0.2.64/26" }
]</userinput>,
...
}
], ],
... ...
} }
@@ -1125,7 +1130,7 @@ temporarily override a list of interface names and listen on all interfaces.
"Dhcp4": { "Dhcp4": {
"option-data": [ "option-data": [
{ {
<userinput>"name": "foo" <userinput>"name": "foo",
"space": "vendor-encapsulated-options-space", "space": "vendor-encapsulated-options-space",
"code": 1, "code": 1,
"csv-format": true, "csv-format": true,
@@ -1140,7 +1145,7 @@ temporarily override a list of interface names and listen on all interfaces.
"Dhcp4": { "Dhcp4": {
"option-data": [ "option-data": [
{ {
<userinput>"name": "vendor-encapsulated-options" <userinput>"name": "vendor-encapsulated-options",
"space": "dhcp4", "space": "dhcp4",
"code": 43, "code": 43,
"csv-format": false, "csv-format": false,
@@ -1189,7 +1194,7 @@ temporarily override a list of interface names and listen on all interfaces.
<userinput>"name": "subopt1", <userinput>"name": "subopt1",
"code": 1, "code": 1,
"space": "isc", "space": "isc",
"type": "ipv4-address". "type": "ipv4-address",
"record-types": "", "record-types": "",
"array": false, "array": false,
"encapsulate "" "encapsulate ""
@@ -1200,7 +1205,7 @@ temporarily override a list of interface names and listen on all interfaces.
"space": "isc", "space": "isc",
"type": "string", "type": "string",
"record-types": "", "record-types": "",
"array": false "array": false,
"encapsulate": ""</userinput> "encapsulate": ""</userinput>
} }
], ],
@@ -1903,12 +1908,12 @@ temporarily override a list of interface names and listen on all interfaces.
"Dhcp4": { "Dhcp4": {
<userinput>"next-server": "192.0.2.123"</userinput>, <userinput>"next-server": "192.0.2.123"</userinput>,
..., ...,
"subnet4": { "subnet4": [
[ {
<userinput>"next-server": "192.0.2.234"</userinput>, <userinput>"next-server": "192.0.2.234"</userinput>,
... ...
] }
} ]
} }
</screen> </screen>
</section> </section>
@@ -2253,9 +2258,11 @@ temporarily override a list of interface names and listen on all interfaces.
<screen> <screen>
"Dhcp4": { "Dhcp4": {
"subnet4": [ "subnet4": [
{
"subnet": "192.0.2.0/24", "subnet": "192.0.2.0/24",
<userinput>"reservation-mode": "disabled"</userinput>, <userinput>"reservation-mode": "disabled"</userinput>,
... ...
}
] ]
} }
</screen> </screen>

16
doc/guide/dhcp6-srv.xml
View File

@@ -480,9 +480,11 @@ temporarily override a list of interface names and listen on all interfaces.
<screen> <screen>
"Dhcp6": { "Dhcp6": {
"subnet6": [ "subnet6": [
"subnet": "2001:db8:1::/64", {
<userinput>"id": 1024</userinput>, "subnet": "2001:db8:1::/64",
... <userinput>"id": 1024</userinput>,
...
}
] ]
} }
</screen> </screen>
@@ -1044,7 +1046,7 @@ temporarily override a list of interface names and listen on all interfaces.
"Dhcp6": { "Dhcp6": {
"option-data": [ "option-data": [
{ {
<userinput>"name": "foo" <userinput>"name": "foo",
"space": "vendor-encapsulated-options-space", "space": "vendor-encapsulated-options-space",
"code": 1, "code": 1,
"csv-format": true, "csv-format": true,
@@ -1061,7 +1063,7 @@ temporarily override a list of interface names and listen on all interfaces.
"option-data": [ "option-data": [
..., ...,
{ {
<userinput>"name": "vendor-encapsulated-options" <userinput>"name": "vendor-encapsulated-options",
"space": "dhcp6", "space": "dhcp6",
"code": 17, "code": 17,
"csv-format": true, "csv-format": true,
@@ -1098,7 +1100,7 @@ temporarily override a list of interface names and listen on all interfaces.
<userinput>"name": "subopt1", <userinput>"name": "subopt1",
"code": 1, "code": 1,
"space": "isc", "space": "isc",
"type": "ipv6-address". "type": "ipv6-address",
"record-types": "", "record-types": "",
"array": false, "array": false,
"encapsulate": ""</userinput> "encapsulate": ""</userinput>
@@ -2197,9 +2199,11 @@ should include options from the isc option space:
<screen> <screen>
"Dhcp6": { "Dhcp6": {
"subnet6": [ "subnet6": [
{
"subnet": "2001:db8:1::/64", "subnet": "2001:db8:1::/64",
<userinput>"reservation-mode": "disabled"</userinput>, <userinput>"reservation-mode": "disabled"</userinput>,
... ...
}
] ]
} }
</screen> </screen>