diff options
| author | Christian Poessinger <christian@poessinger.com> | 2019-12-03 22:25:43 +0100 |
|---|---|---|
| committer | Christian Poessinger <christian@poessinger.com> | 2019-12-06 20:58:56 +0100 |
| commit | 939c7c16a5add4443aebc37a55c2a33e4fccb8d0 (patch) | |
| tree | 22048cc7ba4b40beeeb9cc314cb6df5c932a4ab1 /interface-definitions/interfaces-bridge.xml.in | |
| parent | 0d4d4dd840e06c18250d73f27de61261ff141944 (diff) | |
| download | vyos-1x-939c7c16a5add4443aebc37a55c2a33e4fccb8d0.tar.gz vyos-1x-939c7c16a5add4443aebc37a55c2a33e4fccb8d0.zip | |
T1843: use include files for IPv4/IPv6 interface address configuration
As 219779bc6151 ("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
an IPv4/IPv6 address to this new style. It implementes it for the following
interface types:
* bond
* bridge
* dummy
* ethernet
* geneve
* loopback
* vxlan
* wireguard
* wireless
Diffstat (limited to 'interface-definitions/interfaces-bridge.xml.in')
| -rw-r--r-- | interface-definitions/interfaces-bridge.xml.in | 30 |
1 files changed, 1 insertions, 29 deletions
diff --git a/interface-definitions/interfaces-bridge.xml.in b/interface-definitions/interfaces-bridge.xml.in index 40505d7de..4dbfa7d91 100644 --- a/interface-definitions/interfaces-bridge.xml.in +++ b/interface-definitions/interfaces-bridge.xml.in @@ -16,35 +16,7 @@ </valueHelp> </properties> <children> - <leafNode name="address"> - <properties> - <help>IP address</help> - <completionHelp> - <list>dhcp dhcpv6</list> - </completionHelp> - <valueHelp> - <format>ipv4net</format> - <description>IPv4 address and prefix length</description> - </valueHelp> - <valueHelp> - <format>ipv6net</format> - <description>IPv6 address and prefix length</description> - </valueHelp> - <valueHelp> - <format>dhcp</format> - <description>Dynamic Host Configuration Protocol</description> - </valueHelp> - <valueHelp> - <format>dhcpv6</format> - <description>Dynamic Host Configuration Protocol for IPv6</description> - </valueHelp> - <constraint> - <validator name="ip-cidr"/> - <regex>(dhcp|dhcpv6)</regex> - </constraint> - <multi/> - </properties> - </leafNode> + #include "include/address-ipv4-ipv6-dhcp.xml.i" <leafNode name="aging"> <properties> <help>MAC address aging interval</help> |