diff options
Diffstat (limited to 'interface-definitions/interfaces-bridge.xml.in')
| -rw-r--r-- | interface-definitions/interfaces-bridge.xml.in | 53 |
1 files changed, 36 insertions, 17 deletions
diff --git a/interface-definitions/interfaces-bridge.xml.in b/interface-definitions/interfaces-bridge.xml.in index 0a777865b..778acda78 100644 --- a/interface-definitions/interfaces-bridge.xml.in +++ b/interface-definitions/interfaces-bridge.xml.in @@ -40,6 +40,7 @@ #include <include/interface-disable-link-detect.xml.i> #include <include/interface-disable.xml.i> #include <include/interface-vrf.xml.i> + #include <include/interface-mtu-68-16000.xml.i> <leafNode name="forwarding-delay"> <properties> <help>Forwarding delay</help> @@ -81,23 +82,8 @@ </leafNode> </children> </node> - <node name="ip"> - <children> - #include <include/interface-arp-cache-timeout.xml.i> - #include <include/interface-enable-arp-accept.xml.i> - #include <include/interface-disable-forwarding.xml.i> - #include <include/interface-enable-arp-announce.xml.i> - #include <include/interface-enable-arp-ignore.xml.i> - #include <include/interface-disable-arp-filter.xml.i> - </children> - </node> - <node name="ipv6"> - <children> - #include <include/ipv6-address.xml.i> - #include <include/ipv6-disable-forwarding.xml.i> - #include <include/ipv6-dup-addr-detect-transmits.xml.i> - </children> - </node> + #include <include/interface-ipv4-options.xml.i> + #include <include/interface-ipv6-options.xml.i> #include <include/interface-mac.xml.i> <leafNode name="max-age"> <properties> @@ -126,6 +112,37 @@ </completionHelp> </properties> <children> + <leafNode name="native-vlan"> + <properties> + <help>Specify VLAN id which should natively be present on the link</help> + <valueHelp> + <format>1-4094</format> + <description>Virtual Local Area Network (VLAN) ID</description> + </valueHelp> + <constraint> + <validator name="numeric" argument="--range 1-4094"/> + </constraint> + <constraintErrorMessage>VLAN ID must be between 1 and 4094</constraintErrorMessage> + </properties> + </leafNode> + <leafNode name="allowed-vlan"> + <properties> + <help>Specify VLAN id which is allowed in this trunk interface</help> + <valueHelp> + <format><id></format> + <description>VLAN id allowed to pass this interface</description> + </valueHelp> + <valueHelp> + <format><idN>-<idM></format> + <description>VLAN id range allowed on this interface (use '-' as delimiter)</description> + </valueHelp> + <constraint> + <regex>^([0-9]{1,4}-[0-9]{1,4})|([0-9]{1,4})$</regex> + </constraint> + <constraintErrorMessage>not a valid VLAN ID value or range</constraintErrorMessage> + <multi/> + </properties> + </leafNode> <leafNode name="cost"> <properties> <help>Bridge port cost</help> @@ -178,6 +195,8 @@ <valueless/> </properties> </leafNode> + #include <include/vif-s.xml.i> + #include <include/vif.xml.i> </children> </tagNode> </children> |