diff options
| author | Christian Poessinger <christian@poessinger.com> | 2020-08-23 01:16:47 +0200 |
|---|---|---|
| committer | Christian Poessinger <christian@poessinger.com> | 2020-08-23 01:16:47 +0200 |
| commit | 1896eed01b0da55ed9a6740ad78673cfe207dc9d (patch) | |
| tree | 35965564b3162732545b43ab25e4d2ae55e40743 /interface-definitions/include | |
| parent | 50a7544ad69cb7b631a499299f9ab32b2e8918a0 (diff) | |
| parent | a574a01ab5c02aeb90c6d099dce482c1bf8be096 (diff) | |
| download | vyos-1x-1896eed01b0da55ed9a6740ad78673cfe207dc9d.tar.gz vyos-1x-1896eed01b0da55ed9a6740ad78673cfe207dc9d.zip | |
Merge branch 'dhcpv6-pd-cli-adjustment' of github.com:c-po/vyos-1x into current
* 'dhcpv6-pd-cli-adjustment' of github.com:c-po/vyos-1x:
dhcpv6-pd: T2677: add support for rapid-commit option
dhcpv6-pd: T2821: support dhcpv6-pd without "address dhcpv6"
ifconfig: T2653: drop unused vyos.ifconfig.pppoe
dhcpv6-pd: T2677: optimize CLI interface for PD configuration
Diffstat (limited to 'interface-definitions/include')
| -rw-r--r-- | interface-definitions/include/dhcp-options.xml.i | 2 | ||||
| -rw-r--r-- | interface-definitions/include/dhcpv6-options.xml.i | 40 |
2 files changed, 22 insertions, 20 deletions
diff --git a/interface-definitions/include/dhcp-options.xml.i b/interface-definitions/include/dhcp-options.xml.i index 0f71d9321..9989291fc 100644 --- a/interface-definitions/include/dhcp-options.xml.i +++ b/interface-definitions/include/dhcp-options.xml.i @@ -1,6 +1,6 @@ <node name="dhcp-options"> <properties> - <help>DHCP options</help> + <help>DHCP client settings/options</help> </properties> <children> <leafNode name="client-id"> diff --git a/interface-definitions/include/dhcpv6-options.xml.i b/interface-definitions/include/dhcpv6-options.xml.i index 98a87dba2..b0a806806 100644 --- a/interface-definitions/include/dhcpv6-options.xml.i +++ b/interface-definitions/include/dhcpv6-options.xml.i @@ -1,11 +1,24 @@ <node name="dhcpv6-options"> <properties> - <help>DHCPv6 options</help> + <help>DHCPv6 client settings/options</help> </properties> <children> - <node name="prefix-delegation"> + <leafNode name="parameters-only"> <properties> - <help>DHCPv6 Prefix Delegation Options</help> + <help>Acquire only config parameters, no address</help> + <valueless/> + </properties> + </leafNode> + <tagNode name="pd"> + <properties> + <help>DHCPv6 prefix delegation interface statement</help> + <valueHelp> + <format>instance number</format> + <description>Prefix delegation instance (>= 0)</description> + </valueHelp> + <constraint> + <validator name="numeric" argument="--non-negative"/> + </constraint> </properties> <children> <leafNode name="length"> @@ -19,6 +32,7 @@ <validator name="numeric" argument="--range 32-64"/> </constraint> </properties> + <defaultValue>64</defaultValue> </leafNode> <tagNode name="interface"> <properties> @@ -52,31 +66,19 @@ </constraint> </properties> </leafNode> - <leafNode name="sla-len"> - <properties> - <help>Site-Level aggregator (SLA) length</help> - <valueHelp> - <format>0-128</format> - <description>Length of delegated prefix</description> - </valueHelp> - <constraint> - <validator name="numeric" argument="--range 0-128"/> - </constraint> - </properties> - </leafNode> </children> </tagNode> </children> - </node> - <leafNode name="parameters-only"> + </tagNode> + <leafNode name="rapid-commit"> <properties> - <help>Acquire only config parameters, no address</help> + <help>Wait for immediate reply instead of advertisements</help> <valueless/> </properties> </leafNode> <leafNode name="temporary"> <properties> - <help>IPv6 "temporary" address</help> + <help>IPv6 temporary address</help> <valueless/> </properties> </leafNode> |