diff options
-rw-r--r-- | interface-definitions/include/vif-s.xml.i | 60 | ||||
-rw-r--r-- | interface-definitions/include/vif.xml.i | 30 | ||||
-rw-r--r-- | interface-definitions/interfaces-bonding.xml.in | 6 | ||||
-rw-r--r-- | interface-definitions/interfaces-bridge.xml.in | 2 | ||||
-rw-r--r-- | interface-definitions/interfaces-dummy.xml.in | 2 | ||||
-rw-r--r-- | interface-definitions/interfaces-ethernet.xml.in | 6 | ||||
-rw-r--r-- | interface-definitions/interfaces-geneve.xml.in | 2 | ||||
-rw-r--r-- | interface-definitions/interfaces-loopback.xml.in | 2 | ||||
-rw-r--r-- | interface-definitions/interfaces-vxlan.xml.in | 2 | ||||
-rw-r--r-- | interface-definitions/interfaces-wireguard.xml.in | 2 | ||||
-rw-r--r-- | interface-definitions/interfaces-wireless.xml.in | 4 |
11 files changed, 17 insertions, 101 deletions
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 @@ <constraintErrorMessage>VLAN ID must be between 0 and 4094</constraintErrorMessage>
</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="description">
<properties>
<help>Interface description</help>
@@ -153,35 +125,7 @@ <constraintErrorMessage>VLAN ID must be between 0 and 4094</constraintErrorMessage>
</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="description">
<properties>
<help>Interface description</help>
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 @@ <constraintErrorMessage>VLAN ID must be between 0 and 4094</constraintErrorMessage> </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="description"> <properties> <help>Interface description</help> 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 @@ </valueHelp> </properties> <children> - #include "include/address-ipv4-ipv6-dhcp.xml.i" + #include <include/address-ipv4-ipv6-dhcp.xml.i> <node name="arp-monitor"> <properties> <help>ARP link monitoring parameters</help> @@ -254,8 +254,8 @@ </completionHelp> </properties> </leafNode> - #include "include/vif-s.xml.i" - #include "include/vif.xml.i" + #include <include/vif-s.xml.i> + #include <include/vif.xml.i> </children> </tagNode> </children> 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 @@ </valueHelp> </properties> <children> - #include "include/address-ipv4-ipv6-dhcp.xml.i" + #include <include/address-ipv4-ipv6-dhcp.xml.i> <leafNode name="aging"> <properties> <help>MAC address aging interval</help> 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 @@ </valueHelp> </properties> <children> - #include "include/address-ipv4-ipv6.xml.i" + #include <include/address-ipv4-ipv6.xml.i> <leafNode name="description"> <properties> <help>Interface description</help> 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 @@ </valueHelp> </properties> <children> - #include "include/address-ipv4-ipv6-dhcp.xml.i" + #include <include/address-ipv4-ipv6-dhcp.xml.i> <leafNode name="description"> <properties> <help>Interface description</help> @@ -368,8 +368,8 @@ <constraintErrorMessage>Speed must be auto, 10, 100, 1000, 2500, 5000, 10000, 25000, 40000, 50000 or 100000</constraintErrorMessage> </properties> </leafNode> - #include "include/vif-s.xml.i" - #include "include/vif.xml.i" + #include <include/vif-s.xml.i> + #include <include/vif.xml.i> </children> </tagNode> </children> 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 @@ </valueHelp> </properties> <children> - #include "include/address-ipv4-ipv6.xml.i" + #include <include/address-ipv4-ipv6.xml.i> <leafNode name="description"> <properties> <help>Interface description</help> 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 @@ </valueHelp> </properties> <children> - #include "include/address-ipv4-ipv6.xml.i" + #include <include/address-ipv4-ipv6.xml.i> <leafNode name="description"> <properties> <help>Interface description</help> 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 @@ </valueHelp> </properties> <children> - #include "include/address-ipv4-ipv6.xml.i" + #include <include/address-ipv4-ipv6.xml.i> <leafNode name="description"> <properties> <help>Interface description</help> 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 @@ </valueHelp> </properties> <children> - #include "include/address-ipv4-ipv6.xml.i" + #include <include/address-ipv4-ipv6.xml.i> <leafNode name="description"> <properties> <help>description</help> 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 @@ </valueHelp> </properties> <children> - #include "include/address-ipv4-ipv6-dhcp.xml.i" + #include <include/address-ipv4-ipv6-dhcp.xml.i> <node name="capabilities"> <properties> <help>HT and VHT capabilities for your card</help> @@ -815,7 +815,7 @@ <constraintErrorMessage>Type must be access-point, station or monitor</constraintErrorMessage> </properties> </leafNode> - #include "include/vif.xml.i" + #include <include/vif.xml.i> </children> </tagNode> </children> |