diff options
| author | Christian Poessinger <christian@poessinger.com> | 2019-12-06 18:18:12 +0100 |
|---|---|---|
| committer | Christian Poessinger <christian@poessinger.com> | 2019-12-06 20:58:56 +0100 |
| commit | 22091b99ce884a7bf81d65bba0d0a705776ba471 (patch) | |
| tree | 945c1ab2dc89405ad0314ae7b26206914e94467d | |
| parent | 24c99947f4a7ca8b3519a69f8c61eba8af55d859 (diff) | |
| download | vyos-1x-22091b99ce884a7bf81d65bba0d0a705776ba471.tar.gz vyos-1x-22091b99ce884a7bf81d65bba0d0a705776ba471.zip | |
T1843: use include files for interface arp-cache-timeout configuration
| -rw-r--r-- | interface-definitions/include/interface-arp-cache-timeout.xml.i | 13 | ||||
| -rw-r--r-- | interface-definitions/include/vif.xml.i | 14 | ||||
| -rw-r--r-- | interface-definitions/interfaces-bonding.xml.in | 14 | ||||
| -rw-r--r-- | interface-definitions/interfaces-bridge.xml.in | 14 | ||||
| -rw-r--r-- | interface-definitions/interfaces-ethernet.xml.in | 14 | ||||
| -rw-r--r-- | interface-definitions/interfaces-geneve.xml.in | 14 | ||||
| -rw-r--r-- | interface-definitions/interfaces-vxlan.xml.in | 14 |
7 files changed, 19 insertions, 78 deletions
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 @@ +<leafNode name="arp-cache-timeout"> + <properties> + <help>ARP cache entry timeout in seconds</help> + <valueHelp> + <format>1-86400</format> + <description>ARP cache entry timout in seconds (default 30)</description> + </valueHelp> + <constraint> + <validator name="numeric" argument="--range 1-86400"/> + </constraint> + <constraintErrorMessage>ARP cache entry timeout must be between 1 and 86400 seconds</constraintErrorMessage> + </properties> +</leafNode> 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 @@ </leafNode> <node name="ip"> <children> - <leafNode name="arp-cache-timeout"> - <properties> - <help>ARP cache entry timeout in seconds</help> - <valueHelp> - <format>1-86400</format> - <description>ARP cache entry timout in seconds (default 30)</description> - </valueHelp> - <constraint> - <validator name="numeric" argument="--range 1-86400"/> - </constraint> - <constraintErrorMessage>ARP cache entry timeout must be between 1 and 86400 seconds</constraintErrorMessage> - </properties> - </leafNode> + #include <include/interface-arp-cache-timeout.xml.i> <leafNode name="enable-proxy-arp"> <properties> <help>Enable proxy-arp on this interface</help> 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 @@ </leafNode> <node name="ip"> <children> - <leafNode name="arp-cache-timeout"> - <properties> - <help>ARP cache entry timeout in seconds</help> - <valueHelp> - <format>1-86400</format> - <description>ARP cache entry timout in seconds (default 30)</description> - </valueHelp> - <constraint> - <validator name="numeric" argument="--range 1-86400"/> - </constraint> - <constraintErrorMessage>ARP cache entry timeout must be between 1 and 86400 seconds</constraintErrorMessage> - </properties> - </leafNode> + #include <include/interface-arp-cache-timeout.xml.i> <leafNode name="enable-proxy-arp"> <properties> <help>Enable proxy-arp on this interface</help> 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 @@ </node> <node name="ip"> <children> - <leafNode name="arp-cache-timeout"> - <properties> - <help>ARP cache entry timeout in seconds</help> - <valueHelp> - <format>1-86400</format> - <description>ARP cache entry timout in seconds (default 30)</description> - </valueHelp> - <constraint> - <validator name="numeric" argument="--range 1-86400"/> - </constraint> - <constraintErrorMessage>ARP cache entry timeout must be between 1 and 86400 seconds</constraintErrorMessage> - </properties> - </leafNode> + #include <include/interface-arp-cache-timeout.xml.i> </children> </node> #include <include/interface-mac.xml.i> 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 @@ </leafNode> <node name="ip"> <children> - <leafNode name="arp-cache-timeout"> - <properties> - <help>ARP cache entry timeout in seconds</help> - <valueHelp> - <format>1-86400</format> - <description>ARP cache entry timout in seconds (default 30)</description> - </valueHelp> - <constraint> - <validator name="numeric" argument="--range 1-86400"/> - </constraint> - <constraintErrorMessage>ARP cache entry timeout must be between 1 and 86400 seconds</constraintErrorMessage> - </properties> - </leafNode> + #include <include/interface-arp-cache-timeout.xml.i> <leafNode name="enable-proxy-arp"> <properties> <help>Enable proxy-arp on this interface</help> 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 @@ <help>IPv4 routing parameters</help> </properties> <children> - <leafNode name="arp-cache-timeout"> - <properties> - <help>ARP cache entry timeout in seconds</help> - <valueHelp> - <format>1-86400</format> - <description>ARP cache entry timout in seconds (default 30)</description> - </valueHelp> - <constraint> - <validator name="numeric" argument="--range 1-86400"/> - </constraint> - <constraintErrorMessage>ARP cache entry timeout must be between 1 and 86400 seconds</constraintErrorMessage> - </properties> - </leafNode> + #include <include/interface-arp-cache-timeout.xml.i> <leafNode name="enable-proxy-arp"> <properties> <help>Enable proxy-arp on this interface</help> 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 @@ </leafNode> <node name="ip"> <children> - <leafNode name="arp-cache-timeout"> - <properties> - <help>ARP cache entry timeout in seconds</help> - <valueHelp> - <format>1-86400</format> - <description>ARP cache entry timout in seconds (default 30)</description> - </valueHelp> - <constraint> - <validator name="numeric" argument="--range 1-86400"/> - </constraint> - <constraintErrorMessage>ARP cache entry timeout must be between 1 and 86400 seconds</constraintErrorMessage> - </properties> - </leafNode> + #include <include/interface-arp-cache-timeout.xml.i> <leafNode name="enable-proxy-arp"> <properties> <help>Enable proxy-arp on this interface</help> |