From 0d4d4dd840e06c18250d73f27de61261ff141944 Mon Sep 17 00:00:00 2001 From: Christian Poessinger Date: Tue, 3 Dec 2019 22:01:19 +0100 Subject: T1843: run interface-definitions though GCC preprocessor A lot of XML code is duplicated (VLAN, interface address) for instance. Such XML definitions should be moved to feature.xml.i files and then just pulled in via GCC preprocessor #include definition in e.g. bond or ethernet definitions. This will give us the ability to single-source repeating node definitions as: * Interface Address * Interface Description * Interface Disable * VLAN (both vif-s and vif-c) The .in suffix of the interface-definitions is a marker that those files are input files to the GCC preprocessor. They will be rendered into proper XML files in the build directory. Some node definitions have been reworder to remove escaped double quote occurances which would have been warned about by the GCC preprocessor. --- interface-definitions/interfaces-vxlan.xml.in | 151 ++++++++++++++++++++++++++ 1 file changed, 151 insertions(+) create mode 100644 interface-definitions/interfaces-vxlan.xml.in (limited to 'interface-definitions/interfaces-vxlan.xml.in') diff --git a/interface-definitions/interfaces-vxlan.xml.in b/interface-definitions/interfaces-vxlan.xml.in new file mode 100644 index 000000000..f93711741 --- /dev/null +++ b/interface-definitions/interfaces-vxlan.xml.in @@ -0,0 +1,151 @@ + + + + + + + Virtual extensible LAN interface (VXLAN) + 460 + + vxlan[0-9]+$ + + VXLAN interface must be named vxlanN + + vxlanN + VXLAN interface name + + + + + + IP address + + ipv4net + IPv4 address and prefix length + + + ipv6net + IPv6 address and prefix length + + + + + + + + + + Interface description + + ^.{1,256}$ + + Interface description too long (limit 256 characters) + + + + + Disable interface + + + + + + Multicast group address for VXLAN interface + + ipv4 + Multicast group address + + + + + + + + + + + ARP cache entry timeout in seconds + + 1-86400 + ARP cache entry timout in seconds (default 30) + + + + + ARP cache entry timeout must be between 1 and 86400 seconds + + + + + Enable proxy-arp on this interface + + + + + + + + Underlay device of VXLAN interface + + interface + Interface used for VXLAN underlay + + + + + + + + + Maximum Transmission Unit (MTU) + + 1450-9000 + Maximum Transmission Unit + + + + + MTU must be between 1450 and 9000 + + + + + Remote address of VXLAN tunnel + + ipv4 + Remote address of VXLAN tunnel + + + + + + + + + Destination port of VXLAN tunnel (default: 8472) + + 1-65535 + Numeric IP port + + + + + + + + + Virtual Network Identifier + + 0-16777214 + VXLAN virtual network identifier + + + + + + + + + + + -- cgit v1.2.3 From 939c7c16a5add4443aebc37a55c2a33e4fccb8d0 Mon Sep 17 00:00:00 2001 From: Christian Poessinger Date: Tue, 3 Dec 2019 22:25:43 +0100 Subject: 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 --- .../include/address-ipv4-ipv6-dhcp.xml.i | 29 +++++++++++++++++++++ .../include/address-ipv4-ipv6.xml.i | 17 ++++++++++++ interface-definitions/interfaces-bonding.xml.in | 30 +--------------------- interface-definitions/interfaces-bridge.xml.in | 30 +--------------------- interface-definitions/interfaces-dummy.xml.in | 18 +------------ interface-definitions/interfaces-ethernet.xml.in | 30 +--------------------- interface-definitions/interfaces-geneve.xml.in | 18 +------------ interface-definitions/interfaces-loopback.xml.in | 15 +---------- interface-definitions/interfaces-vxlan.xml.in | 18 +------------ interface-definitions/interfaces-wireguard.xml.in | 18 +------------ interface-definitions/interfaces-wireless.xml.in | 30 +--------------------- 11 files changed, 55 insertions(+), 198 deletions(-) create mode 100644 interface-definitions/include/address-ipv4-ipv6-dhcp.xml.i create mode 100644 interface-definitions/include/address-ipv4-ipv6.xml.i (limited to 'interface-definitions/interfaces-vxlan.xml.in') 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 @@ + + + IP address + + dhcp dhcpv6 + + + ipv4net + IPv4 address and prefix length + + + ipv6net + IPv6 address and prefix length + + + dhcp + Dynamic Host Configuration Protocol + + + dhcpv6 + Dynamic Host Configuration Protocol for IPv6 + + + + (dhcp|dhcpv6) + + + + 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 @@ + + + IP address + + ipv4net + IPv4 address and prefix length + + + ipv6net + IPv6 address and prefix length + + + + + + + diff --git a/interface-definitions/interfaces-bonding.xml.in b/interface-definitions/interfaces-bonding.xml.in index 821dd15fa..12df69364 100644 --- a/interface-definitions/interfaces-bonding.xml.in +++ b/interface-definitions/interfaces-bonding.xml.in @@ -16,35 +16,7 @@ - - - IP address - - dhcp dhcpv6 - - - ipv4net - IPv4 address and prefix length - - - ipv6net - IPv6 address and prefix length - - - dhcp - Dynamic Host Configuration Protocol - - - dhcpv6 - Dynamic Host Configuration Protocol for IPv6 - - - - (dhcp|dhcpv6) - - - - + #include "include/address-ipv4-ipv6-dhcp.xml.i" ARP link monitoring parameters 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 @@ - - - IP address - - dhcp dhcpv6 - - - ipv4net - IPv4 address and prefix length - - - ipv6net - IPv6 address and prefix length - - - dhcp - Dynamic Host Configuration Protocol - - - dhcpv6 - Dynamic Host Configuration Protocol for IPv6 - - - - (dhcp|dhcpv6) - - - - + #include "include/address-ipv4-ipv6-dhcp.xml.i" MAC address aging interval diff --git a/interface-definitions/interfaces-dummy.xml.in b/interface-definitions/interfaces-dummy.xml.in index 3bc4330e4..a253bfe81 100644 --- a/interface-definitions/interfaces-dummy.xml.in +++ b/interface-definitions/interfaces-dummy.xml.in @@ -16,23 +16,7 @@ - - - IP address - - ipv4net - IPv4 address and prefix length - - - ipv6net - IPv6 address and prefix length - - - - - - - + #include "include/address-ipv4-ipv6.xml.i" Interface description diff --git a/interface-definitions/interfaces-ethernet.xml.in b/interface-definitions/interfaces-ethernet.xml.in index 2c89c3604..92cfcd2c2 100644 --- a/interface-definitions/interfaces-ethernet.xml.in +++ b/interface-definitions/interfaces-ethernet.xml.in @@ -20,35 +20,7 @@ - - - IP address - - dhcp dhcpv6 - - - ipv4net - IPv4 address and prefix length - - - ipv6net - IPv6 address and prefix length - - - dhcp - Dynamic Host Configuration Protocol - - - dhcpv6 - Dynamic Host Configuration Protocol for IPv6 - - - - (dhcp|dhcpv6) - - - - + #include "include/address-ipv4-ipv6-dhcp.xml.i" Interface description diff --git a/interface-definitions/interfaces-geneve.xml.in b/interface-definitions/interfaces-geneve.xml.in index e65ce6826..7b27c46f3 100644 --- a/interface-definitions/interfaces-geneve.xml.in +++ b/interface-definitions/interfaces-geneve.xml.in @@ -16,23 +16,7 @@ - - - IP address - - ipv4net - IPv4 address and prefix length - - - ipv6net - IPv6 address and prefix length - - - - - - - + #include "include/address-ipv4-ipv6.xml.i" Interface description diff --git a/interface-definitions/interfaces-loopback.xml.in b/interface-definitions/interfaces-loopback.xml.in index 0f003bc64..074a5c7cb 100644 --- a/interface-definitions/interfaces-loopback.xml.in +++ b/interface-definitions/interfaces-loopback.xml.in @@ -16,20 +16,7 @@ - - - IP address - - ipv4net - IPv4 address and prefix length - - - ipv6net - IPv6 address and prefix length - - - - + #include "include/address-ipv4-ipv6.xml.i" Interface description diff --git a/interface-definitions/interfaces-vxlan.xml.in b/interface-definitions/interfaces-vxlan.xml.in index f93711741..7cc6cd35a 100644 --- a/interface-definitions/interfaces-vxlan.xml.in +++ b/interface-definitions/interfaces-vxlan.xml.in @@ -16,23 +16,7 @@ - - - IP address - - ipv4net - IPv4 address and prefix length - - - ipv6net - IPv6 address and prefix length - - - - - - - + #include "include/address-ipv4-ipv6.xml.i" Interface description diff --git a/interface-definitions/interfaces-wireguard.xml.in b/interface-definitions/interfaces-wireguard.xml.in index 0c32a3bc1..dd19d4ec0 100644 --- a/interface-definitions/interfaces-wireguard.xml.in +++ b/interface-definitions/interfaces-wireguard.xml.in @@ -17,23 +17,7 @@ - - - IP address - - - - - ipv4net - IPv4 address and prefix length - - - ipv6net - IPv6 address and prefix length - - - - + #include "include/address-ipv4-ipv6.xml.i" description diff --git a/interface-definitions/interfaces-wireless.xml.in b/interface-definitions/interfaces-wireless.xml.in index 6bc49dddb..d8779cf72 100644 --- a/interface-definitions/interfaces-wireless.xml.in +++ b/interface-definitions/interfaces-wireless.xml.in @@ -16,35 +16,7 @@ - - - IP address - - dhcp dhcpv6 - - - ipv4net - IPv4 address and prefix length - - - ipv6net - IPv6 address and prefix length - - - dhcp - Dynamic Host Configuration Protocol - - - dhcpv6 - Dynamic Host Configuration Protocol for IPv6 - - - - (dhcp|dhcpv6) - - - - + #include "include/address-ipv4-ipv6-dhcp.xml.i" HT and VHT capabilities for your card -- cgit v1.2.3 From 48d44c5471e991f07aa97e726e251efd91e03b72 Mon Sep 17 00:00:00 2001 From: Christian Poessinger Date: Tue, 3 Dec 2019 22:40:11 +0100 Subject: T1843: recursively include IP address definitions in VIF/VIF-S definitions --- interface-definitions/include/vif-s.xml.i | 60 +---------------------- interface-definitions/include/vif.xml.i | 30 +----------- interface-definitions/interfaces-bonding.xml.in | 6 +-- interface-definitions/interfaces-bridge.xml.in | 2 +- interface-definitions/interfaces-dummy.xml.in | 2 +- interface-definitions/interfaces-ethernet.xml.in | 6 +-- interface-definitions/interfaces-geneve.xml.in | 2 +- interface-definitions/interfaces-loopback.xml.in | 2 +- interface-definitions/interfaces-vxlan.xml.in | 2 +- interface-definitions/interfaces-wireguard.xml.in | 2 +- interface-definitions/interfaces-wireless.xml.in | 4 +- 11 files changed, 17 insertions(+), 101 deletions(-) (limited to 'interface-definitions/interfaces-vxlan.xml.in') diff --git a/interface-definitions/include/vif-s.xml.i b/interface-definitions/include/vif-s.xml.i index 9726e9156..8828aca13 100644 --- a/interface-definitions/include/vif-s.xml.i +++ b/interface-definitions/include/vif-s.xml.i @@ -7,35 +7,7 @@ VLAN ID must be between 0 and 4094 - - - IP address - - dhcp dhcpv6 - - - ipv4net - IPv4 address and prefix length - - - ipv6net - IPv6 address and prefix length - - - dhcp - Dynamic Host Configuration Protocol - - - dhcpv6 - Dynamic Host Configuration Protocol for IPv6 - - - - (dhcp|dhcpv6) - - - - + #include Interface description @@ -153,35 +125,7 @@ VLAN ID must be between 0 and 4094 - - - IP address - - dhcp dhcpv6 - - - ipv4net - IPv4 address and prefix length - - - ipv6net - IPv6 address and prefix length - - - dhcp - Dynamic Host Configuration Protocol - - - dhcpv6 - Dynamic Host Configuration Protocol for IPv6 - - - - (dhcp|dhcpv6) - - - - + #include Interface description diff --git a/interface-definitions/include/vif.xml.i b/interface-definitions/include/vif.xml.i index c6268dbe5..489107ece 100644 --- a/interface-definitions/include/vif.xml.i +++ b/interface-definitions/include/vif.xml.i @@ -11,35 +11,7 @@ VLAN ID must be between 0 and 4094 - - - IP address - - dhcp dhcpv6 - - - ipv4net - IPv4 address and prefix length - - - ipv6net - IPv6 address and prefix length - - - dhcp - Dynamic Host Configuration Protocol - - - dhcpv6 - Dynamic Host Configuration Protocol for IPv6 - - - - (dhcp|dhcpv6) - - - - + #include Interface description diff --git a/interface-definitions/interfaces-bonding.xml.in b/interface-definitions/interfaces-bonding.xml.in index 2f32c7263..f24577100 100644 --- a/interface-definitions/interfaces-bonding.xml.in +++ b/interface-definitions/interfaces-bonding.xml.in @@ -16,7 +16,7 @@ - #include "include/address-ipv4-ipv6-dhcp.xml.i" + #include ARP link monitoring parameters @@ -254,8 +254,8 @@ - #include "include/vif-s.xml.i" - #include "include/vif.xml.i" + #include + #include diff --git a/interface-definitions/interfaces-bridge.xml.in b/interface-definitions/interfaces-bridge.xml.in index 4dbfa7d91..e255e3879 100644 --- a/interface-definitions/interfaces-bridge.xml.in +++ b/interface-definitions/interfaces-bridge.xml.in @@ -16,7 +16,7 @@ - #include "include/address-ipv4-ipv6-dhcp.xml.i" + #include MAC address aging interval diff --git a/interface-definitions/interfaces-dummy.xml.in b/interface-definitions/interfaces-dummy.xml.in index a253bfe81..dfbbb8b36 100644 --- a/interface-definitions/interfaces-dummy.xml.in +++ b/interface-definitions/interfaces-dummy.xml.in @@ -16,7 +16,7 @@ - #include "include/address-ipv4-ipv6.xml.i" + #include Interface description diff --git a/interface-definitions/interfaces-ethernet.xml.in b/interface-definitions/interfaces-ethernet.xml.in index fee17840c..6bf72defa 100644 --- a/interface-definitions/interfaces-ethernet.xml.in +++ b/interface-definitions/interfaces-ethernet.xml.in @@ -20,7 +20,7 @@ - #include "include/address-ipv4-ipv6-dhcp.xml.i" + #include Interface description @@ -368,8 +368,8 @@ Speed must be auto, 10, 100, 1000, 2500, 5000, 10000, 25000, 40000, 50000 or 100000 - #include "include/vif-s.xml.i" - #include "include/vif.xml.i" + #include + #include diff --git a/interface-definitions/interfaces-geneve.xml.in b/interface-definitions/interfaces-geneve.xml.in index 7b27c46f3..28e3d6aa6 100644 --- a/interface-definitions/interfaces-geneve.xml.in +++ b/interface-definitions/interfaces-geneve.xml.in @@ -16,7 +16,7 @@ - #include "include/address-ipv4-ipv6.xml.i" + #include Interface description diff --git a/interface-definitions/interfaces-loopback.xml.in b/interface-definitions/interfaces-loopback.xml.in index 074a5c7cb..0f1e4097a 100644 --- a/interface-definitions/interfaces-loopback.xml.in +++ b/interface-definitions/interfaces-loopback.xml.in @@ -16,7 +16,7 @@ - #include "include/address-ipv4-ipv6.xml.i" + #include Interface description diff --git a/interface-definitions/interfaces-vxlan.xml.in b/interface-definitions/interfaces-vxlan.xml.in index 7cc6cd35a..070bfb87b 100644 --- a/interface-definitions/interfaces-vxlan.xml.in +++ b/interface-definitions/interfaces-vxlan.xml.in @@ -16,7 +16,7 @@ - #include "include/address-ipv4-ipv6.xml.i" + #include Interface description diff --git a/interface-definitions/interfaces-wireguard.xml.in b/interface-definitions/interfaces-wireguard.xml.in index dd19d4ec0..b6bc3e6e8 100644 --- a/interface-definitions/interfaces-wireguard.xml.in +++ b/interface-definitions/interfaces-wireguard.xml.in @@ -17,7 +17,7 @@ - #include "include/address-ipv4-ipv6.xml.i" + #include description diff --git a/interface-definitions/interfaces-wireless.xml.in b/interface-definitions/interfaces-wireless.xml.in index 4d7e5735a..d876a76af 100644 --- a/interface-definitions/interfaces-wireless.xml.in +++ b/interface-definitions/interfaces-wireless.xml.in @@ -16,7 +16,7 @@ - #include "include/address-ipv4-ipv6-dhcp.xml.i" + #include HT and VHT capabilities for your card @@ -815,7 +815,7 @@ Type must be access-point, station or monitor - #include "include/vif.xml.i" + #include -- cgit v1.2.3 From 85349b54ab4de42f81d4c8c4dc84901d1313025f Mon Sep 17 00:00:00 2001 From: Christian Poessinger Date: Fri, 6 Dec 2019 17:53:27 +0100 Subject: T1843: use include files for interface description --- .../include/interface-description.xml.i | 9 +++++++++ interface-definitions/include/vif-s.xml.i | 20 ++------------------ interface-definitions/include/vif.xml.i | 10 +--------- interface-definitions/interfaces-bonding.xml.in | 10 +--------- interface-definitions/interfaces-bridge.xml.in | 10 +--------- interface-definitions/interfaces-dummy.xml.in | 10 +--------- interface-definitions/interfaces-ethernet.xml.in | 10 +--------- interface-definitions/interfaces-geneve.xml.in | 10 +--------- interface-definitions/interfaces-loopback.xml.in | 10 +--------- interface-definitions/interfaces-openvpn.xml.in | 6 +----- interface-definitions/interfaces-vxlan.xml.in | 10 +--------- interface-definitions/interfaces-wireguard.xml.in | 10 +--------- interface-definitions/interfaces-wireless.xml.in | 10 +--------- 13 files changed, 22 insertions(+), 113 deletions(-) create mode 100644 interface-definitions/include/interface-description.xml.i (limited to 'interface-definitions/interfaces-vxlan.xml.in') diff --git a/interface-definitions/include/interface-description.xml.i b/interface-definitions/include/interface-description.xml.i new file mode 100644 index 000000000..6356888da --- /dev/null +++ b/interface-definitions/include/interface-description.xml.i @@ -0,0 +1,9 @@ + + + Interface description + + ^.{1,256}$ + + Interface description too long (limit 256 characters) + + diff --git a/interface-definitions/include/vif-s.xml.i b/interface-definitions/include/vif-s.xml.i index 51a68c859..ffb9de24a 100644 --- a/interface-definitions/include/vif-s.xml.i +++ b/interface-definitions/include/vif-s.xml.i @@ -8,15 +8,7 @@ #include - - - Interface description - - ^.{1,256}$ - - Interface description too long (limit 256 characters) - - + #include #include @@ -85,15 +77,7 @@ #include - - - Interface description - - ^.{1,256}$ - - Interface description too long (limit 256 characters) - - + #include #include diff --git a/interface-definitions/include/vif.xml.i b/interface-definitions/include/vif.xml.i index 0cc3d3dc8..d9b5cfe34 100644 --- a/interface-definitions/include/vif.xml.i +++ b/interface-definitions/include/vif.xml.i @@ -12,15 +12,7 @@ #include - - - Interface description - - ^.{1,256}$ - - Interface description too long (limit 256 characters) - - + #include #include diff --git a/interface-definitions/interfaces-bonding.xml.in b/interface-definitions/interfaces-bonding.xml.in index b43e7c489..6a82ddd91 100644 --- a/interface-definitions/interfaces-bonding.xml.in +++ b/interface-definitions/interfaces-bonding.xml.in @@ -49,15 +49,7 @@ - - - Interface description - - ^.{1,256}$ - - Interface description too long (limit 256 characters) - - + #include #include diff --git a/interface-definitions/interfaces-bridge.xml.in b/interface-definitions/interfaces-bridge.xml.in index 154f47686..8bac2f244 100644 --- a/interface-definitions/interfaces-bridge.xml.in +++ b/interface-definitions/interfaces-bridge.xml.in @@ -33,15 +33,7 @@ - - - Interface description - - ^.{1,256}$ - - Interface description too long (limit 256 characters) - - + #include #include diff --git a/interface-definitions/interfaces-dummy.xml.in b/interface-definitions/interfaces-dummy.xml.in index dfbbb8b36..db1afd803 100644 --- a/interface-definitions/interfaces-dummy.xml.in +++ b/interface-definitions/interfaces-dummy.xml.in @@ -17,15 +17,7 @@ #include - - - Interface description - - ^.{1,256}$ - - Interface description too long (limit 256 characters) - - + #include Disable interface diff --git a/interface-definitions/interfaces-ethernet.xml.in b/interface-definitions/interfaces-ethernet.xml.in index 37836dbc0..293c147d8 100644 --- a/interface-definitions/interfaces-ethernet.xml.in +++ b/interface-definitions/interfaces-ethernet.xml.in @@ -21,15 +21,7 @@ #include - - - Interface description - - ^.{1,256}$ - - Interface description too long (limit 256 characters) - - + #include #include diff --git a/interface-definitions/interfaces-geneve.xml.in b/interface-definitions/interfaces-geneve.xml.in index 28e3d6aa6..3fbafd2ec 100644 --- a/interface-definitions/interfaces-geneve.xml.in +++ b/interface-definitions/interfaces-geneve.xml.in @@ -17,15 +17,7 @@ #include - - - Interface description - - ^.{1,256}$ - - Interface description too long (limit 256 characters) - - + #include Disable interface diff --git a/interface-definitions/interfaces-loopback.xml.in b/interface-definitions/interfaces-loopback.xml.in index 0f1e4097a..007a0f189 100644 --- a/interface-definitions/interfaces-loopback.xml.in +++ b/interface-definitions/interfaces-loopback.xml.in @@ -17,15 +17,7 @@ #include - - - Interface description - - ^.{1,256}$ - - Interface description too long (limit 256 characters) - - + #include diff --git a/interface-definitions/interfaces-openvpn.xml.in b/interface-definitions/interfaces-openvpn.xml.in index ca97ad4ec..d08dba78a 100644 --- a/interface-definitions/interfaces-openvpn.xml.in +++ b/interface-definitions/interfaces-openvpn.xml.in @@ -33,11 +33,7 @@ - - - Description - - + #include OpenVPN interface device-type diff --git a/interface-definitions/interfaces-vxlan.xml.in b/interface-definitions/interfaces-vxlan.xml.in index 070bfb87b..9434c2f5a 100644 --- a/interface-definitions/interfaces-vxlan.xml.in +++ b/interface-definitions/interfaces-vxlan.xml.in @@ -17,15 +17,7 @@ #include - - - Interface description - - ^.{1,256}$ - - Interface description too long (limit 256 characters) - - + #include Disable interface diff --git a/interface-definitions/interfaces-wireguard.xml.in b/interface-definitions/interfaces-wireguard.xml.in index b6bc3e6e8..ef0b643bb 100644 --- a/interface-definitions/interfaces-wireguard.xml.in +++ b/interface-definitions/interfaces-wireguard.xml.in @@ -18,15 +18,7 @@ #include - - - description - - ^.{1,100}$ - - interface description is too long (limit 100 characters) - - + #include disables interface diff --git a/interface-definitions/interfaces-wireless.xml.in b/interface-definitions/interfaces-wireless.xml.in index b45774890..65ad14228 100644 --- a/interface-definitions/interfaces-wireless.xml.in +++ b/interface-definitions/interfaces-wireless.xml.in @@ -445,15 +445,7 @@ - - - Interface description - - .{1,256}$ - - Interface description too long (limit 256 characters) - - + #include #include -- cgit v1.2.3 From 9b116825b44ca1611976e0807f9bf22a38ca6812 Mon Sep 17 00:00:00 2001 From: Christian Poessinger Date: Fri, 6 Dec 2019 17:58:56 +0100 Subject: T1843: use include files to disable interface (admin down) --- interface-definitions/include/interface-disable.xml.i | 6 ++++++ interface-definitions/include/vif-s.xml.i | 14 ++------------ interface-definitions/include/vif.xml.i | 7 +------ interface-definitions/interfaces-bonding.xml.in | 7 +------ interface-definitions/interfaces-bridge.xml.in | 7 +------ interface-definitions/interfaces-dummy.xml.in | 7 +------ interface-definitions/interfaces-ethernet.xml.in | 7 +------ interface-definitions/interfaces-geneve.xml.in | 7 +------ interface-definitions/interfaces-openvpn.xml.in | 7 +------ interface-definitions/interfaces-vxlan.xml.in | 7 +------ interface-definitions/interfaces-wireguard.xml.in | 7 +------ interface-definitions/interfaces-wireless.xml.in | 7 +------ 12 files changed, 18 insertions(+), 72 deletions(-) create mode 100644 interface-definitions/include/interface-disable.xml.i (limited to 'interface-definitions/interfaces-vxlan.xml.in') diff --git a/interface-definitions/include/interface-disable.xml.i b/interface-definitions/include/interface-disable.xml.i new file mode 100644 index 000000000..c6c24f867 --- /dev/null +++ b/interface-definitions/include/interface-disable.xml.i @@ -0,0 +1,6 @@ + + + Set interface to Administratively down + + + diff --git a/interface-definitions/include/vif-s.xml.i b/interface-definitions/include/vif-s.xml.i index ffb9de24a..b73a5cdbc 100644 --- a/interface-definitions/include/vif-s.xml.i +++ b/interface-definitions/include/vif-s.xml.i @@ -16,12 +16,7 @@ - - - Disable this bridge interface - - - + #include Set Ethertype @@ -85,12 +80,7 @@ - - - Disable this bridge interface - - - + #include Media Access Control (MAC) address diff --git a/interface-definitions/include/vif.xml.i b/interface-definitions/include/vif.xml.i index d9b5cfe34..642ed31f3 100644 --- a/interface-definitions/include/vif.xml.i +++ b/interface-definitions/include/vif.xml.i @@ -20,12 +20,7 @@ - - - Disable this bridge interface - - - + #include VLAN egress QoS diff --git a/interface-definitions/interfaces-bonding.xml.in b/interface-definitions/interfaces-bonding.xml.in index 6a82ddd91..13295f899 100644 --- a/interface-definitions/interfaces-bonding.xml.in +++ b/interface-definitions/interfaces-bonding.xml.in @@ -57,12 +57,7 @@ - - - Disable this bridge interface - - - + #include Bonding transmit hash policy diff --git a/interface-definitions/interfaces-bridge.xml.in b/interface-definitions/interfaces-bridge.xml.in index 8bac2f244..bb96db625 100644 --- a/interface-definitions/interfaces-bridge.xml.in +++ b/interface-definitions/interfaces-bridge.xml.in @@ -41,12 +41,7 @@ - - - Disable this bridge interface - - - + #include Forwarding delay diff --git a/interface-definitions/interfaces-dummy.xml.in b/interface-definitions/interfaces-dummy.xml.in index db1afd803..445f6b2d4 100644 --- a/interface-definitions/interfaces-dummy.xml.in +++ b/interface-definitions/interfaces-dummy.xml.in @@ -18,12 +18,7 @@ #include #include - - - Disable interface - - - + #include diff --git a/interface-definitions/interfaces-ethernet.xml.in b/interface-definitions/interfaces-ethernet.xml.in index 293c147d8..800588232 100644 --- a/interface-definitions/interfaces-ethernet.xml.in +++ b/interface-definitions/interfaces-ethernet.xml.in @@ -35,12 +35,7 @@ - - - Disable this bridge interface - - - + #include Duplex mode diff --git a/interface-definitions/interfaces-geneve.xml.in b/interface-definitions/interfaces-geneve.xml.in index 3fbafd2ec..146c40152 100644 --- a/interface-definitions/interfaces-geneve.xml.in +++ b/interface-definitions/interfaces-geneve.xml.in @@ -18,12 +18,7 @@ #include #include - - - Disable interface - - - + #include IPv4 routing parameters diff --git a/interface-definitions/interfaces-openvpn.xml.in b/interface-definitions/interfaces-openvpn.xml.in index d08dba78a..638e9048b 100644 --- a/interface-definitions/interfaces-openvpn.xml.in +++ b/interface-definitions/interfaces-openvpn.xml.in @@ -53,12 +53,7 @@ - - - Disable interface - - - + #include Data Encryption settings diff --git a/interface-definitions/interfaces-vxlan.xml.in b/interface-definitions/interfaces-vxlan.xml.in index 9434c2f5a..5be7125ce 100644 --- a/interface-definitions/interfaces-vxlan.xml.in +++ b/interface-definitions/interfaces-vxlan.xml.in @@ -18,12 +18,7 @@ #include #include - - - Disable interface - - - + #include Multicast group address for VXLAN interface diff --git a/interface-definitions/interfaces-wireguard.xml.in b/interface-definitions/interfaces-wireguard.xml.in index ef0b643bb..6be0292a1 100644 --- a/interface-definitions/interfaces-wireguard.xml.in +++ b/interface-definitions/interfaces-wireguard.xml.in @@ -19,12 +19,7 @@ #include #include - - - disables interface - - - + #include Local port number to accept connections diff --git a/interface-definitions/interfaces-wireless.xml.in b/interface-definitions/interfaces-wireless.xml.in index 65ad14228..4e8c9a932 100644 --- a/interface-definitions/interfaces-wireless.xml.in +++ b/interface-definitions/interfaces-wireless.xml.in @@ -458,12 +458,7 @@ - - - Disable this bridge interface - - - + #include Disassociate stations based on excessive transmission failures -- cgit v1.2.3 From 1053b331172277f7e3b2714fca84da7db4eb6221 Mon Sep 17 00:00:00 2001 From: Christian Poessinger Date: Fri, 6 Dec 2019 18:08:54 +0100 Subject: T1843: use include files for interface MTU size --- .../include/interface-mtu-1450-9000.xml.i | 13 ++++++++++ .../include/interface-mtu-68-9000.xml.i | 13 ++++++++++ interface-definitions/include/vif-s.xml.i | 28 ++-------------------- interface-definitions/include/vif.xml.i | 14 +---------- interface-definitions/interfaces-bonding.xml.in | 14 +---------- interface-definitions/interfaces-ethernet.xml.in | 14 +---------- interface-definitions/interfaces-geneve.xml.in | 14 +---------- interface-definitions/interfaces-vxlan.xml.in | 14 +---------- 8 files changed, 33 insertions(+), 91 deletions(-) create mode 100644 interface-definitions/include/interface-mtu-1450-9000.xml.i create mode 100644 interface-definitions/include/interface-mtu-68-9000.xml.i (limited to 'interface-definitions/interfaces-vxlan.xml.in') diff --git a/interface-definitions/include/interface-mtu-1450-9000.xml.i b/interface-definitions/include/interface-mtu-1450-9000.xml.i new file mode 100644 index 000000000..87296a050 --- /dev/null +++ b/interface-definitions/include/interface-mtu-1450-9000.xml.i @@ -0,0 +1,13 @@ + + + Maximum Transmission Unit (MTU) + + 1450-9000 + Maximum Transmission Unit + + + + + MTU must be between 1450 and 9000 + + diff --git a/interface-definitions/include/interface-mtu-68-9000.xml.i b/interface-definitions/include/interface-mtu-68-9000.xml.i new file mode 100644 index 000000000..ad11afa80 --- /dev/null +++ b/interface-definitions/include/interface-mtu-68-9000.xml.i @@ -0,0 +1,13 @@ + + + Maximum Transmission Unit (MTU) + + 68-9000 + Maximum Transmission Unit + + + + + MTU must be between 68 and 9000 + + diff --git a/interface-definitions/include/vif-s.xml.i b/interface-definitions/include/vif-s.xml.i index 3cb28d7e0..a109eed6b 100644 --- a/interface-definitions/include/vif-s.xml.i +++ b/interface-definitions/include/vif-s.xml.i @@ -38,19 +38,7 @@ #include - - - Maximum Transmission Unit (MTU) - - 68-9000 - Maximum Transmission Unit - - - - - MTU must be between 68 and 9000 - - + #include QinQ TAG-C Virtual Local Area Network (VLAN) ID @@ -71,19 +59,7 @@ #include #include - - - Maximum Transmission Unit (MTU) - - 68-9000 - Maximum Transmission Unit - - - - - MTU must be between 68 and 9000 - - + #include diff --git a/interface-definitions/include/vif.xml.i b/interface-definitions/include/vif.xml.i index 954803319..c74d7815e 100644 --- a/interface-definitions/include/vif.xml.i +++ b/interface-definitions/include/vif.xml.i @@ -75,18 +75,6 @@ #include - - - Maximum Transmission Unit (MTU) - - 68-9000 - Maximum Transmission Unit - - - - - MTU must be between 68 and 9000 - - + #include diff --git a/interface-definitions/interfaces-bonding.xml.in b/interface-definitions/interfaces-bonding.xml.in index c36001d5d..71d1672bb 100644 --- a/interface-definitions/interfaces-bonding.xml.in +++ b/interface-definitions/interfaces-bonding.xml.in @@ -168,19 +168,7 @@ - - - Maximum Transmission Unit (MTU) - - 68-9000 - Maximum Transmission Unit - - - - - MTU must be between 68 and 9000 - - + #include Primary device interface diff --git a/interface-definitions/interfaces-ethernet.xml.in b/interface-definitions/interfaces-ethernet.xml.in index dec2619ee..96f7a9454 100644 --- a/interface-definitions/interfaces-ethernet.xml.in +++ b/interface-definitions/interfaces-ethernet.xml.in @@ -102,19 +102,7 @@ #include - - - Maximum Transmission Unit (MTU) - - 68-9000 - Maximum Transmission Unit - - - - - MTU must be between 68 and 9000 - - + #include Configurable offload options diff --git a/interface-definitions/interfaces-geneve.xml.in b/interface-definitions/interfaces-geneve.xml.in index 146c40152..5a8c1136b 100644 --- a/interface-definitions/interfaces-geneve.xml.in +++ b/interface-definitions/interfaces-geneve.xml.in @@ -45,19 +45,7 @@ - - - Maximum Transmission Unit (MTU) - - 1450-9000 - Maximum Transmission Unit - - - - - MTU must be between 1500 and 9000 - - + #include Remote address of GENEVE tunnel diff --git a/interface-definitions/interfaces-vxlan.xml.in b/interface-definitions/interfaces-vxlan.xml.in index 5be7125ce..01a1c68bd 100644 --- a/interface-definitions/interfaces-vxlan.xml.in +++ b/interface-definitions/interfaces-vxlan.xml.in @@ -66,19 +66,7 @@ - - - Maximum Transmission Unit (MTU) - - 1450-9000 - Maximum Transmission Unit - - - - - MTU must be between 1450 and 9000 - - + #include Remote address of VXLAN tunnel -- cgit v1.2.3 From 22091b99ce884a7bf81d65bba0d0a705776ba471 Mon Sep 17 00:00:00 2001 From: Christian Poessinger Date: Fri, 6 Dec 2019 18:18:12 +0100 Subject: T1843: use include files for interface arp-cache-timeout configuration --- .../include/interface-arp-cache-timeout.xml.i | 13 +++++++++++++ interface-definitions/include/vif.xml.i | 14 +------------- interface-definitions/interfaces-bonding.xml.in | 14 +------------- interface-definitions/interfaces-bridge.xml.in | 14 +------------- interface-definitions/interfaces-ethernet.xml.in | 14 +------------- interface-definitions/interfaces-geneve.xml.in | 14 +------------- interface-definitions/interfaces-vxlan.xml.in | 14 +------------- 7 files changed, 19 insertions(+), 78 deletions(-) create mode 100644 interface-definitions/include/interface-arp-cache-timeout.xml.i (limited to 'interface-definitions/interfaces-vxlan.xml.in') diff --git a/interface-definitions/include/interface-arp-cache-timeout.xml.i b/interface-definitions/include/interface-arp-cache-timeout.xml.i new file mode 100644 index 000000000..81d35f593 --- /dev/null +++ b/interface-definitions/include/interface-arp-cache-timeout.xml.i @@ -0,0 +1,13 @@ + + + ARP cache entry timeout in seconds + + 1-86400 + ARP cache entry timout in seconds (default 30) + + + + + ARP cache entry timeout must be between 1 and 86400 seconds + + diff --git a/interface-definitions/include/vif.xml.i b/interface-definitions/include/vif.xml.i index 597137828..4adae6016 100644 --- a/interface-definitions/include/vif.xml.i +++ b/interface-definitions/include/vif.xml.i @@ -42,19 +42,7 @@ - - - ARP cache entry timeout in seconds - - 1-86400 - ARP cache entry timout in seconds (default 30) - - - - - ARP cache entry timeout must be between 1 and 86400 seconds - - + #include Enable proxy-arp on this interface diff --git a/interface-definitions/interfaces-bonding.xml.in b/interface-definitions/interfaces-bonding.xml.in index 97962fbec..6e4bef649 100644 --- a/interface-definitions/interfaces-bonding.xml.in +++ b/interface-definitions/interfaces-bonding.xml.in @@ -79,19 +79,7 @@ - - - ARP cache entry timeout in seconds - - 1-86400 - ARP cache entry timout in seconds (default 30) - - - - - ARP cache entry timeout must be between 1 and 86400 seconds - - + #include Enable proxy-arp on this interface diff --git a/interface-definitions/interfaces-bridge.xml.in b/interface-definitions/interfaces-bridge.xml.in index 12998e9ce..a28daeba6 100644 --- a/interface-definitions/interfaces-bridge.xml.in +++ b/interface-definitions/interfaces-bridge.xml.in @@ -78,19 +78,7 @@ - - - ARP cache entry timeout in seconds - - 1-86400 - ARP cache entry timout in seconds (default 30) - - - - - ARP cache entry timeout must be between 1 and 86400 seconds - - + #include #include diff --git a/interface-definitions/interfaces-ethernet.xml.in b/interface-definitions/interfaces-ethernet.xml.in index f86bdf78f..e44661d10 100644 --- a/interface-definitions/interfaces-ethernet.xml.in +++ b/interface-definitions/interfaces-ethernet.xml.in @@ -69,19 +69,7 @@ - - - ARP cache entry timeout in seconds - - 1-86400 - ARP cache entry timout in seconds (default 30) - - - - - ARP cache entry timeout must be between 1 and 86400 seconds - - + #include Enable proxy-arp on this interface diff --git a/interface-definitions/interfaces-geneve.xml.in b/interface-definitions/interfaces-geneve.xml.in index 5a8c1136b..ae5b3c59f 100644 --- a/interface-definitions/interfaces-geneve.xml.in +++ b/interface-definitions/interfaces-geneve.xml.in @@ -24,19 +24,7 @@ IPv4 routing parameters - - - ARP cache entry timeout in seconds - - 1-86400 - ARP cache entry timout in seconds (default 30) - - - - - ARP cache entry timeout must be between 1 and 86400 seconds - - + #include Enable proxy-arp on this interface diff --git a/interface-definitions/interfaces-vxlan.xml.in b/interface-definitions/interfaces-vxlan.xml.in index 01a1c68bd..a78b46023 100644 --- a/interface-definitions/interfaces-vxlan.xml.in +++ b/interface-definitions/interfaces-vxlan.xml.in @@ -33,19 +33,7 @@ - - - ARP cache entry timeout in seconds - - 1-86400 - ARP cache entry timout in seconds (default 30) - - - - - ARP cache entry timeout must be between 1 and 86400 seconds - - + #include Enable proxy-arp on this interface -- cgit v1.2.3 From 81c3919271b20c0818ea7b2ed5c468685c6d7d4a Mon Sep 17 00:00:00 2001 From: Christian Poessinger Date: Fri, 6 Dec 2019 18:21:58 +0100 Subject: T1843: use include files for interface proxy-arp configuration --- .../include/interface-enable-proxy-arp.xml.i | 6 ++++++ interface-definitions/include/vif.xml.i | 13 +------------ interface-definitions/interfaces-bonding.xml.in | 7 +------ interface-definitions/interfaces-ethernet.xml.in | 7 +------ interface-definitions/interfaces-geneve.xml.in | 7 +------ interface-definitions/interfaces-vxlan.xml.in | 7 +------ 6 files changed, 11 insertions(+), 36 deletions(-) create mode 100644 interface-definitions/include/interface-enable-proxy-arp.xml.i (limited to 'interface-definitions/interfaces-vxlan.xml.in') diff --git a/interface-definitions/include/interface-enable-proxy-arp.xml.i b/interface-definitions/include/interface-enable-proxy-arp.xml.i new file mode 100644 index 000000000..14ab08875 --- /dev/null +++ b/interface-definitions/include/interface-enable-proxy-arp.xml.i @@ -0,0 +1,6 @@ + + + Enable proxy-arp on this interface + + + diff --git a/interface-definitions/include/vif.xml.i b/interface-definitions/include/vif.xml.i index 4adae6016..7c8a29a93 100644 --- a/interface-definitions/include/vif.xml.i +++ b/interface-definitions/include/vif.xml.i @@ -43,18 +43,7 @@ #include - - - Enable proxy-arp on this interface - - - - - - Enable private VLAN proxy ARP on this interface - - - + #include #include diff --git a/interface-definitions/interfaces-bonding.xml.in b/interface-definitions/interfaces-bonding.xml.in index 6e4bef649..e2e20b4a3 100644 --- a/interface-definitions/interfaces-bonding.xml.in +++ b/interface-definitions/interfaces-bonding.xml.in @@ -80,12 +80,7 @@ #include - - - Enable proxy-arp on this interface - - - + #include Enable private VLAN proxy ARP on this interface diff --git a/interface-definitions/interfaces-ethernet.xml.in b/interface-definitions/interfaces-ethernet.xml.in index e44661d10..2f7d62f46 100644 --- a/interface-definitions/interfaces-ethernet.xml.in +++ b/interface-definitions/interfaces-ethernet.xml.in @@ -70,12 +70,7 @@ #include - - - Enable proxy-arp on this interface - - - + #include Enable private VLAN proxy ARP on this interface diff --git a/interface-definitions/interfaces-geneve.xml.in b/interface-definitions/interfaces-geneve.xml.in index ae5b3c59f..0a866143e 100644 --- a/interface-definitions/interfaces-geneve.xml.in +++ b/interface-definitions/interfaces-geneve.xml.in @@ -25,12 +25,7 @@ #include - - - Enable proxy-arp on this interface - - - + #include #include diff --git a/interface-definitions/interfaces-vxlan.xml.in b/interface-definitions/interfaces-vxlan.xml.in index a78b46023..f6b5cadac 100644 --- a/interface-definitions/interfaces-vxlan.xml.in +++ b/interface-definitions/interfaces-vxlan.xml.in @@ -34,12 +34,7 @@ #include - - - Enable proxy-arp on this interface - - - + #include -- cgit v1.2.3