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/include | |
| 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/include')
| -rw-r--r-- | interface-definitions/include/address-ipv4-ipv6-dhcp.xml.i | 29 | ||||
| -rw-r--r-- | interface-definitions/include/address-ipv4-ipv6.xml.i | 17 |
2 files changed, 46 insertions, 0 deletions
diff --git a/interface-definitions/include/address-ipv4-ipv6-dhcp.xml.i b/interface-definitions/include/address-ipv4-ipv6-dhcp.xml.i new file mode 100644 index 000000000..fb46f2c09 --- /dev/null +++ b/interface-definitions/include/address-ipv4-ipv6-dhcp.xml.i @@ -0,0 +1,29 @@ +<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> diff --git a/interface-definitions/include/address-ipv4-ipv6.xml.i b/interface-definitions/include/address-ipv4-ipv6.xml.i new file mode 100644 index 000000000..aa84a5640 --- /dev/null +++ b/interface-definitions/include/address-ipv4-ipv6.xml.i @@ -0,0 +1,17 @@ +<leafNode name="address"> + <properties> + <help>IP address</help> + <valueHelp> + <format>ipv4net</format> + <description>IPv4 address and prefix length</description> + </valueHelp> + <valueHelp> + <format>ipv6net</format> + <description>IPv6 address and prefix length</description> + </valueHelp> + <constraint> + <validator name="ip-cidr"/> + </constraint> + <multi/> + </properties> +</leafNode> |