diff options
| author | Christian Poessinger <christian@poessinger.com> | 2019-12-03 23:06:48 +0100 |
|---|---|---|
| committer | Christian Poessinger <christian@poessinger.com> | 2019-12-06 20:58:56 +0100 |
| commit | 6c51461bfe1e29ecc6ea84288d080330f974111d (patch) | |
| tree | 2819aab296a864e16d35d9a1f675b65702d6d8c9 /interface-definitions/include/vif-s.xml.i | |
| parent | 48d44c5471e991f07aa97e726e251efd91e03b72 (diff) | |
| download | vyos-1x-6c51461bfe1e29ecc6ea84288d080330f974111d.tar.gz vyos-1x-6c51461bfe1e29ecc6ea84288d080330f974111d.zip | |
T1843: use include files for DHCP/DHCPv6 options
As 219779b ("T1843: run interface-definitions though GCC preprocessor")
implemented the foundation of using the GCC preprocessor to make our XML
definitions more lightweight this commit transforms the configuration of DHCP/
DHCPv6 configuration options to this new style. It implementes it for the
following interface types:
* bonding
* bridge
* ethernet
* wireless
* vif/vif-s interfaces
Diffstat (limited to 'interface-definitions/include/vif-s.xml.i')
| -rw-r--r-- | interface-definitions/include/vif-s.xml.i | 86 |
1 files changed, 2 insertions, 84 deletions
diff --git a/interface-definitions/include/vif-s.xml.i b/interface-definitions/include/vif-s.xml.i index 8828aca13..51a68c859 100644 --- a/interface-definitions/include/vif-s.xml.i +++ b/interface-definitions/include/vif-s.xml.i @@ -17,48 +17,7 @@ <constraintErrorMessage>Interface description too long (limit 256 characters)</constraintErrorMessage>
</properties>
</leafNode>
- <node name="dhcp-options">
- <properties>
- <help>DHCP options</help>
- </properties>
- <children>
- <leafNode name="client-id">
- <properties>
- <help>DHCP client identifier</help>
- </properties>
- </leafNode>
- <leafNode name="host-name">
- <properties>
- <help>DHCP client host name (overrides the system host name)</help>
- </properties>
- </leafNode>
- <leafNode name="vendor-class-id">
- <properties>
- <help>DHCP client vendor type</help>
- </properties>
- </leafNode>
- </children>
- </node>
- <node name="dhcpv6-options">
- <properties>
- <help>DHCPv6 options</help>
- <priority>319</priority>
- </properties>
- <children>
- <leafNode name="parameters-only">
- <properties>
- <help>Acquire only config parameters, no address</help>
- <valueless/>
- </properties>
- </leafNode>
- <leafNode name="temporary">
- <properties>
- <help>IPv6 "temporary" address</help>
- <valueless/>
- </properties>
- </leafNode>
- </children>
- </node>
+ #include <include/dhcp-dhcpv6-options.xml.i>
<leafNode name="disable-link-detect">
<properties>
<help>Ignore link state changes</help>
@@ -135,48 +94,7 @@ <constraintErrorMessage>Interface description too long (limit 256 characters)</constraintErrorMessage>
</properties>
</leafNode>
- <node name="dhcp-options">
- <properties>
- <help>DHCP options</help>
- </properties>
- <children>
- <leafNode name="client-id">
- <properties>
- <help>DHCP client identifier</help>
- </properties>
- </leafNode>
- <leafNode name="host-name">
- <properties>
- <help>DHCP client host name (overrides the system host name)</help>
- </properties>
- </leafNode>
- <leafNode name="vendor-class-id">
- <properties>
- <help>DHCP client vendor type</help>
- </properties>
- </leafNode>
- </children>
- </node>
- <node name="dhcpv6-options">
- <properties>
- <help>DHCPv6 options</help>
- <priority>319</priority>
- </properties>
- <children>
- <leafNode name="parameters-only">
- <properties>
- <help>Acquire only config parameters, no address</help>
- <valueless/>
- </properties>
- </leafNode>
- <leafNode name="temporary">
- <properties>
- <help>IPv6 "temporary" address</help>
- <valueless/>
- </properties>
- </leafNode>
- </children>
- </node>
+ #include <include/dhcp-dhcpv6-options.xml.i>
<leafNode name="disable-link-detect">
<properties>
<help>Ignore link state changes</help>
|